Slackware 14.2slackware-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!  :-)

45 files changed, 1077 insertions, 1396 deletions

diff --git a/extra/google-chrome/google-chrome.SlackBuild b/extra/google-chrome/google-chrome.SlackBuild
index de4c0b6f..9ef6f5c7 100755
--- a/extra/google-chrome/google-chrome.SlackBuild
+++ b/extra/google-chrome/google-chrome.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2009-2010  Erik Hanson, Minneapolis, MN, USA
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -74,7 +74,7 @@ OUTPUT=${OUTPUT:-/tmp}
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-ar p $CWD/google-chrome-${RELEASE}_current_${DEBARCH}.deb data.tar.lzma | lzma -d | tar xv || exit 1
+ar p $CWD/google-chrome-${RELEASE}_current_${DEBARCH}.deb data.tar.xz | tar xJv || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -105,9 +105,6 @@ done
 
 # Install a .desktop launcher:
 sed -i -e "s#Icon=google-chrome#Icon=/opt/google/chrome/product_logo_256.png#" \
-  $PKG/opt/google/chrome/google-chrome.desktop
-mkdir -p $PKG/usr/share/applications
-ln -s /opt/google/chrome/google-chrome.desktop \
   $PKG/usr/share/applications/google-chrome.desktop
 
 mkdir -p $PKG/install
diff --git a/extra/source/bash-completion/bash-completion.SlackBuild b/extra/source/bash-completion/bash-completion.SlackBuild
index 7a4634f8..fd7206aa 100755
--- a/extra/source/bash-completion/bash-completion.SlackBuild
+++ b/extra/source/bash-completion/bash-completion.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2010, 2011, 2012, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,9 @@
 
 # Slackware build script for bash-completion
 
-VERSION=2.1
+VERSION=2.2
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -46,16 +46,32 @@ find . \
 # Fixup sh completion for us
 zcat $CWD/fixup-sh-script-completions.diff.gz | patch -p1 --verbose || exit 1
 
+# Add some patches from git to fix tar filename completion and related
+# https://github.com/scop/bash-completion/issues/15
+zcat $CWD/patches/0001-tar-Don-t-write-to-tmp-jetel.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/0002-test-suite-Add-tar-xvf-filename-test-case.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/0003-tar-Fix-GNU-tar-help-output-parsing-regex-fixes-15.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/0004-tar-Remove-unused-variable.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/0005-tar-Detect-GNU-other-from-version-only-once-per-sess.patch.gz | patch -p1 --verbose || exit 1
+
+# Don't symlink mpv -> mplayer as it reportedly doesn't work well.  Upstream patch.
+zcat $CWD/patches/0006-Remove-mplayer-aliased-completion.patch.gz | patch -p1 --verbose || exit 1
+
+autoreconf -vif
+
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --docdir=/usr/doc/bash-completion-$VERSION
+  --docdir=/usr/doc/bash-completion-$VERSION || exit 1
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Create the local directory for admin changes/additions:
+mkdir -p $PKG/etc/bash_completion.d/
+
 chmod 0755 $PKG/etc/profile.d/bash_completion.sh
 
 mkdir -p $PKG/usr/doc/bash-completion-$VERSION
diff --git a/extra/source/bash-completion/fixup-sh-script-completions.diff b/extra/source/bash-completion/fixup-sh-script-completions.diff
index 15bcf1d1..6f3447b8 100644
--- a/extra/source/bash-completion/fixup-sh-script-completions.diff
+++ b/extra/source/bash-completion/fixup-sh-script-completions.diff
@@ -1,22 +1,19 @@
-The 'sh' completion file only completes on *.sh files.
-This breaks the expectation (on Slackware, at least) that
-e.g. "sh /etc/rc.d/rc.my<TAB>" will complete to rc.mysql.
-This patch fixes that, but a consequence is that "sh" will
-complete on *any* filename.  IMHO, that's not a regression
-at all, since stock bash without bash-completion does that
-already...  --rworkman
+The 'sh' completion file only completes on *.sh files.  This breaks the 
+expectation (on Slackware, at least) that e.g. "sh /etc/rc.d/rc.my<TAB>" 
+will complete to rc.mysql.  This patch fixes that, but a consequence is that
+"sh" will complete on *any* filename.  IMHO, that's not a regression at all,
+since stock bash without bash-completion does that already...  --rworkman
 
 Acked-by: volkerdi
 
-diff -Nur bash-completion-1.3.orig/completions/sh bash-completion-1.3/completions/sh
---- bash-completion-1.3.orig/completions/sh	2011-01-21 03:36:11.000000000 -0600
-+++ bash-completion-1.3/completions/sh	2011-03-12 02:06:00.964938285 -0600
-@@ -28,7 +28,7 @@
-         return 0
-     fi
- 
--    _filedir sh
-+    _filedir
+diff -Nur bash-completion-2.2.orig/completions/sh bash-completion-2.2/completions/sh
+--- bash-completion-2.2.orig/completions/sh	2016-02-09 08:52:44.000000000 -0600
++++ bash-completion-2.2/completions/sh	2016-03-06 00:43:49.744767271 -0600
+@@ -31,6 +31,6 @@
+     [[ $args -eq 1 ]] && ext=sh
+     _filedir $ext
  } &&
- complete -F _sh sh
+-complete -F _sh sh
++complete -F _sh
  
+ # ex: ts=4 sw=4 et filetype=sh
diff --git a/extra/source/bash-completion/patches/0001-tar-Don-t-write-to-tmp-jetel.patch b/extra/source/bash-completion/patches/0001-tar-Don-t-write-to-tmp-jetel.patch
new file mode 100644
index 00000000..82cbeb0d
--- /dev/null
+++ b/extra/source/bash-completion/patches/0001-tar-Don-t-write-to-tmp-jetel.patch
@@ -0,0 +1,25 @@
+From 6bdd92202f55d7c530dcbeb2a243604dac546cf1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Tue, 15 Mar 2016 19:49:55 +0200
+Subject: [PATCH 1/5] tar: Don't write to /tmp/jetel
+
+---
+ completions/tar | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/completions/tar b/completions/tar
+index ef18ad6..6e4c74c 100644
+--- a/completions/tar
++++ b/completions/tar
+@@ -411,7 +411,7 @@ __tar_try_list_archive()
+     shift
+ 
+     read tarball <<<"$(printf -- '%s\n' "$@" \
+-        | command sed -n "/^.\{1,\}$regex\$/p" | tee /tmp/jetel)"
++        | command sed -n "/^.\{1,\}$regex\$/p")"
+     if [[ -n "$tarball" ]]; then
+         local IFS=$'\n'
+         COMPREPLY=($(compgen -o filenames -W "$(
+-- 
+2.7.2
+
diff --git a/extra/source/bash-completion/patches/0002-test-suite-Add-tar-xvf-filename-test-case.patch b/extra/source/bash-completion/patches/0002-test-suite-Add-tar-xvf-filename-test-case.patch
new file mode 100644
index 00000000..8e647374
--- /dev/null
+++ b/extra/source/bash-completion/patches/0002-test-suite-Add-tar-xvf-filename-test-case.patch
@@ -0,0 +1,27 @@
+From 807f903f86ad647425c83f7ad6fc499014c6734e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Tue, 15 Mar 2016 20:19:10 +0200
+Subject: [PATCH 2/5] test suite: Add tar xvf filename test case
+
+---
+ test/lib/completions/tar.exp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/lib/completions/tar.exp b/test/lib/completions/tar.exp
+index 70e38d0..7cdef94 100644
+--- a/test/lib/completions/tar.exp
++++ b/test/lib/completions/tar.exp
+@@ -59,6 +59,10 @@ set test "old option: create and members"
+ assert_complete_dir "dir/ dir2/ archive.tar.xz escape.tar" "tar cTfvv NOT_EXISTS DONT_CREATE.tar " $::srcdir/fixtures/tar
+ sync_after_int
+ 
++set test "old option: extract and archive"
++assert_complete_dir "dir/ dir2/ archive.tar.xz escape.tar" "tar xvf " $::srcdir/fixtures/tar
++sync_after_int
++
+ if { "$tar_version" == "gnu" } {
+     set test "check short options"
+     assert_complete_any "tar -c"
+-- 
+2.7.2
+
diff --git a/extra/source/bash-completion/patches/0003-tar-Fix-GNU-tar-help-output-parsing-regex-fixes-15.patch b/extra/source/bash-completion/patches/0003-tar-Fix-GNU-tar-help-output-parsing-regex-fixes-15.patch
new file mode 100644
index 00000000..621ccd12
--- /dev/null
+++ b/extra/source/bash-completion/patches/0003-tar-Fix-GNU-tar-help-output-parsing-regex-fixes-15.patch
@@ -0,0 +1,25 @@
+From 0b7189d4eee4597e11cab02e6b4dcae488db5ca8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Wed, 16 Mar 2016 12:28:29 +0200
+Subject: [PATCH 3/5] tar: Fix GNU tar help output parsing regex, fixes #15
+
+---
+ completions/tar | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/completions/tar b/completions/tar
+index 6e4c74c..0a5f588 100644
+--- a/completions/tar
++++ b/completions/tar
+@@ -105,7 +105,7 @@ __gnu_tar_parse_help()
+         # or more options separated by ', ' separator string.  We are matching
+         # like this then:  ^<spaces>(<separator>?<option>)+<whatever>$
+         if [[ "$line" =~ \
+-            ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?-=]+))(,[[:space:]])?)+).*$ ]]; then
++            ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?=-]+))(,[[:space:]])?)+).*$ ]]; then
+ 
+             line=${BASH_REMATCH[1]}
+             str="${line//,/ }"
+-- 
+2.7.2
+
diff --git a/extra/source/bash-completion/patches/0004-tar-Remove-unused-variable.patch b/extra/source/bash-completion/patches/0004-tar-Remove-unused-variable.patch
new file mode 100644
index 00000000..767d9bc9
--- /dev/null
+++ b/extra/source/bash-completion/patches/0004-tar-Remove-unused-variable.patch
@@ -0,0 +1,25 @@
+From 7ab05bf9d97ce5a6ced7acdfc21235e06542c3f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Wed, 16 Mar 2016 12:39:06 +0200
+Subject: [PATCH 4/5] tar: Remove unused variable
+
+---
+ completions/tar | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/completions/tar b/completions/tar
+index 0a5f588..9c44dc7 100644
+--- a/completions/tar
++++ b/completions/tar
+@@ -696,7 +696,7 @@ _posix_tar()
+ 
+ _tar()
+ {
+-    local cmd=${COMP_WORDS[0]} output line
++    local cmd=${COMP_WORDS[0]} line
+     read line <<<"$($cmd --version)"
+     case "$line" in
+     *GNU*)
+-- 
+2.7.2
+
diff --git a/extra/source/bash-completion/patches/0005-tar-Detect-GNU-other-from-version-only-once-per-sess.patch b/extra/source/bash-completion/patches/0005-tar-Detect-GNU-other-from-version-only-once-per-sess.patch
new file mode 100644
index 00000000..3e5e06e0
--- /dev/null
+++ b/extra/source/bash-completion/patches/0005-tar-Detect-GNU-other-from-version-only-once-per-sess.patch
@@ -0,0 +1,46 @@
+From 88c671a2c74bfde3bc2ec7c6f74133ac613c61da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Wed, 16 Mar 2016 12:44:40 +0200
+Subject: [PATCH 5/5] tar: Detect GNU/other from --version only once per
+ session
+
+---
+ completions/tar | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/completions/tar b/completions/tar
+index 9c44dc7..7b3a486 100644
+--- a/completions/tar
++++ b/completions/tar
+@@ -696,16 +696,25 @@ _posix_tar()
+ 
+ _tar()
+ {
+-    local cmd=${COMP_WORDS[0]} line
++    local cmd=${COMP_WORDS[0]} func line
+     read line <<<"$($cmd --version)"
+     case "$line" in
+     *GNU*)
+-        _gtar "$@"
++        func=_gtar
+         ;;
+     *)
+-        _posix_tar "$@"
++        func=_posix_tar
+         ;;
+     esac
++    $func "$@"
++
++    # Install real completion for subsequent completions
++    if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
++        complete -F $func -o dirnames tar
++    else
++        complete -F $func tar
++    fi
++    unset -f _tar
+ }
+ 
+ 
+-- 
+2.7.2
+
diff --git a/extra/source/bash-completion/patches/0006-Remove-mplayer-aliased-completion.patch b/extra/source/bash-completion/patches/0006-Remove-mplayer-aliased-completion.patch
new file mode 100644
index 00000000..7046f89e
--- /dev/null
+++ b/extra/source/bash-completion/patches/0006-Remove-mplayer-aliased-completion.patch
@@ -0,0 +1,22 @@
+--- ./completions/Makefile.in.orig	2016-03-03 06:12:35.000000000 -0600
++++ ./completions/Makefile.in	2016-05-31 14:01:42.323415707 -0500
+@@ -1236,7 +1236,7 @@
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mcrypt $(targetdir)/$$file ; \
+ 	done
+-	for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
++	for file in mplayer2 mencoder gmplayer kplayer ; do \
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mplayer $(targetdir)/$$file ; \
+ 	done
+--- ./completions/Makefile.am.orig	2016-03-02 13:42:58.000000000 -0600
++++ ./completions/Makefile.am	2016-05-31 14:01:33.554416246 -0500
+@@ -802,7 +802,7 @@
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mcrypt $(targetdir)/$$file ; \
+ 	done
+-	for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
++	for file in mplayer2 mencoder gmplayer kplayer ; do \
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mplayer $(targetdir)/$$file ; \
+ 	done
diff --git a/extra/source/bash-completion/slack-desc b/extra/source/bash-completion/slack-desc
index 12687b69..8f9e35b7 100644
--- a/extra/source/bash-completion/slack-desc
+++ b/extra/source/bash-completion/slack-desc
@@ -9,11 +9,11 @@
 bash-completion: bash-completion (programmable completion for the bash shell)
 bash-completion:
 bash-completion: Adds programmable completion to the bash shell.  A new file called
-bash-completion: /etc/bash_completion will be sourced for interactive bash shells
-bash-completion: adding all sorts of enhanced command completion features.  Once
-bash-completion: installed, you may get a list of all commands that have associated
-bash-completion: completions with 'complete -p', and examine the code for the shell
-bash-completion: functions with 'declare -f'.
+bash-completion: /etc/profile.d/bash_completion.sh will be sourced for interactive
+bash-completion: bash shells adding all sorts of enhanced command completion features.
+bash-completion: Once installed, you may get a list of all commands that have
+bash-completion: associated completions with 'complete -p', and examine the code for
+bash-completion: the shell functions with 'declare -f'.
 bash-completion:
 bash-completion: Homepage: https://alioth.debian.org/projects/bash-completion/
 bash-completion:
diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild
index 4678d34a..b53c14ac 100755
--- a/extra/source/brltty/brltty.SlackBuild
+++ b/extra/source/brltty/brltty.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2010, 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2010, 2012, 2013, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -30,13 +30,14 @@ if [ ! -d $TMP ]; then
 fi
 PKG=/tmp/package-brltty
 
-VERSION=4.5
-BUILD=${BUILD:-1}
+PKGNAM=brltty
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -49,6 +50,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 rm -rf $PKG
 mkdir -p $PKG
 cd $TMP
@@ -57,6 +60,7 @@ tar xvf $CWD/brltty-$VERSION.tar.?z* || exit 1
 cd brltty-$VERSION
 
 zcat $CWD/brltty.brlapi.pyx.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/brltty.fix.blanks.diff.gz | patch -p1 --verbose || exit 1
 
 sh autogen
 
@@ -66,6 +70,7 @@ find . -perm 700 -exec chmod 755 {} \;
 find . -perm 744 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
 find . -perm 600 -exec chmod 644 {} \;
+
 ./configure \
   --prefix=/usr \
   --bindir=/bin \
@@ -76,11 +81,16 @@ find . -perm 600 -exec chmod 644 {} \;
   --sysconfdir=/etc \
   --localstatedir=/var \
   --disable-java-bindings \
-  --build=$ARCH-slackware-linux
-make -j2 || exit 1
+  --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 chmod 755 $PKG/bin/* $PKG/lib${LIBDIRSUFFIX}/brltty/*
 
+# Add udev rules:
+mkdir -p $PKG/lib/udev/rules.d
+cp Autostart/Udev/udev.rules $PKG/lib/udev/rules.d/40-usb-brltty.rules
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -89,9 +99,8 @@ chmod 755 $PKG/bin/* $PKG/lib${LIBDIRSUFFIX}/brltty/*
 mkdir -p $PKG/usr/doc/brltty-$VERSION
 cp -a \
   README* COPYING* \
-  Documents/{Manual-*,TODO,CONTRIBUTORS,HISTORY,README.*} \
+  Documents/{ChangeLog,Manual-*,TODO,CONTRIBUTORS,HISTORY,README.*} \
   $PKG/usr/doc/brltty-$VERSION
-cat Documents/ChangeLog | head -n 150 > $PKG/usr/doc/brltty-$VERSION/ChangeLog
 ( cd $PKG/usr/doc/brltty-$VERSION
   find . -name "Makefile*" -exec rm -f {} \;
   find . -name "*.sgml" -exec rm -f {} \;
diff --git a/extra/source/brltty/brltty.fix.blanks.diff b/extra/source/brltty/brltty.fix.blanks.diff
new file mode 100644
index 00000000..19e4cefe
--- /dev/null
+++ b/extra/source/brltty/brltty.fix.blanks.diff
@@ -0,0 +1,27 @@
+From 74171852c8c11ebd4725e93cfac6a19906821272 Mon Sep 17 00:00:00 2001
+From: Dave Mielke <dave@mielke.cc>
+Date: Mon, 8 Feb 2016 22:06:45 -0500
+Subject: [PATCH] The Linux screen driver should prefer a blank [U+0020] if the
+ same glyph is also used for other characters. (dm)
+
+---
+ Drivers/Screen/Linux/screen.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Drivers/Screen/Linux/screen.c b/Drivers/Screen/Linux/screen.c
+index bb5e273..bc2f2c4 100644
+--- a/Drivers/Screen/Linux/screen.c
++++ b/Drivers/Screen/Linux/screen.c
+@@ -912,7 +912,9 @@ setTranslationTable (int force) {
+         const struct unipair *sfm = &screenFontMapTable[--screenFontMapIndex];
+ 
+         if (sfm->fontpos < count) {
+-          translationTable[sfm->fontpos] = sfm->unicode;
++          wchar_t *character = &translationTable[sfm->fontpos];
++          if (*character == 0X20) continue;
++          *character = sfm->unicode;
+         }
+       }
+     }
+-- 
+2.1.1.1.g1fb337f
diff --git a/extra/source/brltty/dump.dos.windows.stuff.sh b/extra/source/brltty/dump.dos.windows.stuff.sh
new file mode 100755
index 00000000..0d94beec
--- /dev/null
+++ b/extra/source/brltty/dump.dos.windows.stuff.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Repacks the brltty tarball to remove the unneeded DOS/Windows stuff.
+
+VERSION=${VERSION:-$(echo brltty-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+
+tar xf brltty-${VERSION}.tar.xz || exit 1
+mv brltty-${VERSION}.tar.xz brltty-${VERSION}.tar.xz.orig
+rm -r brltty-${VERSION}/DOS
+rm -r brltty-${VERSION}/Windows
+tar cf brltty-${VERSION}.tar brltty-${VERSION}
+rm -r brltty-${VERSION}
+xz -9 brltty-${VERSION}.tar
+touch -r brltty-${VERSION}.tar.xz.orig brltty-${VERSION}.tar.xz
+rm brltty-${VERSION}.tar.xz.orig
diff --git a/extra/source/brltty/slack-desc b/extra/source/brltty/slack-desc
index d9962499..d1cb59db 100644
--- a/extra/source/brltty/slack-desc
+++ b/extra/source/brltty/slack-desc
@@ -12,7 +12,7 @@ brltty: BRLTTY is a daemon which provides access to the Linux console (text
 brltty: mode) for a blind person using a soft braille display.  It drives the
 brltty: braille terminal and provides complete screen review functionality.
 brltty:
-brltty:
+brltty: Homepage:  http://mielke.cc/brltty/
 brltty:
 brltty:
 brltty:
diff --git a/extra/source/emacspeak/emacspeak.git b/extra/source/emacspeak/emacspeak.git
new file mode 100644
index 00000000..2f6e5933
--- /dev/null
+++ b/extra/source/emacspeak/emacspeak.git
@@ -0,0 +1 @@
+git clone https://github.com/tvraman/emacspeak
diff --git a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
index ed2a324d..27c091cd 100755
--- a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
+++ b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -28,72 +28,6 @@
 # Descr:        Adobe flash player plugin for mozilla
 # URL:
 #   http://labs.adobe.com/technologies/flashplatformruntimes/flashplayer11/
-# Needs:        
-# Changelog:    
-# 10.0.d20.7-1:  16/Dec/2008 by Eric Hameleers <alien@slackware.com>
-#                * Initial build.
-# 10.0.d21.1-1:  20/Dec/2008 by Eric Hameleers <alien@slackware.com>
-#                * Update.
-# 10.0.22.87-1:  26/feb/2009 by Eric Hameleers <alien@slackware.com>
-#                * Update (plugs vulnerability).
-# 10.0.32.18-1:  10/aug/2009 by Patrick J. Volkerding <volkerdi@slackware.com>
-#                * Update (plugs vulnerability).
-# 10.0.42.34-1:  14/dec/2009 by Patrick J. Volkerding <volkerdi@slackware.com>
-#                * Update (plugs vulnerability).
-# 10.091510-1:   15/sep/2010 by Eric Hameleers <alien@slackware.com>
-#                * Preview1 of "flash player square".
-# 10.092710-1:   28/sep/2010 by Eric Hameleers <alien@slackware.com>
-#                * Preview2 of "flash player square".
-# 10_2.111710-1: 28/sep/2010 by Eric Hameleers <alien@slackware.com>
-#                * New preview of "flash player square" for 64-bit Linux; there
-#                  is no more 32-bit "square" version, because new developments
-#                  are being folded into regular flashplayer10.
-# 11b1.071311-1: 25/jul/2011 by Eric Hameleers <alien@slackware.com>
-#                * Update to version 11 beta 1.
-#                  Looks like 64-bit support has finally been folded into the
-#                  mainstream development of the plugin.
-# 11b1.080811-1: 12/aug/2011 by Eric Hameleers <alien@slackware.com>
-#                * Update to version 11 beta 2.
-# 11r1.090611-1: 11/sep/2011 by Eric Hameleers <alien@slackware.com>
-#                * Update to version 11 release candidate 1.
-# 11.0.1.152-1:  04/oct/2011 by Eric Hameleers <alien@slackware.com>
-#                * Update to stable release 11!
-# 11.1.102.55-1: 05/feb/2012 by Eric Hameleers <alien@slackware.com>
-#                * Update to release 11.1.
-# 11.1.102.62-1: 05/feb/2012 by Eric Hameleers <alien@slackware.com>
-#                * Minor update.
-# 11.2.202.228-1:29/mar/2012 by Eric Hameleers <alien@slackware.com>
-#                * Minor update.
-# 11.2.202.233-1:20/apr/2012 by Eric Hameleers <alien@slackware.com>
-#                * Minor update.
-# 11.2.202.235-1:05/may/2012 by Eric Hameleers <alien@slackware.com>
-#                * Minor update.
-# 11.2.202.236-1:19/jun/2012 by Eric Hameleers <alien@slackware.com>
-#                * Minor update.
-# 11.2.202.238-1:15/aug/2012 by Eric Hameleers <alien@slackware.com>
-#                * Security update.
-# 11.2.202.243-1:10/oct/2012 by Eric Hameleers <alien@slackware.com>
-#                * Update.
-# 11.2.202.251-1:08/nov/2012 by Eric Hameleers <alien@slackware.com>
-#                * Update.
-# 11.2.202.258-1:13/dec/2012 by Eric Hameleers <alien@slackware.com>
-#                * Update.
-# 11.2.202.261-1:12/jan/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-01.
-# 11.2.202.270-1:12/feb/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-04.
-# 11.2.202.273-1:01/mar/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-08.
-# 11.2.202.275-1:13/mar/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-09.
-# 11.2.202.280-1:10/apr/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-11.
-# 11.2.202.285-1:15/may/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-14.
-# 11.2.202.291-1:12/jun/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-16.
-# 11.2.202.297-1:21/jul/2013 by Eric Hameleers <alien@slackware.com>
-#                * Update fixes critical vulnerabilities. See APSB13-17.
 # 
 # Run 'sh flashplayer-plugin.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -104,10 +38,11 @@
 # Set initial variables:
 
 PRGNAM=flashplayer-plugin
-VERSION=${VERSION:-"11.2.202.297"}
+# Determine the latest version by checking the web page:
+VERSION=${VERSION:-"$(wget -O - http://www.adobe.com/software/flash/about/ 2>/dev/null | sed -n "/Firefox - NPAPI/{N;p}" | tr -d ' '| tail -1 | tr '<>' '  ' | cut -f3 -d ' ')"}
 MAJVER=$(echo $VERSION | cut -d. -f1)
 BUILD=${BUILD:-1}
-TAG=${TAG:-"alien"}
+TAG=${TAG:-}
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -233,18 +168,11 @@ if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
 fi
 
-# Update hicolor theme cache:
-if [ -d usr/share/icons/hicolor ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
-  fi
-fi
-
 EOINS
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION/ || true
+mv LGPL *.txt $PKG/usr/doc/$PRGNAM-$VERSION/ || true
 cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
diff --git a/extra/source/fltk/Fl_XFont_On_Demand.patch b/extra/source/fltk/Fl_XFont_On_Demand.patch
new file mode 100644
index 00000000..b61def2a
--- /dev/null
+++ b/extra/source/fltk/Fl_XFont_On_Demand.patch
@@ -0,0 +1,42 @@
+Index: src/fl_font.cxx
+===================================================================
+--- src/fl_font.cxx	(revision 10503)
++++ src/fl_font.cxx	(revision 10504)
+@@ -55,6 +55,12 @@
+ #  include "fl_font_x.cxx"
+ #endif // WIN32
+ 
++#if ! (defined(WIN32) || defined(__APPLE__))
++XFontStruct *fl_X_core_font()
++{
++  return fl_xfont.value();
++}
++#endif
+ 
+ double fl_width(const char* c) {
+   if (c) return fl_width(c, (int) strlen(c));
+Index: src/gl_draw.cxx
+===================================================================
+--- src/gl_draw.cxx	(revision 10503)
++++ src/gl_draw.cxx	(revision 10504)
+@@ -81,7 +81,7 @@
+  * then sorting through them at draw time (for normal X rendering) to find which one can
+  * render the current glyph... But for now, just use the first font in the list for GL...
+  */
+-    XFontStruct *font = fl_xfont;
++    XFontStruct *font = fl_X_core_font();
+     int base = font->min_char_or_byte2;
+     int count = font->max_char_or_byte2-base+1;
+     fl_fontsize->listbase = glGenLists(256);
+Index: FL/x.H
+===================================================================
+--- FL/x.H	(revision 10503)
++++ FL/x.H	(revision 10504)
+@@ -132,6 +132,7 @@
+   XFontStruct *ptr;
+ };
+ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
++extern FL_EXPORT XFontStruct* fl_X_core_font();
+ 
+ // this object contains all X-specific stuff about a window:
+ // Warning: this object is highly subject to change!  
diff --git a/extra/source/fltk/fltk.SlackBuild b/extra/source/fltk/fltk.SlackBuild
new file mode 100755
index 00000000..7ed940e3
--- /dev/null
+++ b/extra/source/fltk/fltk.SlackBuild
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+# Copyright 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=fltk
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-${VERSION}-source.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/Fl_XFont_On_Demand.patch.gz | patch -p0 --verbose || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --includedir=/usr/include \
+  --mandir=/usr/man \
+  --enable-cairo \
+  --enable-gl \
+  --enable-largefile \
+  --enable-threads \
+  --enable-x11 \
+  --enable-xcursor \
+  --enable-xdbe \
+  --enable-xinerama \
+  --enable-xfixes \
+  --enable-xft \
+  --with-x \
+  --enable-shared \
+  --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG docdir=/usr/doc/$PKGNAM-$VERSION || exit 1
+
+# Removed pre-generated man pages:
+rm -rf $PKG/usr/man/cat*
+
+# Remove static libraries:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
+# Stripping the .a libraries doesn't make a significant difference, so forget it:
+#find $PKG -name "*.a" | xargs file | grep "ar archive" | cut -f 1 -d : | xargs strip -g 2> /dev/null
+
+# Strip binaries:
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  ANNOUNCEMENT COPYING* CREDITS README* VERSION \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a documentation/README $PKG/usr/doc/${PKGNAM}-$VERSION/README.documentation
+
+# Compress and if needed symlink the man pages:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/extra/source/fltk/slack-desc b/extra/source/fltk/slack-desc
new file mode 100644
index 00000000..3175b3e8
--- /dev/null
+++ b/extra/source/fltk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+fltk: fltk (The Fast Light Tool Kit)
+fltk:
+fltk: The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a a cross-
+fltk: platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11), Microsoft(r)
+fltk: Windows(r), and MacOS(r) X.  FLTK provides modern GUI functionality
+fltk: without the bloat and supports 3D graphics via OpenGL(r) and its
+fltk: built-in GLUT emulation.  The Fast Light Tool Kit was originally
+fltk: developed by Mr. Bill Spitzak.
+fltk:
+fltk: fltk home: http://www.fltk.org
+fltk:
diff --git a/extra/source/partitionmanager/doinst.sh b/extra/source/partitionmanager/doinst.sh
deleted file mode 100644
index e376b59a..00000000
--- a/extra/source/partitionmanager/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/extra/source/partitionmanager/fetch-source.sh b/extra/source/partitionmanager/fetch-source.sh
deleted file mode 100755
index b7bb6566..00000000
--- a/extra/source/partitionmanager/fetch-source.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-NAME_VERSION=partitionmanager-1.0.3
-SVN_DATE=$(date +%Y%m%d)
-
-# Remove old sources if exist
-rm -R --force ${NAME_VERSION}
-
-# Checkout svn trunk
-svn -r {${SVN_DATE}} export svn://anonsvn.kde.org/home/kde/trunk/extragear/sysadmin/partitionmanager/ ${NAME_VERSION}
-
-# Move downloaded directory to match output tarball name:
-mv ${NAME_VERSION} ${NAME_VERSION}_${SVN_DATE}svn
-
-# Create source tarball
-tar cvf ${NAME_VERSION}_${SVN_DATE}svn.tar ${NAME_VERSION}_${SVN_DATE}svn
-
-# Compress source tarball
-xz -9 -v ${NAME_VERSION}_${SVN_DATE}svn.tar
-
-# Delete temporary directories
-rm -R --force ${NAME_VERSION}_${SVN_DATE}svn
diff --git a/extra/source/partitionmanager/partitionmanager.SlackBuild b/extra/source/partitionmanager/partitionmanager.SlackBuild
deleted file mode 100755
index 8035f522..00000000
--- a/extra/source/partitionmanager/partitionmanager.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# Copyright 2009, 2010, 2013  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-VERSION=1.0.3_20130328svn
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-NUMJOBS=${NUMJOBS:--j6}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-partitionmanager
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf partitionmanager-$VERSION
-tar xvf $CWD/partitionmanager-$VERSION.tar.?z* || exit 1
-cd partitionmanager-$VERSION || exit 1
-
-## All the rest of KDE uses 'en' not 'en_US' as a documentation language:
-#mv doc/{en_US,en} || exit 1
-#sed -i -e 's/en_US/en/' doc/CMakeLists.txt
-#sed -i -e 's/en_US/en/' doc/en/CMakeLists.txt
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/partitionmanager-$VERSION
-cp -a \
-  BUGS CHANGES* COPYING* INSTALL README* \
-  $PKG/usr/doc/partitionmanager-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/partitionmanager-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
-
diff --git a/extra/source/partitionmanager/slack-desc b/extra/source/partitionmanager/slack-desc
deleted file mode 100644
index 0f8c6678..00000000
--- a/extra/source/partitionmanager/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------|
-partitionmanager: partitionmanager (Graphical partition manager for KDE4)
-partitionmanager:
-partitionmanager: Easily manage disks, partitions and filesystems on your KDE
-partitionmanager: desktop.  Create, resize, move, copy, back up, restore or
-partitionmanager: delete partitions.
-partitionmanager:
-partitionmanager:
-partitionmanager:
-partitionmanager:
-partitionmanager:
-partitionmanager:
diff --git a/extra/source/tigervnc/10-libvnc.conf b/extra/source/tigervnc/10-libvnc.conf
new file mode 100644
index 00000000..dc0feadd
--- /dev/null
+++ b/extra/source/tigervnc/10-libvnc.conf
@@ -0,0 +1,21 @@
+# This file contains configuration of libvnc.so module
+# Source: http://pkgs.fedoraproject.org/cgit/tigervnc.git/plain/10-libvnc.conf
+#
+# To get libvnc.so module working, do this:
+# 1. run "vncpasswd" as root user
+# 2. uncomment configuration lines below
+#
+# Please note you can specify any option which Xvnc accepts.
+# Refer to `Xvnc -help` output for detailed list of options.
+
+#Section "Module"
+#    Load "vnc"
+#EndSection
+
+#Section "Screen"
+#    Identifier "Screen0"
+#    DefaultDepth 16
+#    Option "SecurityTypes" "VncAuth"
+#    Option "PasswordFile" "/root/.vnc/passwd"
+#EndSection
+
diff --git a/extra/source/tigervnc/patches/tigervnc-xorg118-QueueKeyboardEvents.patch b/extra/source/tigervnc/patches/tigervnc-xorg118-QueueKeyboardEvents.patch
new file mode 100644
index 00000000..55a6da83
--- /dev/null
+++ b/extra/source/tigervnc/patches/tigervnc-xorg118-QueueKeyboardEvents.patch
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>tigervnc.git - tigervnc</title>
+<meta name='generator' content='cgit v0.11.2'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/tigervnc.git/atom/tigervnc-xorg118-QueueKeyboardEvents.patch?h=master' type='application/atom+xml'/>
+<link rel='vcs-git' href='git://pkgs.fedoraproject.org/tigervnc.git' title='tigervnc.git Git repository'/>
+<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/tigervnc.git' title='tigervnc.git Git repository'/>
+<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/tigervnc.git' title='tigervnc.git Git repository'/>
+</head>
+<body>
+<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
+<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
+
+<script>
+    var base = 'https://apps.fedoraproject.org/';
+    var tokens = window.location.href.split('/');
+  var repo = null;
+  if (tokens.length > 4 && tokens[4] != '') {
+    repo = tokens[4].split('.')[0];
+  }
+  fedmenu({
+      'url': base + 'js/data.js',
+      'mimeType': 'application/javascript',
+      'position': 'bottom-right',
+      'package': repo,
+  });
+</script>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='tigervnc.git' href='/cgit/tigervnc.git/'>tigervnc.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='el5'>el5</option>
+<option value='f11'>f11</option>
+<option value='f12'>f12</option>
+<option value='f13'>f13</option>
+<option value='f14'>f14</option>
+<option value='f15'>f15</option>
+<option value='f16'>f16</option>
+<option value='f17'>f17</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='f21'>f21</option>
+<option value='f22'>f22</option>
+<option value='f23'>f23</option>
+<option value='master' selected='selected'>master</option>
+<option value='private-twaugh-bz1137023-f20'>private-twaugh-bz1137023-f20</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>tigervnc</td><td class='sub right'>Jesse Keating</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/tigervnc.git/'>summary</a><a href='/cgit/tigervnc.git/refs/'>refs</a><a href='/cgit/tigervnc.git/log/tigervnc-xorg118-QueueKeyboardEvents.patch'>log</a><a class='active' href='/cgit/tigervnc.git/tree/tigervnc-xorg118-QueueKeyboardEvents.patch'>tree</a><a href='/cgit/tigervnc.git/commit/tigervnc-xorg118-QueueKeyboardEvents.patch'>commit</a><a href='/cgit/tigervnc.git/diff/tigervnc-xorg118-QueueKeyboardEvents.patch'>diff</a><a href='/cgit/tigervnc.git/stats/tigervnc-xorg118-QueueKeyboardEvents.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/tigervnc.git/log/tigervnc-xorg118-QueueKeyboardEvents.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/tigervnc.git/tree/'>root</a>/<a href='/cgit/tigervnc.git/tree/tigervnc-xorg118-QueueKeyboardEvents.patch'>tigervnc-xorg118-QueueKeyboardEvents.patch</a></div><div class='content'>blob: 4eb738b791cee91551ecf74de4aa35305984e7b8 (<a href='/cgit/tigervnc.git/plain/tigervnc-xorg118-QueueKeyboardEvents.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+</pre></td>
+<td class='lines'><pre><code>diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c
+--- a/unix/xserver/hw/vnc/Input.c
++++ b/unix/xserver/hw/vnc/Input.c
+@@ -301,7 +301,7 @@ static inline void pressKey(DeviceIntPtr dev, int kc, Bool down, const char *msg
+ 	n = GetKeyboardEvents(eventq, dev, action, kc);
+ 	enqueueEvents(dev, n);
+ #else
+-	QueueKeyboardEvents(dev, action, kc, NULL);
++	QueueKeyboardEvents(dev, action, kc);
+ #endif
+ }
+ 
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.11.2</a> at 2015-11-12 22:24:09 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/extra/source/tigervnc/patches/tigervnc.support.xorg.118.patch b/extra/source/tigervnc/patches/tigervnc.support.xorg.118.patch
new file mode 100644
index 00000000..a0d5b930
--- /dev/null
+++ b/extra/source/tigervnc/patches/tigervnc.support.xorg.118.patch
@@ -0,0 +1,14 @@
+--- ./unix/xserver/hw/vnc/xorg-version.h.orig	2015-07-11 08:00:36.000000000 -0500
++++ ./unix/xserver/hw/vnc/xorg-version.h	2015-11-12 16:19:53.643193478 -0600
+@@ -48,8 +48,10 @@
+ #define XORG 116
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
+ #define XORG 117
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
++#define XORG 118
+ #else
+-#error "X.Org newer than 1.17 is not supported"
++#error "X.Org newer than 1.18 is not supported"
+ #endif
+ 
+ #endif
diff --git a/extra/source/tigervnc/patches/tigervnc11-java7.patch b/extra/source/tigervnc/patches/tigervnc11-java7.patch
deleted file mode 100644
index 6f30060d..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-java7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.1.0/java/src/com/tigervnc/vncviewer/Makefile.java7 tigervnc-1.1.0/java/src/com/tigervnc/vncviewer/Makefile
---- tigervnc-1.1.0/java/src/com/tigervnc/vncviewer/Makefile.java7	2012-03-27 14:20:20.107009796 +0200
-+++ tigervnc-1.1.0/java/src/com/tigervnc/vncviewer/Makefile	2012-03-27 14:20:25.959966078 +0200
-@@ -4,7 +4,7 @@
- 
- CP = cp
- JC = javac
--JCFLAGS = -target 1.5 -classpath ../../../
-+JCFLAGS = -target 1.7 -classpath ../../../
- JAR = jar
- ARCHIVE = VncViewer.jar
- MANIFEST = MANIFEST.MF
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg110.patch b/extra/source/tigervnc/patches/tigervnc11-xorg110.patch
deleted file mode 100644
index d70d6f91..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg110.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc	2012-07-19 20:22:21.774770804 -0400
-+++ xserver/configure.ac	2012-07-19 20:24:42.293014083 -0400
-@@ -72,6 +71,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
-@@ -1560,6 +1560,14 @@ if test "x$XVFB" = xyes; then
- 	AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC $MIEXT_DAMAGE_INC"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
-+
-+dnl This is necessary to allow Xvnc to statically link with GnuTLS
-+AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])
-+AC_SUBST(GNUTLS_LDFLAGS)
- 
- dnl Xnest DDX
- 
-@@ -1595,6 +1603,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -1813,7 +1823,6 @@ if test "x$XORG" = xyes; then
- 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
--	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2279,6 +2288,7 @@ hw/dmx/Makefile
- hw/dmx/man/Makefile
- hw/vfb/Makefile
- hw/vfb/man/Makefile
-+hw/vnc/Makefile
- hw/xnest/Makefile
- hw/xnest/man/Makefile
- hw/xwin/Makefile
-diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc	2012-07-19 20:22:28.575685781 -0400
-+++ xserver/hw/Makefile.am	2012-07-19 20:22:31.483649426 -0400
-@@ -33,7 +33,8 @@ SUBDIRS =			\
- 	$(XNEST_SUBDIRS)	\
- 	$(DMX_SUBDIRS)		\
- 	$(KDRIVE_SUBDIRS)	\
--	$(XQUARTZ_SUBDIRS)
-+	$(XQUARTZ_SUBDIRS)	\
-+	vnc
- 
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
- 
-diff -up xserver/include/extinit.h.vnc xserver/include/extinit.h
---- xserver/include/extinit.h.vnc	2012-07-19 20:25:50.465161815 -0400
-+++ xserver/include/extinit.h	2012-07-19 20:25:52.490136499 -0400
-@@ -81,6 +81,8 @@ extern void DPMSExtensionInit(void);
- extern Bool noGEExtension;
- extern void GEExtensionInit(void);
- 
-+extern void vncExtensionInit(void);
-+
- #ifdef GLXEXT
- extern _X_EXPORT Bool noGlxExtension;
- extern void GlxExtensionInit(void);
-diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc	2012-07-19 20:22:30.000000000 -0400
-+++ xserver/mi/miinitext.c	2012-07-19 20:26:48.560435524 -0400
-@@ -293,6 +293,7 @@ static ExtensionModule staticExtensions[
- #ifdef XSELINUX
-     {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
- #endif
-+    {vncExtensionInit, "VNC", NULL},
- };
- 
- static ExtensionModule *ExtensionModuleList = NULL;
-
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg111.patch b/extra/source/tigervnc/patches/tigervnc11-xorg111.patch
deleted file mode 100644
index 690ca6be..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg111.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-diff -up xserver/hw/vnc/Input.cc.xorg111 xserver/hw/vnc/Input.cc
---- xserver/hw/vnc/Input.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ xserver/hw/vnc/Input.cc	2011-11-11 11:59:14.226819903 +0100
-@@ -82,10 +82,11 @@ static KeyCode KeysymToKeycode(KeySymsPt
- /* Event queue is shared between all devices. */
- #if XORG == 15
- static xEvent *eventq = NULL;
--#else
-+#elif XORG < 111
- static EventList *eventq = NULL;
- #endif
- 
-+#if XORG < 111
- static void initEventq(void)
- {
- 	/* eventq is never free()-ed because it exists during server life. */
-@@ -100,7 +101,9 @@ static void initEventq(void)
- #endif
- 	}
- }
-+#endif /* XORG < 111 */
- 
-+#if XORG < 111
- static void enqueueEvents(DeviceIntPtr dev, int n)
- {
- 	int i;
-@@ -122,6 +125,7 @@ static void enqueueEvents(DeviceIntPtr d
- 			   );
- 	}
- }
-+#endif /* XORG < 111 */
- 
- InputDevice::InputDevice(rfb::VNCServerST *_server)
- 	: server(_server), oldButtonMask(0)
-@@ -141,12 +145,17 @@ InputDevice::InputDevice(rfb::VNCServerS
- 				     keyboardProc, TRUE);
- 	RegisterKeyboardDevice(keyboardDev);
- #endif
-+#if XORG < 111
- 	initEventq();
-+#endif
- }
- 
- void InputDevice::PointerButtonAction(int buttonMask)
- {
--	int i, n;
-+	int i;
-+#if XORG < 111
-+	int n;
-+#endif
- #if XORG >= 110
- 	ValuatorMask mask;
- #endif
-@@ -160,13 +169,17 @@ void InputDevice::PointerButtonAction(in
- #if XORG < 110
- 			n = GetPointerEvents(eventq, pointerDev, action, i + 1,
- 					     POINTER_RELATIVE, 0, 0, NULL);
--#else
-+			enqueueEvents(pointerDev, n);
-+#elif XORG < 111
- 			valuator_mask_set_range(&mask, 0, 0, NULL);
- 			n = GetPointerEvents(eventq, pointerDev, action, i + 1,
- 					     POINTER_RELATIVE, &mask);
--#endif
- 			enqueueEvents(pointerDev, n);
--
-+#else
-+			valuator_mask_set_range(&mask, 0, 0, NULL);
-+			QueuePointerEvents(pointerDev, action, i + 1,
-+					   POINTER_RELATIVE, &mask);
-+#endif
- 		}
- 	}
- 
-@@ -175,7 +188,10 @@ void InputDevice::PointerButtonAction(in
- 
- void InputDevice::PointerMove(const rfb::Point &pos)
- {
--	int n, valuators[2];
-+	int valuators[2];
-+#if XORG < 111
-+	int n;
-+#endif
- #if XORG >= 110
- 	ValuatorMask mask;
- #endif
-@@ -190,12 +206,16 @@ void InputDevice::PointerMove(const rfb:
- #if XORG < 110
- 	n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, 0,
- 			     2, valuators);
--#else
-+	enqueueEvents(pointerDev, n);
-+#elif XORG < 111
- 	valuator_mask_set_range(&mask, 0, 2, valuators);
- 	n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE,
- 			     &mask);
--#endif
- 	enqueueEvents(pointerDev, n);
-+#else
-+	valuator_mask_set_range(&mask, 0, 2, valuators);
-+	QueuePointerEvents(pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, &mask);
-+#endif
- 
- 	cursorPos = pos;
- }
-@@ -299,14 +319,20 @@ void InputDevice::initInputDevice(void)
- static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg)
- {
- 	int action;
-+#if XORG < 111
- 	unsigned int n;
-+#endif
- 
- 	if (msg != NULL)
- 		vlog.debug("%s %d %s", msg, kc, down ? "down" : "up");
- 
- 	action = down ? KeyPress : KeyRelease;
--	n = GetKeyboardEvents(eventq, dev, action, kc);
-+#if XORG < 111
-+	n = GetKeyboardEvents(eventq, dev, action, kc, NULL);
- 	enqueueEvents(dev, n);
-+#else
-+	QueueKeyboardEvents(dev, action, kc, NULL);
-+#endif
- }
- 
- #define IS_PRESSED(keyc, keycode) \
-@@ -341,8 +367,11 @@ public:
- 		int state, maxKeysPerMod, keycode;
- #if XORG >= 17
- 		KeyCode *modmap = NULL;
--
-+#if XORG >= 111
-+		state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state);
-+#else /* XORG >= 111 */
- 		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
-+#endif /* XORG >= 111 */
- #else
- 		KeyClassPtr keyc = dev->key;
- 		state = keyc->state;
-@@ -380,7 +409,11 @@ public:
- #if XORG >= 17
- 		KeyCode *modmap = NULL;
- 
-+#if XORG >= 111
-+		keyc = dev->master->key;
-+#else /* XORG >= 111 */
- 		keyc = dev->u.master->key;
-+#endif /* XORG >= 111 */
- 		state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
- #else
- 		keyc = dev->key;
-@@ -596,7 +629,11 @@ void InputDevice::keyEvent(rdr::U32 keys
- 	}
- 
- #if XORG >= 17
-+#if XORG >= 111
-+	keyc = keyboardDev->master->key;
-+#else /* XORG >= 111 */
- 	keyc = keyboardDev->u.master->key;
-+#endif /* XORG >= 111 */
- 
- 	keymap = XkbGetCoreMap(keyboardDev);
- 	if (!keymap) {
-@@ -753,7 +790,11 @@ ModeSwitchFound:
- 			XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
- 					      maxKeyCode - minKeyCode + 1,
- 					      NULL, serverClient);
-+#if XORG >= 111
-+			XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev);
-+#else
- 			XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
-+#endif
- #endif /* XORG < 17 */
- 			break;
- 		}
-diff -up xserver/hw/vnc/xorg-version.h.xorg111 xserver/hw/vnc/xorg-version.h
---- xserver/hw/vnc/xorg-version.h.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ xserver/hw/vnc/xorg-version.h	2011-11-11 11:55:32.255835319 +0100
-@@ -36,6 +36,8 @@
- #define XORG 19
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000))
- #define XORG 110
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
-+#define XORG 111
- #else
- #error "X.Org newer than 1.10 is not supported"
- #endif
-diff -up xserver/hw/vnc/xvnc.cc.xorg111 xserver/hw/vnc/xvnc.cc
---- xserver/hw/vnc/xvnc.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ xserver/hw/vnc/xvnc.cc	2011-11-11 11:55:32.256835319 +0100
-@@ -211,7 +211,11 @@ static void vfbFreeFramebufferMemory(vfb
- 
- extern "C" {
- 
-+#if XORG < 111
- void ddxGiveUp()
-+#else
-+void ddxGiveUp(enum ExitCode error)
-+#endif
- {
-     int i;
- 
-@@ -221,9 +225,17 @@ void ddxGiveUp()
- }
- 
- void
-+#if XORG < 111
- AbortDDX()
-+#else
-+AbortDDX(enum ExitCode error)
-+#endif
- {
-+#if XORG < 111
-     ddxGiveUp();
-+#else
-+    ddxGiveUp(error);
-+#endif
- }
- 
- #ifdef __DARWIN__
-@@ -668,8 +680,13 @@ vfbUninstallColormap(ColormapPtr pmap)
-     {
- 	if (pmap->mid != pmap->pScreen->defColormap)
- 	{
-+#if XORG < 111
- 	    curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap,
- 						   RT_COLORMAP);
-+#else
-+	    dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap,
-+				    RT_COLORMAP, serverClient, DixUnknownAccess);
-+#endif
- 	    (*pmap->pScreen->InstallColormap)(curpmap);
- 	}
-     }
-
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg112.patch b/extra/source/tigervnc/patches/tigervnc11-xorg112.patch
deleted file mode 100644
index 2931cd7e..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg112.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-diff -up xserver/hw/vnc/vncExtInit.cc.xorg112 xserver/hw/vnc/vncExtInit.cc
---- xserver/hw/vnc/vncExtInit.cc.xorg112	2011-08-09 23:16:36.000000000 +0200
-+++ xserver/hw/vnc/vncExtInit.cc	2012-03-27 12:54:56.937271323 +0200
-@@ -56,6 +56,7 @@ extern "C" {
- #include "XserverDesktop.h"
- #include "vncHooks.h"
- #include "vncExtInit.h"
-+#include "xorg-version.h"
- 
- extern "C" {
- 
-@@ -360,10 +361,16 @@ void vncClientCutText(const char* str, i
-       ev.window = cur->window;
-       ev.time = GetTimeInMillis();
-       if (cur->client->swapped) {
-+#if XORG < 112
-         int n;
-         swaps(&ev.sequenceNumber, n);
-         swapl(&ev.window, n);
-         swapl(&ev.time, n);
-+#else
-+        swaps(&ev.sequenceNumber);
-+        swapl(&ev.window);
-+        swapl(&ev.time);
-+#endif
-       }
-       WriteToClient(cur->client, sizeof(xVncExtClientCutTextNotifyEvent),
-                     (char *)&ev);
-@@ -406,9 +413,14 @@ void vncQueryConnect(XserverDesktop* des
-       ev.sequenceNumber = cur->client->sequence;
-       ev.window = cur->window;
-       if (cur->client->swapped) {
-+#if XORG < 112
-         int n;
-         swaps(&ev.sequenceNumber, n);
-         swapl(&ev.window, n);
-+#else
-+        swaps(&ev.sequenceNumber);
-+        swapl(&ev.window);
-+#endif
-       }
-       WriteToClient(cur->client, sizeof(xVncExtQueryConnectNotifyEvent),
-                     (char *)&ev);
-@@ -449,10 +461,16 @@ static void SendSelectionChangeEvent(Ato
-       ev.window = cur->window;
-       ev.selection = selection;
-       if (cur->client->swapped) {
-+#if XORG < 112
-         int n;
-         swaps(&ev.sequenceNumber, n);
-         swapl(&ev.window, n);
-         swapl(&ev.selection, n);
-+#else
-+        swaps(&ev.sequenceNumber);
-+        swapl(&ev.window);
-+        swapl(&ev.selection);
-+#endif
-       }
-       WriteToClient(cur->client, sizeof(xVncExtSelectionChangeNotifyEvent),
-                     (char *)&ev);
-@@ -473,7 +491,6 @@ static int ProcVncExtSetParam(ClientPtr
-   param.buf[stuff->paramLen] = 0;
- 
-   xVncExtSetParamReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.length = 0;
-   rep.success = 0;
-@@ -514,8 +531,14 @@ static int ProcVncExtSetParam(ClientPtr
- 
- deny:
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtSetParamReply), (char *)&rep);
-   return (client->noClientException);
-@@ -523,9 +546,13 @@ deny:
- 
- static int SProcVncExtSetParam(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtSetParamReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtSetParamReq);
-   return ProcVncExtSetParam(client);
- }
-@@ -539,7 +566,6 @@ static int ProcVncExtGetParam(ClientPtr
-   param.buf[stuff->paramLen] = 0;
- 
-   xVncExtGetParamReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
-   rep.success = 0;
-@@ -557,9 +583,16 @@ static int ProcVncExtGetParam(ClientPtr
-   rep.length = (len + 3) >> 2;
-   rep.valueLen = len;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swaps(&rep.valueLen, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swaps(&rep.valueLen);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetParamReply), (char *)&rep);
-   if (value)
-@@ -570,9 +603,13 @@ static int ProcVncExtGetParam(ClientPtr
- 
- static int SProcVncExtGetParam(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetParamReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtGetParamReq);
-   return ProcVncExtGetParam(client);
- }
-@@ -586,7 +623,6 @@ static int ProcVncExtGetParamDesc(Client
-   param.buf[stuff->paramLen] = 0;
- 
-   xVncExtGetParamDescReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
-   rep.success = 0;
-@@ -601,9 +637,16 @@ static int ProcVncExtGetParamDesc(Client
-   rep.length = (len + 3) >> 2;
-   rep.descLen = len;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swaps(&rep.descLen, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swaps(&rep.descLen);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetParamDescReply), (char *)&rep);
-   if (desc)
-@@ -613,9 +656,13 @@ static int ProcVncExtGetParamDesc(Client
- 
- static int SProcVncExtGetParamDesc(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetParamDescReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtGetParamDescReq);
-   return ProcVncExtGetParamDesc(client);
- }
-@@ -626,7 +673,6 @@ static int ProcVncExtListParams(ClientPt
-   REQUEST_SIZE_MATCH(xVncExtListParamsReq);
- 
-   xVncExtListParamsReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
- 
-@@ -642,9 +688,16 @@ static int ProcVncExtListParams(ClientPt
-   rep.length = (len + 3) >> 2;
-   rep.nParams = nParams;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swaps(&rep.nParams, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swaps(&rep.nParams);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtListParamsReply), (char *)&rep);
-   rdr::U8* data = new rdr::U8[len];
-@@ -664,9 +717,13 @@ static int ProcVncExtListParams(ClientPt
- 
- static int SProcVncExtListParams(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtListParamsReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtListParamsReq);
-   return ProcVncExtListParams(client);
- }
-@@ -689,11 +746,19 @@ static int ProcVncExtSetServerCutText(Cl
- 
- static int SProcVncExtSetServerCutText(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtSetServerCutTextReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtSetServerCutTextReq);
-+#if XORG < 112
-   swapl(&stuff->textLen, n);
-+#else
-+  swapl(&stuff->textLen);
-+#endif
-   return ProcVncExtSetServerCutText(client);
- }
- 
-@@ -703,15 +768,21 @@ static int ProcVncExtGetClientCutText(Cl
-   REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
- 
-   xVncExtGetClientCutTextReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.length = (clientCutTextLen + 3) >> 2;
-   rep.sequenceNumber = client->sequence;
-   rep.textLen = clientCutTextLen;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-     swapl(&rep.textLen, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+    swapl(&rep.textLen);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetClientCutTextReply), (char *)&rep);
-   if (clientCutText)
-@@ -721,9 +792,13 @@ static int ProcVncExtGetClientCutText(Cl
- 
- static int SProcVncExtGetClientCutText(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetClientCutTextReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
-   return ProcVncExtGetClientCutText(client);
- }
-@@ -753,12 +828,21 @@ static int ProcVncExtSelectInput(ClientP
- 
- static int SProcVncExtSelectInput(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtSelectInputReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtSelectInputReq);
-+#if XORG < 112
-   swapl(&stuff->window, n);
-   swapl(&stuff->mask, n);
-+#else
-+  swapl(&stuff->window);
-+  swapl(&stuff->mask);
-+#endif
-   return ProcVncExtSelectInput(client);
- }
- 
-@@ -804,9 +888,14 @@ static int ProcVncExtConnect(ClientPtr c
-   rep.length = 0;
-   rep.sequenceNumber = client->sequence;
-   if (client->swapped) {
-+#if XORG < 112
-     int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.length, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.length);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtConnectReply), (char *)&rep);
-   return (client->noClientException);
-@@ -814,9 +903,13 @@ static int ProcVncExtConnect(ClientPtr c
- 
- static int SProcVncExtConnect(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtConnectReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_AT_LEAST_SIZE(xVncExtConnectReq);
-   return ProcVncExtConnect(client);
- }
-@@ -836,7 +929,6 @@ static int ProcVncExtGetQueryConnect(Cli
-     qcTimeout = 0;
- 
-   xVncExtGetQueryConnectReply rep;
--  int n;
-   rep.type = X_Reply;
-   rep.sequenceNumber = client->sequence;
-   rep.timeout = qcTimeout;
-@@ -845,11 +937,20 @@ static int ProcVncExtGetQueryConnect(Cli
-   rep.opaqueId = (CARD32)(long)queryConnectId;
-   rep.length = (rep.userLen + rep.addrLen + 3) >> 2;
-   if (client->swapped) {
-+#if XORG < 112
-+    int n;
-     swaps(&rep.sequenceNumber, n);
-     swapl(&rep.userLen, n);
-     swapl(&rep.addrLen, n);
-     swapl(&rep.timeout, n);
-     swapl(&rep.opaqueId, n);
-+#else
-+    swaps(&rep.sequenceNumber);
-+    swapl(&rep.userLen);
-+    swapl(&rep.addrLen);
-+    swapl(&rep.timeout);
-+    swapl(&rep.opaqueId);
-+#endif
-   }
-   WriteToClient(client, sizeof(xVncExtGetQueryConnectReply), (char *)&rep);
-   if (qcTimeout)
-@@ -861,9 +962,13 @@ static int ProcVncExtGetQueryConnect(Cli
- 
- static int SProcVncExtGetQueryConnect(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtGetQueryConnectReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-+#else
-+  swaps(&stuff->length);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq);
-   return ProcVncExtGetQueryConnect(client);
- }
-@@ -888,10 +993,15 @@ static int ProcVncExtApproveConnect(Clie
- 
- static int SProcVncExtApproveConnect(ClientPtr client)
- {
--  register char n;
-   REQUEST(xVncExtApproveConnectReq);
-+#if XORG < 112
-+  register char n;
-   swaps(&stuff->length, n);
-   swapl(&stuff->opaqueId, n);
-+#else
-+  swaps(&stuff->length);
-+  swapl(&stuff->opaqueId);
-+#endif
-   REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
-   return ProcVncExtApproveConnect(client);
- }
-diff -up xserver/hw/vnc/xf86vncModule.cc.xorg112 xserver/hw/vnc/xf86vncModule.cc
---- xserver/hw/vnc/xf86vncModule.cc.xorg112	2011-08-09 23:16:36.000000000 +0200
-+++ xserver/hw/vnc/xf86vncModule.cc	2012-03-27 12:54:56.938271322 +0200
-@@ -26,6 +26,8 @@
- #include <rfb/Logger_stdio.h>
- #include <rfb/LogWriter.h>
- 
-+#include "xorg-version.h"
-+
- extern "C" {
- #define class c_class
- #define private c_private
-@@ -89,7 +91,12 @@ static void vncExtensionInitWithParams(I
-     ScrnInfoPtr pScrn = xf86Screens[scr];
- 
-     for (ParameterIterator i(Configuration::global()); i.param; i.next()) {
--      char* val = xf86FindOptionValue(pScrn->options, i.param->getName());
-+      const char *val;
-+#if XORG < 112
-+      val = xf86FindOptionValue(pScrn->options, i.param->getName());
-+#else
-+      val = xf86FindOptionValue((XF86OptionPtr)pScrn->options, i.param->getName());
-+#endif
-       if (val)
-         i.param->setParam(val);
-     }
-diff -up xserver/hw/vnc/xorg-version.h.xorg112 xserver/hw/vnc/xorg-version.h
---- xserver/hw/vnc/xorg-version.h.xorg112	2012-03-27 12:55:27.576240843 +0200
-+++ xserver/hw/vnc/xorg-version.h	2012-03-27 12:56:07.541204026 +0200
-@@ -38,6 +38,8 @@
- #define XORG 110
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
- #define XORG 111
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
-+#define XORG 112
- #else
- #error "X.Org newer than 1.10 is not supported"
- #endif
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg113.patch b/extra/source/tigervnc/patches/tigervnc11-xorg113.patch
deleted file mode 100644
index 12ce549d..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg113.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff -up xserver/hw/vnc/Makefile.am.xorg113 xserver/hw/vnc/Makefile.am
---- xserver/hw/vnc/Makefile.am.xorg113	2012-07-19 21:42:46.297455970 -0400
-+++ xserver/hw/vnc/Makefile.am	2012-07-19 21:19:22.526005528 -0400
-@@ -62,7 +62,7 @@ EXTRA_DIST = Xvnc.man
- BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
- 
- fb.h: $(top_srcdir)/fb/fb.h
--	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
-+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
- 
- pixman.h: $(includedir)/pixman-1/pixman.h
- 	cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h
-diff -up xserver/hw/vnc/vncHooks.cc.xorg113 xserver/hw/vnc/vncHooks.cc
---- xserver/hw/vnc/vncHooks.cc.xorg113	2012-07-19 21:31:37.191820942 -0400
-+++ xserver/hw/vnc/vncHooks.cc	2012-07-19 21:36:00.327531293 -0400
-@@ -116,7 +116,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec
- 
- // screen functions
- 
--static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen);
- static Bool vncHooksCreateGC(GCPtr pGC);
- static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
-                                RegionPtr pOldRegion);
-@@ -133,7 +133,7 @@ static Bool vncHooksDisplayCursor(
- 				  DeviceIntPtr pDev,
- #endif
- 				  ScreenPtr pScreen, CursorPtr cursor);
--static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
-                                  pointer pReadmask);
- #ifdef RENDER
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, 
-@@ -335,7 +335,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
- // CloseScreen - unwrap the screen functions and call the original CloseScreen
- // function
- 
--static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
- {
-   SCREEN_UNWRAP(pScreen_, CloseScreen);
- 
-@@ -366,7 +366,7 @@ static Bool vncHooksCloseScreen(int i, S
- 
-   DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
- 
--  return (*pScreen->CloseScreen)(i, pScreen);
-+  return (*pScreen->CloseScreen)(pScreen);
- }
- 
- // CreateGC - wrap the "GC funcs"
-@@ -531,14 +531,14 @@ static Bool vncHooksDisplayCursor(
- // BlockHandler - ignore any changes during the block handler - it's likely
- // these are just drawing the cursor.
- 
--static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
-                                  pointer pReadmask)
- {
--  SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
-+  SCREEN_UNWRAP(pScreen_, BlockHandler);
- 
-   vncHooksScreen->desktop->ignoreHooks(true);
- 
--  (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-+  (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
- 
-   vncHooksScreen->desktop->ignoreHooks(false);
- 
-diff -up xserver/hw/vnc/xf86vncModule.cc.xorg113 xserver/hw/vnc/xf86vncModule.cc
---- xserver/hw/vnc/xf86vncModule.cc.xorg113	2012-07-19 21:19:27.558942606 -0400
-+++ xserver/hw/vnc/xf86vncModule.cc	2012-07-19 21:19:27.574942408 -0400
-@@ -53,8 +53,6 @@ ExtensionModule vncExt =
- {
-     vncExtensionInitWithParams,
-     "VNC",
--    NULL,
--    NULL,
-     NULL
- };
- 
-diff -up xserver/hw/vnc/xorg-version.h.xorg113 xserver/hw/vnc/xorg-version.h
---- xserver/hw/vnc/xorg-version.h.xorg113	2012-07-19 21:19:27.560942582 -0400
-+++ xserver/hw/vnc/xorg-version.h	2012-07-19 21:19:27.576942382 -0400
-@@ -40,6 +40,8 @@
- #define XORG 111
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
- #define XORG 112
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
-+#define XORG 113
- #else
- #error "X.Org newer than 1.10 is not supported"
- #endif
-diff -up xserver/hw/vnc/xvnc.cc.xorg113 xserver/hw/vnc/xvnc.cc
---- xserver/hw/vnc/xvnc.cc.xorg113	2012-07-19 21:36:33.078121854 -0400
-+++ xserver/hw/vnc/xvnc.cc	2012-07-19 21:39:49.685663920 -0400
-@@ -267,7 +267,7 @@ OsVendorInit()
- }
- 
- void
--OsVendorFatalError()
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
- 
-@@ -1135,9 +1135,9 @@ static Bool vncRandRSetConfig (ScreenPtr
- #endif
- 
- static Bool
--vfbCloseScreen(int index, ScreenPtr pScreen)
-+vfbCloseScreen(ScreenPtr pScreen)
- {
--    vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+    vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
-     int i;
-  
-     pScreen->CloseScreen = pvfb->closeScreen;
-@@ -1149,13 +1149,13 @@ vfbCloseScreen(int index, ScreenPtr pScr
-     for (i = 0; i < MAXSCREENS; i++)
- 	InstalledMaps[i] = NULL;
- 
--    return pScreen->CloseScreen(index, pScreen);
-+    return pScreen->CloseScreen(pScreen);
- }
- 
- static Bool
--vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
-+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
- {
--    vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+    vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
-     int dpi;
-     int ret;
-     void *pbits;
-@@ -1167,8 +1167,8 @@ vfbScreenInit(int index, ScreenPtr pScre
- 
-     pbits = vfbAllocateFramebufferMemory(&pvfb->fb);
-     if (!pbits) return FALSE;
--    vncFbptr[index] = pbits;
--    vncFbstride[index] = pvfb->fb.paddedWidth;
-+    vncFbptr[pScreen->myNum] = pbits;
-+    vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth;
- 
-     miSetPixmapDepths();
- 
-diff -up xserver/include/screenint.h.xorg113 xserver/include/screenint.h
---- xserver/include/screenint.h.xorg113	2012-07-19 21:30:38.258557709 -0400
-+++ xserver/include/screenint.h	2012-07-19 21:30:45.415468235 -0400
-@@ -72,18 +72,18 @@ extern _X_EXPORT int AddGPUScreen(Bool (
- extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
- 
- extern _X_EXPORT void
--AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr);
- extern _X_EXPORT void
- DetachUnboundGPU(ScreenPtr unbound);
- 
- extern _X_EXPORT void
--AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-+AttachOutputGPU(ScreenPtr pScreen, ScreenPtr);
- 
- extern _X_EXPORT void
- DetachOutputGPU(ScreenPtr output);
- 
- extern _X_EXPORT void
--AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr);
- 
- extern _X_EXPORT void
- DetachOffloadGPU(ScreenPtr slave);
-
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg114.patch b/extra/source/tigervnc/patches/tigervnc11-xorg114.patch
deleted file mode 100644
index 23c71001..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg114.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- xserver/hw/vnc/xorg-version.h	Mon Feb 18 08:28:49 2013
-+++ xserver/hw/vnc/xorg-version.h	Mon Feb 18 08:28:43 2013
-@@ -42,8 +42,10 @@
- #define XORG 112
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
- #define XORG 113
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
-+#define XORG 114
- #else
--#error "X.Org newer than 1.10 is not supported"
-+#error "X.Org newer than 1.14 is not supported"
- #endif
- 
- #endif
---- xserver/hw/vnc/xvnc.cc	Tue Feb 19 08:50:20 2013
-+++ xserver/hw/vnc/xvnc.cc	Tue Feb 19 08:50:27 2013
-@@ -54,7 +54,6 @@
- #include "servermd.h"
- #include "fb.h"
- #include "mi.h"
--#include "mibstore.h"
- #include "colormapst.h"
- #include "gcstruct.h"
- #include "input.h"
diff --git a/extra/source/tigervnc/patches/tigervnc11-xorg_headers.patch b/extra/source/tigervnc/patches/tigervnc11-xorg_headers.patch
deleted file mode 100644
index 2ef5bece..00000000
--- a/extra/source/tigervnc/patches/tigervnc11-xorg_headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am.orig	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/Makefile.am	2012-07-29 14:14:55.078998592 +0200
-@@ -61,10 +61,10 @@
- BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
- 
- fb.h: $(top_srcdir)/fb/fb.h
--	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
-+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
- 
- pixman.h: $(includedir)/pixman-1/pixman.h
--	cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h
-+	cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/g' > $(srcdir)/pixman.h
- 
- fbrop.h: $(top_srcdir)/fb/fbrop.h
--	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
-+	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h
diff --git a/extra/source/tigervnc/patches/tigervnc13_link_png.patch b/extra/source/tigervnc/patches/tigervnc13_link_png.patch
new file mode 100644
index 00000000..e5f3374a
--- /dev/null
+++ b/extra/source/tigervnc/patches/tigervnc13_link_png.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4689566..e3475f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -265,6 +265,7 @@ if(UNIX AND NOT APPLE)
+   if(X11_Xcursor_FOUND)
+     set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xcursor_LIB})
+   endif()
++  set(FLTK_LIBRARIES ${FLTK_LIBRARIES} png)
+ endif()
+ 
+ if(FLTK_FOUND)
diff --git a/extra/source/tigervnc/patches/xserver118.patch b/extra/source/tigervnc/patches/xserver118.patch
new file mode 100644
index 00000000..8a21040c
--- /dev/null
+++ b/extra/source/tigervnc/patches/xserver118.patch
@@ -0,0 +1,137 @@
+diff -up xorg-server-1.17.1/configure.ac.vnc xorg-server-1.17.1/configure.ac
+--- xorg-server-1.17.1/configure.ac.vnc	2015-02-10 22:43:52.000000000 +0000
++++ xorg-server-1.17.1/configure.ac	2015-02-13 16:14:05.074515927 +0000
+@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
+ AC_CONFIG_HEADERS(include/version-config.h)
+ 
+ AM_PROG_AS
++AC_PROG_CXX
+ AC_PROG_LN_S
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static win32-dll])
+@@ -1795,6 +1796,10 @@ if test "x$XVFB" = xyes; then
+ 	AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+ 
+ dnl Xnest DDX
+ 
+@@ -1830,6 +1835,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ if test "x$XORG" = xyes; then
+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+@@ -2059,7 +2066,6 @@ if test "x$XORG" = xyes; then
+ 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2599,6 +2605,7 @@ hw/dmx/Makefile
+ hw/dmx/man/Makefile
+ hw/vfb/Makefile
+ hw/vfb/man/Makefile
++hw/vnc/Makefile
+ hw/xnest/Makefile
+ hw/xnest/man/Makefile
+ hw/xwin/Makefile
+diff -up xorg-server-1.17.1/hw/Makefile.am.vnc xorg-server-1.17.1/hw/Makefile.am
+--- xorg-server-1.17.1/hw/Makefile.am.vnc	2014-04-16 21:24:00.000000000 +0100
++++ xorg-server-1.17.1/hw/Makefile.am	2015-02-13 16:14:05.131516821 +0000
+@@ -38,7 +38,8 @@ SUBDIRS =			\
+ 	$(DMX_SUBDIRS)		\
+ 	$(KDRIVE_SUBDIRS)	\
+ 	$(XQUARTZ_SUBDIRS)	\
+-	$(XWAYLAND_SUBDIRS)
++	$(XWAYLAND_SUBDIRS)	\
++	vnc
+ 
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
+ 
+diff -up xorg-server-1.17.1/mi/miinitext.c.vnc xorg-server-1.17.1/mi/miinitext.c
+--- xorg-server-1.17.1/mi/miinitext.c.vnc	2015-01-17 23:42:52.000000000 +0000
++++ xorg-server-1.17.1/mi/miinitext.c	2015-02-13 16:14:05.131516821 +0000
+@@ -111,6 +111,10 @@ SOFTWARE.
+ #include "micmap.h"
+ #include "globals.h"
+ 
++#ifdef TIGERVNC
++extern void vncExtensionInit(INITARGS);
++#endif
++
+ /* The following is only a small first step towards run-time
+  * configurable extensions.
+  */
+@@ -235,6 +239,9 @@ EnableDisableExtensionError(const char *
+ 
+ /* List of built-in (statically linked) extensions */
+ static const ExtensionModule staticExtensions[] = {
++#ifdef TIGERVNC
++    {vncExtensionInit, "VNC-EXTENSION", NULL},
++#endif
+     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
+     {ShapeExtensionInit, "SHAPE", NULL},
+ #ifdef MITSHM
+diff -up xorg-server-1.17.1/os/WaitFor.c.vnc xorg-server-1.17.1/os/WaitFor.c
+--- xorg-server-1.17.1/os/WaitFor.c.vnc	2015-01-26 18:40:30.000000000 +0000
++++ xorg-server-1.17.1/os/WaitFor.c	2015-02-13 16:14:05.132516837 +0000
+@@ -125,6 +125,9 @@ static void DoTimer(OsTimerPtr timer, CA
+ static void CheckAllTimers(void);
+ static volatile OsTimerPtr timers = NULL;
+ 
++extern void vncWriteBlockHandler(fd_set *fds);
++extern void vncWriteWakeupHandler(int nfds, fd_set *fds);
++
+ /*****************
+  * WaitForSomething:
+  *     Make the server suspend until there is
+@@ -150,6 +153,7 @@ WaitForSomething(int *pClientsReady)
+     INT32 timeout = 0;
+     fd_set clientsReadable;
+     fd_set clientsWritable;
++    fd_set socketsWritable;
+     int curclient;
+     int selecterr;
+     static int nready;
+@@ -212,6 +216,9 @@ WaitForSomething(int *pClientsReady)
+             XFD_COPYSET(&AllSockets, &LastSelectMask);
+         }
+ 
++        FD_ZERO(&socketsWritable);
++        vncWriteBlockHandler(&socketsWritable);
++
+         BlockHandler((void *) &wt, (void *) &LastSelectMask);
+         if (NewOutputPending)
+             FlushAllOutput();
+@@ -223,10 +230,20 @@ WaitForSomething(int *pClientsReady)
+             i = Select(MaxClients, &LastSelectMask, &clientsWritable, NULL, wt);
+         }
+         else {
+-            i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt);
++	    if (AnyClientsWriteBlocked)
++		XFD_ORSET(&socketsWritable, &ClientsWriteBlocked, &socketsWritable);
++
++	    if (XFD_ANYSET(&socketsWritable)) {
++		i = Select(MaxClients, &LastSelectMask, &socketsWritable, NULL, wt);
++		if (AnyClientsWriteBlocked)
++		    XFD_ANDSET(&clientsWritable, &socketsWritable, &ClientsWriteBlocked);
++	    } else {
++		i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt);
++	    }
+         }
+         selecterr = GetErrno();
+         WakeupHandler(i, (void *) &LastSelectMask);
++	vncWriteWakeupHandler(i, &socketsWritable);
+         if (i <= 0) {           /* An error or timeout occurred */
+             if (dispatchException)
+                 return 0;
diff --git a/extra/source/tigervnc/tigervnc.SlackBuild b/extra/source/tigervnc/tigervnc.SlackBuild
index a269bc7c..bc0b8d8b 100755
--- a/extra/source/tigervnc/tigervnc.SlackBuild
+++ b/extra/source/tigervnc/tigervnc.SlackBuild
@@ -1,5 +1,7 @@
-#!/bin/sh
-# Copyright 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven. NL
+#!/bin/bash
+# $Id: tigervnc.SlackBuild,v 1.25 2015/08/26 18:24:43 root Exp root $
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven. NL
+# Copyright 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -20,17 +22,66 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-
+#
+# Slackware SlackBuild script 
+# ===========================
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        tigervnc
+# Descr:      VNC server and client
+# URL:        http://tigervnc.org/
+# Needs:      
+# BuildNeeds: jdk (only when building the java applet)
+# Changelog:  
+# r4126-1:    31/Aug/2010 by Eric Hameleers <alien@slackware.com>
+#             * Initial build.
+# r4126-2:    02/sep/2010 by Eric Hameleers <alien@slackware.com>
+#             * Fix a syntax error in thye doinst.sh script
+# 1.0.90-1:   14/may/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update to 1.1.beta1
+# 1.1.0-1:    14/nov/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update to 1.1.0
+# 1.2.0-1:    23/jun/2012 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 1.1.0-2:    28/jul/2012 by Eric Hameleers <alien@slackware.com>
+#             * Build 1.1.0 again, using a revised script which can be used
+#               on Slackware 14 as well.  Also, enable compositing in the
+#               server.  Abandon the tigervnc-1.2 branch for now, because
+#               the fltk based viewer rewrite is not yet fully functional.
+# 1.1.0-3:    22/may/2013 by Eric Hameleers <alien@slackware.com>
+#             * Build 1.1.0 again, on slackware-current (nee 14.1) with new
+#               X.Org 1.13 patches.
+# 1.1.0-4:    11/oct/2013 by Eric Hameleers <alien@slackware.com>
+#             * Build 1.1.0 again, on slackware-current (nee 14.1) with new
+#               X.Org 1.14 patches.
+# 1.3.0-1:    12/dec/2013 by Eric Hameleers <alien@slackware.com>
+#             * Update.  All my issues except copy/paste from local to remote
+#               seem to have been addressed in 1.3.0.
+#               Build against private versions of libjpeg-turbo and fltk,
+#               in order to eliminate external dependencies.
+# 1.4.3-1:    11/apr/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 1.4.3-2:    03/may/2015 by Eric Hameleers <alien@slackware.com>
+#             * Rebuild for slackware-current (fix libgcrypt.so library error)
+# 1.5.0-1:    14/jul/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 1.5.0-2:    24/aug/2015 by Eric Hameleers <alien@slackware.com>
+#             * Rebuild was needed on slackware-current.
+# 1.5.0-3:    26/aug/2015 by Eric Hameleers <alien@slackware.com>
+#             * I uploaded the wrong package so I needed to update the BUILD.
+# 1.5.0-1:    07/nov/2015 by Patrick Volkerding <volkerdi@slackware.com>
+#             * Removed bundled FLTK and libjpeg-turbo builds.
+#             * Reset build to -1 for inclusion in Slackware's /extra.
+# 1.6.0-1:    22/feb/2016 by Patrick Volkerding <volkerdi@slackware.com>
+# 
+# -----------------------------------------------------------------------------
 
 PKGNAM=tigervnc
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
+VERSION=${VERSION:-1.6.0}
+PVER=$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)
+BUILD=${BUILD:-3}
+NUMJOBS=${NUMJOBS:" -j7 "}
 TAG=${TAG:-}
 
-# Do we build the java applet (needs jdk)?
-DO_APPLET=${DO_APPLET:-"NO"}
-
 # TigerVNC needs to use source of the X.Org server whose version matches
 # that of your installed X.Org package:
 XORG=${XORG:-$(X -version 2>&1 | grep "^X.Org X Server " | cut -f4 -d' ')}
@@ -39,12 +90,33 @@ MAXPATCHVER="$(echo $XORG | cut -f1,2 -d. | tr -d '.')"
 # OS Stamp into the binaries:
 OSNAME="$(head -1 /etc/slackware-version)"
 OSVENDOR="Slackware Linux Project"
-BUILDER="Built by Alien BOB on $(date -u)"
+BUILDER="Built by Slackware on $(date -u)"
+
+# Do we build the java applet (needs jdk)?
+DO_APPLET=${DO_APPLET:-"NO"}
+
+# Check for the availability of a Java compiler:
+if [ "$DO_APPLET" = "YES" ]; then
+  if ! javac -version 1>/dev/null 2>&1 ; then
+    echo "**"
+    echo "** DO_APPLET="YES" means to compile the Java viewer,"
+    echo "** However you do not have a Java JDK installed."
+    echo "** Press Ctrl-C to abort this script,"
+    echo "** or wait 10 seconds to continue without building the Java viewer."
+    echo "**"
+    sleep 10
+    DO_APPLET="NO"
+  fi
+fi
 
 # This covers most filenames you'd want as documentation. Change if needed.
-DOCS="LICENCE.TXT doc/TODO doc/*.txt doc/*.odt"
+DOCS="BUILDING.txt LICENCE.TXT README.txt doc/TODO doc/*.txt doc/*.odt"
 DOCS_XORG="COPYING ChangeLog"
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 if [ -e $CWD/machine.conf ]; then
   . $CWD/machine.conf ]
 elif [ -e /etc/slackbuild/machine.conf ]; then
@@ -54,15 +126,15 @@ else
   MARCH=$( uname -m )
   if [ -z "$ARCH" ]; then
     case "$MARCH" in
-      i?86)    export ARCH=i486 ;;
+      i?86)    export ARCH=i586 ;;
       arm*)    export ARCH=arm ;;
       # Unless $ARCH is already set, use uname -m for all other archs:
       *)       export ARCH=$MARCH ;;
     esac
   fi
   # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  if [ "$ARCH" = "i586" ]; then
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
     LIBDIRSUFFIX=""
   elif [ "$ARCH" = "s390" ]; then
     SLKCFLAGS="-O2"
@@ -84,62 +156,11 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-rm -rf xorg-server-${XORG}
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-tar xvf $CWD/xorg-server-${XORG}.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-# Move the xorg-server sources into the TigerVNC tree:
-mv unix/xserver/hw/vnc ../xorg-server-${XORG}/hw/
-rm -rf unix/xserver/hw
-mv ../xorg-server-${XORG}/* unix/xserver/
-
-# We have patches for X.Org later than 1.10 which tigervnc does not have:
-for PATCHVER in 111 112 113 114 ; do
-  if [ -e $CWD/patches/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch ]; then
-    cp $CWD/patches/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch unix/xserver${PATCHVER}.patch
-  fi
-done
-
-if [ $MAXPATCHVER -gt 110 ]; then
-  if [ $MAXPATCHVER -lt 113 ]; then
-    # The sed magic in the hw/vnc Makefile needs some love:
-    # ... taken care of in the xserver113 patch if we ever move to X.Org 1.13.
-    cat $CWD/patches/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg_headers.patch | patch -p1 --verbose || exit 1
-  else
-    # We need to rewrite the xserver110.patch for X.Org 1.13 and newer:
-    cp $CWD/patches/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg110.patch unix/xserver110.patch
-  fi
-fi
-
-# Patch the xorg-server source to include building the vnc driver
-cd unix/xserver
-  if [ $MAXPATCHVER -le 110 ]; then
-    # apply one of the tigervnc-provided patches:
-    cat ../xserver${MAXPATCHVER}.patch | patch -p1 --verbose || exit 1
-  else
-    # these external patches are incremental and must be applied in order:
-    for PATCHVER in 110 111 112 113 114 ; do
-      if [ $PATCHVER -le $MAXPATCHVER -a -e ../xserver${PATCHVER}.patch ]; then
-        cat ../xserver${PATCHVER}.patch | patch -p1 --verbose || exit 1
-      fi
-    done
-  fi
-cd -
-
-# We use Java7:
-cat $CWD/patches/tigervnc11-java7.patch | patch -p1 --verbose || exit 1
-
-# Explicitly put the java applet into a directory named 'tigervnc':
-sed -i -e 's#/vnc/class#/tigervnc/class#'g $(grep -rl vnc/class .)
+rm -rf $TMP/tmp-${PKGNAM} $PKG
+mkdir -p $TMP/tmp-${PKGNAM}/deps/usr $PKG
+cd $TMP/tmp-${PKGNAM}
+tar --owner=root --group=root -xvf $CWD/sources/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar --owner=root --group=root -xvf $CWD/sources/xorg-server-${XORG}.tar.?z* || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -149,91 +170,124 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-export LDFLAGS="$SLKLDFLAGS -lpthread"
+export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 
-echo -e "\n*** Building tigervnc ***\n"
-autoreconf -vif
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$TARGET
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-cd unix/xserver
-  echo -e "\n*** Building xserver ***\n"
-  export CXXFLAGS="$SLKCFLAGS -fpermissive"
+
+cat <<EOT
+#
+# Compile tigervnc:
+#
+EOT
+
+cd $PKGNAM-$VERSION || exit 1
+
+# Explicitly link against libpng to prevent linking errors:
+cat $CWD/patches/tigervnc13_link_png.patch | patch -p1 --verbose || exit 1
+
+# Allow compiling for xorg-server-1.18.x:
+cat $CWD/patches/tigervnc.support.xorg.118.patch | patch -p1 --verbose || exit 1
+
+# Fix a compile error with xorg-server-1.18.x:
+cat $CWD/patches/tigervnc-xorg118-QueueKeyboardEvents.patch | patch -p1 --verbose || exit 1
+
+[ "$DO_APPLET" = "YES" ] && CMAKE_JAVA="ON" || CMAKE_JAVA="OFF"
+# Explicitly put the java applet into a directory named 'tigervnc':
+sed -i -e 's#/vnc/class#/tigervnc/class#'g $(grep -rl vnc/class .)
+sed -i -e 's#DESTINATION vnc/class#DESTINATION share/tigervnc/class#'g $(grep -rl vnc/class .)
+
+export LDFLAGS="$SLKLDFLAGS -ldl -lpthread"
+export CXXFLAGS="$SLKCFLAGS -fpermissive -I $(pwd)/common"
+
+# Fix the man page and documentation installation:
+sed -e 's,set(MAN_DIR "${DATA_DIR}/man"),set(MAN_DIR "${MAN_INSTALL_DIR}"),' \
+    -e 's,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/,' \
+    -i CMakeLists.txt
+
+mkdir -p build
+cd build
+  echo -e "\n*** Building vnc client ***\n"
+  cmake \
+    -G "Unix Makefiles" \
+    -Wno-dev \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DENABLE_PAM:BOOL=OFF \
+    -DBUILD_JAVA:BOOL=${CMAKE_JAVA} \
+    ..
+  make V=1 $NUMJOBS || make || exit 1
+  make DESTDIR=$PKG install || exit 1
+cd -
+
+# Do we have a patch for X.Org which tigervnc does not have?
+if [ ! -f unix/xserver${MAXPATCHVER}.patch -a -f $CWD/patches/xserver${MAXPATCHVER}.patch ]
+then
+  cp $CWD/patches/xserver${MAXPATCHVER}.patch unix/
+fi
+
+# Prepare the Xvnc sources (we are building out-of-tree, in ./build directory):
+mkdir -p build/unix
+cp -R unix/xserver unix/xserver${MAXPATCHVER}.patch build/unix/
+cp -R ../xorg-server-${XORG}/* build/unix/xserver/
+
+cd build/unix/xserver/
+  # Patch the xorg-server source to include building vnc driver:
+  cat ../xserver${MAXPATCHVER}.patch | patch -p1 --verbose
+  echo -e "\n*** Building vnc server ***\n"
   autoreconf -vif
 
   # Default font paths to be used by the X server
   DEF_FONTPATH="/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
 
+  CFLAGS="$CFLAGS -std=c99" \
   ./configure \
     --prefix=/usr \
     --libdir=/usr/lib${LIBDIRSUFFIX} \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --mandir=/usr/man \
-    --disable-dri \
+    --disable-dri  --enable-dri2  --disable-dri3 \
     --disable-static \
     --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-    --disable-xwin --disable-xephyr --disable-kdrive \
-    --disable-xinerama \
+    --disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \
     --enable-composite \
+    --enable-glx --enable-glx-tls \
     --enable-install-libxf86config \
     --enable-xcsecurity \
-    --enable-glx-tls --enable-dri2 \
-    --with-pic \
+    --enable-xinerama \
     --with-int10=x86emu \
     --with-default-font-path="${DEF_FONTPATH}" \
-    --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
     --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
+    --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
+    --with-pic \
     --with-xkb-path=/etc/X11/xkb \
     --with-xkb-output=/var/lib/xkb \
     --disable-config-dbus \
     --disable-config-hal \
     --disable-config-udev \
-    --disable-devel-docs \
+    --disable-docs --disable-devel-docs \
+    --disable-selective-werror \
     --disable-unit-tests \
     --without-dtrace \
     --with-os-name="$OSNAME" \
     --with-os-vendor="$OSVENDOR" \
     --with-builderstring="$BUILDER" \
-    --build=$TARGET
+    --build=$TARGET || exit 1
 
-  make $NUMJOBS || make || exit 1
-  make -C hw/vnc DESTDIR=$PKG install
+  make V=1 TIGERVNC_SRCDIR="$TMP/tmp-${PKGNAM}/${PKGNAM}-${VERSION}" $NUMJOBS || exit 1
+  make TIGERVNC_SRCDIR="$TMP/tmp-${PKGNAM}/${PKGNAM}-${VERSION}" -C hw/vnc \
+    DESTDIR=$PKG install || exit 1
 cd -
 
-if [ "$DO_APPLET" = "YES" ]; then
-  # Compile the java applet (needs the JDK... JRE is not enough):
-  cd java/src/com/tigervnc/vncviewer
-    make || exit 1
-  cd -
-fi
-
-# Create .png icons from the .svg file:
-make -C media
-
-if [ "$DO_APPLET" = "YES" ]; then
-  # Install the java applet:
-  cd java/src/com/tigervnc/vncviewer
-    mkdir -p $PKG/usr/share/tigervnc/classes
-    install -m0755 VncViewer.jar $PKG/usr/share/tigervnc/classes/
-    install -m0644 index.vnc $PKG/usr/share/tigervnc/classes/
-    install -m0644 *.class $PKG/usr/share/tigervnc/classes/
-  cd -
-fi
+# Provide a sample configuration for the libvnc.so extension of X.Org,
+# documentation is available inside the file:
+mkdir -p $PKG/etc/X11/xorg.conf.d
+install -m644 $CWD/10-libvnc.conf $PKG/etc/X11/xorg.conf.d/10-libvnc.conf.new
 
 # Install menu entry:
 mkdir -p $PKG/usr/share/{applications,icons/hicolor/{16x16,24x24,32x32,48x48}/apps}
@@ -244,7 +298,7 @@ done
 cat <<EOT > $PKG/usr/share/applications/tigervnc.desktop
 [Desktop Entry]
 Encoding=UTF-8
-Name=TigerVNC
+Name=TigerVNC Viewer
 GenericName=VNCViewer (RFB Client)
 Comment=Connect to remote desktop
 SwallowExec=
@@ -262,6 +316,24 @@ EOT
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
 cat <<EOT >> $PKG/install/doinst.sh
+# Handle the incoming configuration files:
+config() {
+  for infile in \$1; do
+    NEW="\$infile"
+    OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
+    # If there's no config file by that name, mv it over:
+    if [ ! -r \$OLD ]; then
+      mv \$NEW \$OLD
+    elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
+      # toss the redundant copy
+      rm \$NEW
+    fi
+    # Otherwise, we leave the .new copy for the admin to consider...
+  done
+}
+
+config etc/X11/xorg.conf.d/10-libvnc.conf.new
+
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications 1>/dev/null 2>&1
@@ -282,9 +354,13 @@ fi
 EOT
 
 # Add documentation:
+# First, remove files which were misplaced:
+rm -f $PKG/usr/doc/* 2> /dev/null
+cd $TMP/tmp-${PKGNAM}/${PKGNAM}-${VERSION}
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION || true
-for FIL in $(echo $DOCS_XORG); do cp -a unix/xserver/$FIL $PKG/usr/doc/$PKGNAM-$VERSION/${FIL}.xorg ; done
+for FIL in $(echo $DOCS_XORG); do cp -a build/unix/xserver/$FIL $PKG/usr/doc/$PKGNAM-$VERSION/${FIL}.xorg ; done || true
+#cat $CWD/$(basename $0) > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
@@ -296,7 +372,7 @@ fi
 
 # Strip binaries (if any):
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Add a package description:
 mkdir -p $PKG/install
@@ -307,5 +383,5 @@ fi
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
 
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
diff --git a/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild b/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild
index b2dda17c..bb966a88 100755
--- a/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild
+++ b/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild
@@ -23,12 +23,12 @@
 
 PKGNAM=xf86-video-fbdev
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -41,9 +41,6 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
   LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
diff --git a/extra/tigervnc/the_fltk_package_must_also_be_installed b/extra/tigervnc/the_fltk_package_must_also_be_installed
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/extra/tigervnc/the_fltk_package_must_also_be_installed