6 files changed, 49 insertions, 25 deletions
diff --git a/source/a/FTBFSlog b/source/a/FTBFSlog
index 46b928237..6b203503d 100644
--- a/source/a/FTBFSlog
+++ b/source/a/FTBFSlog
@@ -1,3 +1,6 @@
+Wed Nov 21 18:48:32 UTC 2018
+  upower: preemptive fix for FTBFS with new glib.
++--------------------------+
 Tue Jun 26 09:45:32 UTC 2018
   grub: fix FTBFS with gcc8 by patching to fix this warning:
     alignment 1 of struct efi_variable is less than 8 [-Werror=packed-not-aligned]
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index 913af8451..0bbba86eb 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -234,8 +234,9 @@ if [ -x /etc/rc.d/rc.cgmanager ]; then
   /etc/rc.d/rc.cgmanager stop
 fi
 
+# Unmount local file systems:
 echo "Unmounting local file systems:"
-/bin/umount -v -a -t no,proc,sysfs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g" 2> /dev/null
+/bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse
 
 # JFS needs a sync here or the / partition cannot be remounted read-only.
 # In spite of this, it seems that a JFS root partition will always be checked
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index 3b8218669..e689e4589 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -176,11 +176,6 @@ fi
 # Enable swapping:
 /sbin/swapon -a 2> /dev/null
 
-# Start FUSE, if requested:
-if [ -x /etc/rc.d/rc.fuse ]; then
-  /etc/rc.d/rc.fuse start
-fi
-
 # Set the tick and frequency for the system clock.
 # Default values are: TICK=10000 and FREQ=0
 TICK=10000
@@ -297,22 +292,22 @@ else
   echo "to the Linux section in your /etc/lilo.conf and type 'lilo' to reinstall it."
 fi # Done checking root filesystem
 
-
-# Any /etc/mtab that exists here is old, so we start with a new one:
-/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
-
-# Add entry for / to /etc/mtab:
-/sbin/mount -f -w /
-
-# Add /proc, /sys, and /dev/shm mounts to /etc/mtab:
-if [ -d /proc/sys ]; then
-  /sbin/mount -f -t proc proc /proc
-fi
-if [ -d /sys/bus ]; then
-  /sbin/mount -f -t sysfs sysfs /sys
-fi
-if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then
-  /sbin/mount -f -t tmpfs tmpfs /dev/shm
+# If /etc/mtab is a symlink (probably to /proc/mounts) then we don't want to mess with it.
+if [ ! -L /etc/mtab -o ! -r /etc/mtab ]; then
+  # /etc/mtab is a file (or doesn't exist), so we'll handle it the old way:
+  # Any /etc/mtab that exists here is old, so we start with a new one:
+  /bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
+  # Add /, /proc, /sys, and /dev/shm mounts to /etc/mtab:
+  /sbin/mount -f -w /
+  if [ -d /proc/sys ]; then
+    /sbin/mount -f -t proc proc /proc
+  fi
+  if [ -d /sys/bus ]; then
+    /sbin/mount -f -t sysfs sysfs /sys
+  fi
+  if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then
+    /sbin/mount -f -t tmpfs tmpfs /dev/shm
+  fi
 fi
 
 # Configure ISA Plug-and-Play devices:
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 3df2410e0..9b3575966 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=sysvinit-scripts
 VERSION=${VERSION:-2.1}
 ARCH=noarch
-BUILD=${BUILD:-20}
+BUILD=${BUILD:-21}
 
 # 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
diff --git a/source/a/upower/patches/upower.glib_2_58_1.diff b/source/a/upower/patches/upower.glib_2_58_1.diff
new file mode 100644
index 000000000..466fc71d5
--- /dev/null
+++ b/source/a/upower/patches/upower.glib_2_58_1.diff
@@ -0,0 +1,22 @@
+--- ./libupower-glib/up-wakeups.c.orig	2013-10-18 09:41:24.000000000 -0500
++++ ./libupower-glib/up-wakeups.c	2018-11-20 23:07:29.603065864 -0600
+@@ -185,7 +185,7 @@
+ 	return array;
+ }
+ 
+-#pragma GCC diagnostic error "-Wdeprecated-declarations"
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ 
+ /**
+  * up_wakeups_ensure_properties:
+--- ./libupower-glib/up-device.c.orig	2013-10-18 09:41:24.000000000 -0500
++++ ./libupower-glib/up-device.c	2018-11-20 23:07:24.435066237 -0600
+@@ -748,7 +748,7 @@
+ 	return array;
+ }
+ 
+-#pragma GCC diagnostic error "-Wdeprecated-declarations"
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ 
+ /*
+  * up_device_set_property:
diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild
index 6276e9c72..5be5589d4 100755
--- a/source/a/upower/upower.SlackBuild
+++ b/source/a/upower/upower.SlackBuild
@@ -99,8 +99,11 @@ zcat $CWD/patches/Fix-HID-rules-header-as-per-discussions.patch.gz | patch -p1 -
 zcat $CWD/patches/Update-UPower-HID-rules-supported-devices-list.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/patches/rules-Add-support-for-Logitech-G700s-G700-Gaming-Mou.patch.gz | patch -p1 --verbose || exit 1
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# Don't fail on deprecated delarations:
+zcat $CWD/patches/upower.glib_2_58_1.diff.gz | patch -p1 --verbose || exit 1
+
+CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \
+CXXFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \