Accepting request 878075 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/878075
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-cf-files?expand=0&rev=14

u_ar-clq-Imake.tmpl-binutils_2.36.patch

@@ -0,0 +1,13 @@
+Index: xorg-cf-files-1.0.6/Imake.tmpl
+===================================================================
+--- xorg-cf-files-1.0.6.orig/Imake.tmpl
++++ xorg-cf-files-1.0.6/Imake.tmpl
+@@ -1081,7 +1081,7 @@ TCLIBDIR = TclLibDir
+ #if HasLargeTmp || SystemV4
+ #define ArCmd ArCmdBase cq
+ #else
+-#define ArCmd ArCmdBase clq
++#define ArCmd ArCmdBase cq
+ #endif
+ #endif
+ #ifndef ArAddCmd

xorg-cf-files.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar  3 17:27:07 UTC 2021 - Marguerite Su <i@marguerite.su>
+
+- u_ar-clq-Imake.tmpl-binutils_2.36.patch
+  * debian#981072: the previously ignored "l" option
+    (did no actual work) was implemented to specfily
+    dependencies of library. any wrong usage will now
+    trigger "ar: libdeps specified more than once"
+    error.
+
 -------------------------------------------------------------------
 Mon Jan  4 11:53:49 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 

xorg-cf-files.spec

@@ -26,6 +26,8 @@ URL:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
 Patch0:         u_riscv.patch
 Patch1:         u_xorg-cf-files-D_DEFAULT_SOURCE.patch
+#PATCH-FIX-UPSTREAM "ar l" in binutils 2.36 now has actual meaning
+Patch2:         u_ar-clq-Imake.tmpl-binutils_2.36.patch
 BuildRequires:  font-util >= 1.1
 BuildRequires:  pkgconfig(xorg-macros) >= 1.4
 Requires:       gccmakedep
@@ -55,6 +57,7 @@ converted.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cat > host.def << EOF
 #define ConfigDir %_configdir