summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to 'source/x')
-rw-r--r--source/x/x11/build/xorg-cf-files2
-rw-r--r--source/x/x11/patch/xorg-cf-files.patch1
-rw-r--r--source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch27
3 files changed, 29 insertions, 1 deletions
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