summaryrefslogtreecommitdiffstats
path: root/source/x/x11/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-10-28 20:22:51 +0000
committer Eric Hameleers <alien@slackware.com>2019-10-29 08:59:50 +0100
commit02056549bf9950d4e854dad95426ff1ad42fefc7 (patch)
treeca3dff5a63fa99906c077d6a761efaf3ea749242 /source/x/x11/patch
parentce00f77117a9aa40c35896cbce8395999fd3c9a9 (diff)
downloadcurrent-02056549bf9950d4e854dad95426ff1ad42fefc7.tar.gz
current-02056549bf9950d4e854dad95426ff1ad42fefc7.tar.xz
Mon Oct 28 20:22:51 UTC 201920191028202251
l/imagemagick-6.9.10_70-x86_64-1.txz: Upgraded. x/libinput-1.14.3-x86_64-1.txz: Upgraded. x/mkfontdir-1.0.7-noarch-2.txz: Removed. The mkfontdir wrapper script and man page are provided by recent versions of the mkfontscale package, making the mkfontdir package redundant. Thanks to DarkVision. x/mkfontscale-1.2.1-x86_64-2.txz: Rebuilt. Moved the mkfontdir install script to this package since it includes the mkfontdir wrapper script now. xap/gimp-2.10.14-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11/patch')
-rw-r--r--source/x/x11/patch/xorg-server.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 6ce93ee95..6099fad0f 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -24,7 +24,5 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
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 ; }
# Patch to build with libglvnd-1.2.0:
-zcat $CWD/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ;
-}
-zcat $CWD/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ;
-}
+zcat $CWD/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }