summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.M2
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
-rwxr-xr-xsource/n/NetworkManager/NetworkManager.SlackBuild2
-rw-r--r--source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch25
-rw-r--r--source/x/x11/build/xorg-server2
-rw-r--r--source/x/x11/patch/xorg-server.patch6
-rw-r--r--source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch54
-rw-r--r--source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch58
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild2
9 files changed, 30 insertions, 123 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index 89c537765..66a01ccf4 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -215,7 +215,7 @@ fi
if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then
echo "Updating gdk-pixbuf.loaders:"
echo " /usr/bin/update-gdk-pixbuf-loaders &"
- /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 &
+ HOME=/root /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 &
fi
if [ -x /usr/bin/update-pango-querymodules ]; then
echo "Updating pango.modules:"
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 7245717ce..25f266921 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:-15}
+BUILD=${BUILD:-16}
# 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/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index 9f370bc8d..fdfe6ef31 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=NetworkManager
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
diff --git a/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch b/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
new file mode 100644
index 000000000..2783890f0
--- /dev/null
+++ b/source/n/NetworkManager/patches/version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
@@ -0,0 +1,25 @@
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 31 Jul 2018 14:13:57 +0200
+Subject: version: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro
+
+Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
+
+https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
+(cherry picked from commit 0a3755c1799d3a4dc1875d4c59c7c568a64c8456)
+---
+ libnm-core/nm-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
+index ee6dbc0..c240489 100644
+--- a/libnm-core/nm-version.h
++++ b/libnm-core/nm-version.h
+@@ -161,7 +161,7 @@
+ #endif
+
+ #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
+-# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2)
++# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2)
+ #else
+ # define NM_AVAILABLE_IN_1_12_2
+ #endif
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index bd48d5a06..2f47985b7 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -22,9 +22,3 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
# Reference: https://bugs.freedesktop.org/show_bug.cgi?id=94844
# Added here 2018/7.
zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Glamor patches that synchronize what the drivers and server expect. Written by
-# one of the ATI devs, so might improve things with that driver, but be on the
-# lookout for issues. Added 2018/7.
-zcat $CWD/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch.gz| patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch b/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
deleted file mode 100644
index 32672f2b5..000000000
--- a/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From patchwork Wed May 23 09:43:32 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver,
- 1/2] glamor: Always return 0 from glamor_fds_from_pixmap on error
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224909
-Message-Id: <20180523094333.11076-1-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:32 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-This matches what glamor_egl_fds_from_pixmap and dri3_fds_from_pixmap do
-and what proc_dri3_buffers_from_pixmap expects.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
- BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
- glamor/glamor.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index d984d20f3..e2c74d17a 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
- glamor_get_screen_private(pixmap->drawable.pScreen);
-
- if (!glamor_priv->dri3_enabled)
-- return -1;
-+ return 0;
- switch (pixmap_priv->type) {
- case GLAMOR_TEXTURE_DRM:
- case GLAMOR_TEXTURE_ONLY:
- if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
- GL_RGB10_A2 : GL_RGBA, 0))
-- return -1;
-+ return 0;
- return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
- strides, offsets,
- modifier);
- default:
- break;
- }
-- return -1;
-+ return 0;
- }
-
- _X_EXPORT int
diff --git a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch b/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
deleted file mode 100644
index ab92d3fca..000000000
--- a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From patchwork Wed May 23 09:43:33 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver, 2/2] glamor: Propagate glamor_fds_from_pixmap error in
- glamor_fd_from_pixmap
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224910
-Message-Id: <20180523094333.11076-2-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:33 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-glamor_fds_from_pixmap returns 0 on error, but we were treating that as
-success, continuing with uninitialized stride and fd values.
-
-Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
- BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- glamor/glamor.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index e2c74d17a..63f0947fa 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -865,17 +865,15 @@ glamor_fd_from_pixmap(ScreenPtr screen,
- &modifier);
-
- /* Pixmaps with multi-planes/modifier are not supported in this interface */
-- if (ret > 1) {
-- while (ret > 0)
-- close(fds[--ret]);
-- return -1;
-+ if (ret == 1 && offsets[0] == 0) {
-+ *stride = strides[0];
-+ *size = pixmap->drawable.height * *stride;
-+ return fds[0];
- }
-
-- ret = fds[0];
-- *stride = strides[0];
-- *size = pixmap->drawable.height * *stride;
--
-- return ret;
-+ while (ret > 0)
-+ close(fds[--ret]);
-+ return -1;
- }
-
- _X_EXPORT int
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 94a2204e9..7a451ff61 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -179,7 +179,7 @@ mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
PATH=$TMP/autoconf-tmp/usr/bin:$PATH
cd $TMP
-rm -rf firefox-$VERSION
+rm -rf firefox-$RELEASEVER
# Unpack this in a subdirectory to prevent changing permissions on /tmp:
rm -rf firefox-unpack
mkdir firefox-unpack