Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

5 files changed, 20 insertions, 90 deletions

diff --git a/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch b/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch
deleted file mode 100644
index c8f9cd8ca..000000000
--- a/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b2c3df6015d2ab1b57e2532b05298803b28f2902 Mon Sep 17 00:00:00 2001
-From: Peter de Ridder <peter@xfce.org>
-Date: Wed, 4 Mar 2015 11:03:28 +0100
-Subject: [PATCH] Make sure icon == NULL if no icon is found
-
----
- dialogs/appearance-settings/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c
-index 3eeb348..6532182 100644
---- a/dialogs/appearance-settings/main.c
-+++ b/dialogs/appearance-settings/main.c
-@@ -720,6 +720,7 @@ appearance_settings_load_icon_themes (preview_data *pd)
- 
-                     for (p = 0; p < 4; p++)
-                     {
-+                        icon = NULL;
-                         if (gtk_icon_theme_has_icon (icon_theme, preview_icons[p]))
-                             icon = gtk_icon_theme_load_icon (icon_theme, preview_icons[p], 16, 0, NULL);
-                         else if (gtk_icon_theme_has_icon (icon_theme, "image-missing"))
--- 
-2.3.1
-
diff --git a/source/xfce/xfce4-settings/slack-desc b/source/xfce/xfce4-settings/slack-desc
index 590a3b3e4..3774be250 100644
--- a/source/xfce/xfce4-settings/slack-desc
+++ b/source/xfce/xfce4-settings/slack-desc
@@ -1,14 +1,14 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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------------------------------------------------------|
 xfce4-settings: xfce4-settings (Xfce settings manager)
 xfce4-settings:
-xfce4-settings: xfce4-settings is the Xfce settings manager front-end.  It comes with
+xfce4-settings: xfce4-settings is the Xfce settings manager front-end. It comes with
 xfce4-settings: several different components for configuring application-independent
 xfce4-settings: settings inside xfconf.
 xfce4-settings:
diff --git a/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff b/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff
deleted file mode 100644
index 73fc826be..000000000
--- a/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
-index 095e323..af70256 100644
---- a/xfsettingsd/displays.c
-+++ b/xfsettingsd/displays.c
-@@ -415,6 +415,7 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent,
-     XfceRROutput       *output, *o;
-     XEvent             *e = xevent;
-     gint                event_num;
-+    gint                j;
-     guint               n, m, nactive = 0;
-     gboolean            found = FALSE, changed = FALSE;
- 
-@@ -496,9 +497,37 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent,
-                 {
-                     xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "New output connected: %s",
-                                     output->info->name);
-+                    /* need to enable crtc for output ? */
-+                    if (output->info->crtc == None)
-+                    {
-+                        xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "enabling crtc for %s", output->info->name);
-+                        crtc = xfce_displays_helper_find_usable_crtc (helper, output);
-+                        if (crtc)
-+                        {
-+                            crtc->mode = output->preferred_mode;
-+                            crtc->rotation = RR_Rotate_0;
-+                            crtc->x = crtc->y = 0;
-+                            /* set width and height */
-+                            for (j = 0; j < helper->resources->nmode; ++j)
-+                            {
-+                                if (helper->resources->modes[j].id == output->preferred_mode)
-+                                {
-+                                    crtc->width = helper->resources->modes[j].width;
-+                                    crtc->height = helper->resources->modes[j].height;
-+                                    break;
-+                                }
-+                            }
-+                            xfce_displays_helper_set_outputs (crtc, output);
-+                            crtc->changed = TRUE;
-+                        }
-+                    }
-+
-                     changed = TRUE;
-                 }
-             }
-+            if (changed)
-+                xfce_displays_helper_apply_all (helper);
-+
-             /* Start the minimal dialog according to the user preferences */
-             if (changed && xfconf_channel_get_bool (helper->channel, NOTIFY_PROP, FALSE))
-                 xfce_spawn_command_line_on_screen (NULL, "xfce4-display-settings -m", FALSE,
-
diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
index cc85ed8ce..45405ab4f 100755
--- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
+++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2012, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=xfce4-settings
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:--j6}
 
 if [ "$ARCH" = "i586" ]; then
@@ -52,7 +62,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -61,7 +70,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -74,11 +83,6 @@ find . \
 zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1
 
-# Fix monitor wake from standby with 4.4.x kernel:
-zcat $CWD/xfce.xfsettingsd.display.crtc.diff.gz | patch -p1 --verbose || exit 1
-
-patch -p1 < $CWD/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch
-
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xfce/xfce4-settings/xfce4-settings.url b/source/xfce/xfce4-settings/xfce4-settings.url
new file mode 100644
index 000000000..87f91747e
--- /dev/null
+++ b/source/xfce/xfce4-settings/xfce4-settings.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.3.tar.bz2