From d31c50870d0bee042ce660e445c9294a59a3a65b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 30 Jun 2016 20:26:57 +0000 Subject: Slackware 14.2 Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-) --- extra/source/wicd/curses_bitrate_fix.patch | 19 ++++++++++++ .../source/wicd/manually-compile-translations.diff | 24 +++++++++++++++ extra/source/wicd/slack-desc | 2 +- .../wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff | 11 ------- extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch | 15 +++++++++ extra/source/wicd/wicd-1421918.patch | 15 +++++++++ extra/source/wicd/wicd.SlackBuild | 36 ++++++++++++++-------- 7 files changed, 98 insertions(+), 24 deletions(-) create mode 100644 extra/source/wicd/curses_bitrate_fix.patch create mode 100644 extra/source/wicd/manually-compile-translations.diff delete mode 100644 extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff create mode 100644 extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch create mode 100644 extra/source/wicd/wicd-1421918.patch (limited to 'extra/source/wicd') diff --git a/extra/source/wicd/curses_bitrate_fix.patch b/extra/source/wicd/curses_bitrate_fix.patch new file mode 100644 index 00000000..1efa0c84 --- /dev/null +++ b/extra/source/wicd/curses_bitrate_fix.patch @@ -0,0 +1,19 @@ +--- curses/netentry_curses.py 2015-02-15 18:29:05.000000000 +0100 ++++ curses/netentry_curses.py 2015-02-15 18:31:24.000000000 +0100 +@@ -538,11 +538,12 @@ + self.bitrates = wireless.GetAvailableBitrates() + self.bitrates.append('auto') + self.bitrate_combo.set_list(self.bitrates) +- self.bitrate_combo.set_focus( +- self.bitrates.index( +- wireless.GetWirelessProperty(networkID, 'bitrate') ++ if wireless.GetWirelessProperty(networkID, 'bitrate'): ++ self.bitrate_combo.set_focus( ++ self.bitrates.index( ++ wireless.GetWirelessProperty(networkID, 'bitrate') ++ ) + ) +- ) + self.allow_lower_bitrates_chkbox.set_state( + to_bool(self.format_entry(networkID, 'allow_lower_bitrates')) + ) diff --git a/extra/source/wicd/manually-compile-translations.diff b/extra/source/wicd/manually-compile-translations.diff new file mode 100644 index 00000000..56e22ce9 --- /dev/null +++ b/extra/source/wicd/manually-compile-translations.diff @@ -0,0 +1,24 @@ +diff -Nur wicd-1.7.3.orig/setup.py wicd-1.7.3/setup.py +--- wicd-1.7.3.orig/setup.py 2014-12-21 13:40:46.000000000 -0600 ++++ wicd-1.7.3/setup.py 2014-12-23 13:03:13.181102639 -0600 +@@ -617,9 +617,6 @@ + import wpath + + if not wpath.no_install_i18n: +- if os.path.exists('translations'): +- shutil.rmtree('translations/') +- os.makedirs('translations') + + oldlang = os.environ['LANG'] + os.environ['LANG'] = 'C' +@@ -652,10 +649,6 @@ + except (OSError, ValueError): + print 'ARGH' + +- if compile_po: +- os.makedirs('translations/' + lang + '/LC_MESSAGES/') +- os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang)) +- + os.environ['LANG'] = oldlang + + class uninstall(Command): diff --git a/extra/source/wicd/slack-desc b/extra/source/wicd/slack-desc index 7a925975..4a5513d8 100644 --- a/extra/source/wicd/slack-desc +++ b/extra/source/wicd/slack-desc @@ -15,5 +15,5 @@ wicd: - Profiles for each wireless network and wired network wicd: - Many encryption schemes, some of which include WEP/WPA/WPA2 wicd: - Compatible with wireless-tools wicd: -wicd: Homepage: http://wicd.sourceforge.net +wicd: Homepage: https://launchpad.net/wicd wicd: diff --git a/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff b/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff deleted file mode 100644 index 4be44631..00000000 --- a/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./wicd/misc.py.orig 2012-04-30 14:20:09.000000000 -0500 -+++ ./wicd/misc.py 2012-05-09 14:08:24.611298308 -0500 -@@ -430,7 +430,7 @@ - """ Sanitize property names to be used in config-files. """ - allowed = string.ascii_letters + '_' + string.digits - table = string.maketrans(allowed, ' ' * len(allowed)) -- return s.translate(None, table) -+ return s.encode('ascii', 'replace').translate(None, table) - - def sanitize_escaped(s): - """ Sanitize double-escaped unicode strings. """ diff --git a/extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch b/extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch new file mode 100644 index 00000000..a028059f --- /dev/null +++ b/extra/source/wicd/wicd-1.7.3-urwid-1.3.0.patch @@ -0,0 +1,15 @@ +--- curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300 ++++ cursesb/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300 +@@ -1153,9 +1153,10 @@ + if not ui._started: + return False + +- input_data = ui.get_input_nonblocking() ++ ui.set_input_timeouts(max_wait=0) ++ input_data = ui.get_input() + # Resolve any "alarms" in the waiting +- self.handle_keys(input_data[1]) ++ self.handle_keys(input_data) + + # Update the screen + canvas = self.frame.render((self.size), True) diff --git a/extra/source/wicd/wicd-1421918.patch b/extra/source/wicd/wicd-1421918.patch new file mode 100644 index 00000000..2428f011 --- /dev/null +++ b/extra/source/wicd/wicd-1421918.patch @@ -0,0 +1,15 @@ +=== modified file 'curses/wicd-curses.py' +--- curses/wicd-curses.py 2014-12-21 16:57:33 +0000 ++++ curses/wicd-curses.py 2015-02-24 23:41:01 +0000 +@@ -532,7 +532,10 @@ + def get_selected_profile(self): + """Get the selected wired profile""" + loc = self.get_focus()[1] +- return self.theList[loc] ++ if len(self.theList) > loc: ++ return self.theList[loc] ++ else: ++ return self.theList[-1] + + + class AdHocDialog(Dialog2): diff --git a/extra/source/wicd/wicd.SlackBuild b/extra/source/wicd/wicd.SlackBuild index 77c00f46..25fd947e 100755 --- a/extra/source/wicd/wicd.SlackBuild +++ b/extra/source/wicd/wicd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008,2009,2010,2011,2012 Robby Workman Northport, AL, USA +# Copyright 2008-2015 Robby Workman, Tuscaloosa, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,13 +21,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wicd -VERSION=${VERSION:-1.7.2.4} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.7.4} +BUILD=${BUILD:-2} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac @@ -37,7 +37,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PRGNAM -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i586" ]; then LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then LIBDIRSUFFIX="" @@ -61,20 +61,32 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/wicd-1.7.2.4.sanitize.string.bugfix.diff.gz | patch -p1 --verbose || exit 1 +# Bypass the need for pybabel (thanks, dapal!) +zcat $CWD/manually-compile-translations.diff.gz | patch -p1 || exit 1 +for pofile in $(find po/ -type f -name "*.po") ; do + mkdir -p translations/$(basename ${pofile} .po)/LC_MESSAGES + msgfmt -o translations/$(basename ${pofile} .po)/LC_MESSAGES/wicd.mo ${pofile} +done + +# wicd-1.7.4 is broken with urwid > 1.0.x, even with this patch. +# Might be useful someday, but for now since the only thing in Slackware that uses +# urwid is wicd, just use a 1.0.x version. +# Thanks to ArchLinux +#zcat $CWD/wicd-1.7.3-urwid-1.3.0.patch.gz | patch -p0 || exit 1 + +# Crash fix. Thanks to ArchLinux. +zcat $CWD/wicd-1421918.patch.gz | patch -p0 || exit 1 + +# Thanks to Void Linux +zcat $CWD/curses_bitrate_fix.patch.gz | patch -p0 || exit 1 python setup.py configure \ --lib=/usr/lib${LIBDIRSUFFIX}/wicd \ --kdedir=/usr/share/autostart \ --backends=/usr/lib${LIBDIRSUFFIX}/wicd/backends \ + --no-install-gnome-shell-extensions \ || exit 1 -# Bypass the need for pybabel (thanks, dapal!) -for pofile in $(find po/ -type f -name "*.po") ; do - mkdir -p translations/$(basename ${pofile} .po)/LC_MESSAGES - msgfmt -o translations/$(basename ${pofile} .po)/LC_MESSAGES/wicd.mo ${pofile} -done - python setup.py install --root=$PKG || exit 1 # Handle some Slackware defaults -- cgit v1.2.3