From b3fe11ea2cf9e0146a94e2dd76c825b874e6e944 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 20 Apr 2021 19:44:02 +0000
Subject: Tue Apr 20 19:44:02 UTC 2021

ap/slackpkg-15.0.2-noarch-1.txz:  Upgraded.
  Fix break error messages (dive)
  Remove now pointless if/then/else (dive)
  Safer config sourcing (dive)
  files/slackpkg: replace #!/bin/sh with #!/bin/bash (Eugen Wissner)
  Don't create blacklist when running update (dive)
  Add show-changelog & help to non-root commands (dive)
  Improve search blacklisting (dive)
  Fix package duplicate bug (PiterPunk)
  Thanks to Robby Workman.
ap/sqlite-3.35.5-x86_64-1.txz:  Upgraded.
kde/kwin-5.21.4-x86_64-2.txz:  Rebuilt.
  Delay closing Wayland streams. Thanks to LuckyCyborg.
kde/okteta-0.26.6-x86_64-1.txz:  Upgraded.
l/libtiff-4.3.0-x86_64-1.txz:  Upgraded.
n/libgcrypt-1.9.3-x86_64-1.txz:  Upgraded.
n/samba-4.14.3-x86_64-1.txz:  Upgraded.
x/xorg-cf-files-1.0.6-x86_64-6.txz:  Rebuilt.
  Patched to fix an incompatibility introduced by binutils-2.36.
  Thanks to BenCollver.
xap/seamonkey-2.53.7.1-x86_64-1.txz:  Upgraded.
  This update contains security fixes and improvements.
  For more information, see:
    https://www.seamonkey-project.org/releases/seamonkey2.53.7.1
  (* Security fix *)
---
 source/x/x11/build/xorg-cf-files                   |  2 +-
 source/x/x11/patch/xorg-cf-files.patch             |  1 +
 .../Imake.tmpl-binutils-ar-2.36.patch              | 27 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 source/x/x11/patch/xorg-cf-files.patch
 create mode 100644 source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch

(limited to 'source/x/x11')

diff --git a/source/x/x11/build/xorg-cf-files b/source/x/x11/build/xorg-cf-files
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xorg-cf-files
+++ b/source/x/x11/build/xorg-cf-files
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/patch/xorg-cf-files.patch b/source/x/x11/patch/xorg-cf-files.patch
new file mode 100644
index 000000000..f00f26280
--- /dev/null
+++ b/source/x/x11/patch/xorg-cf-files.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch b/source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch
new file mode 100644
index 000000000..55b6d8dc5
--- /dev/null
+++ b/source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch
@@ -0,0 +1,27 @@
+--- xorg-cf-files-1.0.6/Imake.tmpl.orig	2021-04-15 11:06:19.978750979 -0700
++++ xorg-cf-files-1.0.6/Imake.tmpl	2021-04-15 11:07:02.421749295 -0700
+@@ -1081,21 +1081,21 @@
+ #if HasLargeTmp || SystemV4
+ #define ArCmd ArCmdBase cq
+ #else
+-#define ArCmd ArCmdBase clq
++#define ArCmd ArCmdBase cq
+ #endif
+ #endif
+ #ifndef ArAddCmd
+ #if HasLargeTmp || SystemV4
+ #define ArAddCmd ArCmdBase ru
+ #else
+-#define ArAddCmd ArCmdBase rul
++#define ArAddCmd ArCmdBase ru
+ #endif
+ #endif
+ #ifndef ArExtCmd
+ #if HasLargeTmp || SystemV4
+ #define ArExtCmd ArCmdBase x
+ #else
+-#define ArExtCmd ArCmdBase xl
++#define ArExtCmd ArCmdBase x
+ #endif
+ #endif
+ #ifndef BootstrapCFlags
-- 
cgit v1.2.3-65-gdbad