8 files changed, 51 insertions, 35 deletions
diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
index 46a4db593..8a1a10fcf 100755
--- a/source/ap/nano/nano.SlackBuild
+++ b/source/ap/nano/nano.SlackBuild
@@ -104,7 +104,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-multibuffer \
   --enable-nanorc \
   --enable-utf8 \
-  --disable-wrapping-as-root \
   --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1
 
 # Build and install:
diff --git a/source/l/Mako/Mako.SlackBuild b/source/l/Mako/Mako.SlackBuild
index 41171e69c..2edeaf42e 100755
--- a/source/l/Mako/Mako.SlackBuild
+++ b/source/l/Mako/Mako.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=Mako
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/l/shared-mime-info/fetch-shared-mime-info.sh b/source/l/shared-mime-info/fetch-shared-mime-info.sh
new file mode 100755
index 000000000..3991e39f4
--- /dev/null
+++ b/source/l/shared-mime-info/fetch-shared-mime-info.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Copyright 2019  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.
+
+# Clear download area:
+rm -rf shared-mime-info
+
+# Clone repository:
+git clone https://gitlab.freedesktop.org/xdg/shared-mime-info.git
+
+VERSION=$(cd shared-mime-info && grep "^AC_INIT(\[shared-mime-info" configure.ac | cut -f 2 -d , | tr -d [ | tr -d ])
+
+# Cleanup.  We're not packing up the whole git repo.
+( cd shared-mime-info && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+( cd shared-mime-info/tests && rm -rf * )
+mv shared-mime-info shared-mime-info-${VERSION}
+rm -f shared-mime-info-${VERSION}.tar
+tar cf shared-mime-info-${VERSION}.tar shared-mime-info-${VERSION}
+rm -f shared-mime-info-${VERSION}.tar.lz
+plzip -9 shared-mime-info-${VERSION}.tar
+rm -rf shared-mime-info-${VERSION}
+echo
+echo "shared-mime-info packaged as shared-mime-info-${VERSION}.tar.lz"
+echo
diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild
index 745cce86a..0c4fee47d 100755
--- a/source/l/shared-mime-info/shared-mime-info.SlackBuild
+++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=shared-mime-info
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -68,7 +68,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
 
 # Don't use fdatasync() unless you want it to take 1000x longer
@@ -82,6 +82,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ ! -r configure ]; then
+  NOCONFIGURE=1 ./autogen.sh
+fi
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/l/shared-mime-info/shared-mime-info.url b/source/l/shared-mime-info/shared-mime-info.url
new file mode 100644
index 000000000..0d268d0d6
--- /dev/null
+++ b/source/l/shared-mime-info/shared-mime-info.url
@@ -0,0 +1 @@
+https://gitlab.freedesktop.org/xdg/shared-mime-info
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xcompmgr
+++ b/source/x/x11/build/xcompmgr
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch
index 33c43a524..6097b12a3 100644
--- a/source/x/x11/patch/xcompmgr.patch
+++ b/source/x/x11/patch/xcompmgr.patch
@@ -1,4 +1,2 @@
 zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \
      || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff.gz | patch -p0 --verbose \
-     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff b/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff
deleted file mode 100644
index 39b8ac725..000000000
--- a/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- xcompmgr.c	2011-11-19 01:49:52.000000000 -0600
-+++ xcompmgr.c	2012-08-11 21:58:58.000000000 -0500
-@@ -1028,7 +1028,6 @@
- 	{
- 	    w->borderClip = XFixesCreateRegion (dpy, NULL, 0);
- 	    XFixesCopyRegion (dpy, w->borderClip, region);
--	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
- 	}
- 	w->prev_trans = t;
- 	t = w;
-@@ -1080,6 +1079,8 @@
- 	if (w->mode == WINDOW_TRANS)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
-@@ -1099,6 +1100,8 @@
- 	else if (w->mode == WINDOW_ARGB)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;