From 65fd274b74be6039cf22ab435fe430ef7d53d57b1116ae7659fea2359365e7a2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 2 Aug 2021 10:44:22 +0000 Subject: [PATCH] - Update to version 1.0.7 * This is a minor update to resolve a compatibility issue with GNU binutils 2.36. - supersedes u_ar-clq-Imake.tmpl-binutils_2.36.patch - refreshed u_riscv.patch, u_xorg-cf-files-D_DEFAULT_SOURCE.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-cf-files?expand=0&rev=24 --- u_ar-clq-Imake.tmpl-binutils_2.36.patch | 13 ------------ u_riscv.patch | 28 ++++++++++++------------- u_xorg-cf-files-D_DEFAULT_SOURCE.patch | 18 +++++++++------- xorg-cf-files-1.0.6.tar.bz2 | 3 --- xorg-cf-files-1.0.7.tar.bz2 | 3 +++ xorg-cf-files.changes | 9 ++++++++ xorg-cf-files.spec | 5 +---- 7 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 u_ar-clq-Imake.tmpl-binutils_2.36.patch delete mode 100644 xorg-cf-files-1.0.6.tar.bz2 create mode 100644 xorg-cf-files-1.0.7.tar.bz2 diff --git a/u_ar-clq-Imake.tmpl-binutils_2.36.patch b/u_ar-clq-Imake.tmpl-binutils_2.36.patch deleted file mode 100644 index 8a1822c..0000000 --- a/u_ar-clq-Imake.tmpl-binutils_2.36.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/u_riscv.patch b/u_riscv.patch index b08a5b3..1ea0ced 100644 --- a/u_riscv.patch +++ b/u_riscv.patch @@ -2,10 +2,10 @@ Author: Andreas Schwab Subject: Add support for riscv64 Patch-Mainline: To be upstreamed -Index: xorg-cf-files-1.0.6/Imake.cf +Index: xorg-cf-files-1.0.7/Imake.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/Imake.cf -+++ xorg-cf-files-1.0.6/Imake.cf +--- xorg-cf-files-1.0.7.orig/Imake.cf ++++ xorg-cf-files-1.0.7/Imake.cf @@ -1037,6 +1037,11 @@ XCOMM Keep cpp from replacing path eleme # define AArch64Architecture # undef __aarch64__ @@ -18,11 +18,11 @@ Index: xorg-cf-files-1.0.6/Imake.cf #endif /* linux || __GLIBC__ */ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) -Index: xorg-cf-files-1.0.6/linux.cf +Index: xorg-cf-files-1.0.7/linux.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/linux.cf -+++ xorg-cf-files-1.0.6/linux.cf -@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file +--- xorg-cf-files-1.0.7.orig/linux.cf ++++ xorg-cf-files-1.0.7/linux.cf +@@ -584,7 +584,7 @@ InstallNamedTargetNoClobber(install,file #define MkdirHierCmd mkdir -p #ifndef HaveLib64 @@ -31,7 +31,7 @@ Index: xorg-cf-files-1.0.6/linux.cf # define HaveLib64 YES # else # define HaveLib64 NO -@@ -994,6 +994,15 @@ InstallNamedTargetNoClobber(install,file +@@ -1000,6 +1000,15 @@ InstallNamedTargetNoClobber(install,file # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AArch64Architecture */ @@ -47,10 +47,10 @@ Index: xorg-cf-files-1.0.6/linux.cf #ifndef StandardDefines # ifdef __linux__ # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines -Index: xorg-cf-files-1.0.6/xfree86.cf +Index: xorg-cf-files-1.0.7/xfree86.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/xfree86.cf -+++ xorg-cf-files-1.0.6/xfree86.cf +--- xorg-cf-files-1.0.7.orig/xfree86.cf ++++ xorg-cf-files-1.0.7/xfree86.cf @@ -2052,6 +2052,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane # endif #endif @@ -64,10 +64,10 @@ Index: xorg-cf-files-1.0.6/xfree86.cf #ifndef DefaultGcc2DebugOpt # define DefaultGcc2DebugOpt -g #endif -Index: xorg-cf-files-1.0.6/xorg.cf +Index: xorg-cf-files-1.0.7/xorg.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/xorg.cf -+++ xorg-cf-files-1.0.6/xorg.cf +--- xorg-cf-files-1.0.7.orig/xorg.cf ++++ xorg-cf-files-1.0.7/xorg.cf @@ -1603,6 +1603,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane # endif #endif diff --git a/u_xorg-cf-files-D_DEFAULT_SOURCE.patch b/u_xorg-cf-files-D_DEFAULT_SOURCE.patch index 1a87e05..a8de803 100644 --- a/u_xorg-cf-files-D_DEFAULT_SOURCE.patch +++ b/u_xorg-cf-files-D_DEFAULT_SOURCE.patch @@ -1,6 +1,7 @@ -diff -u -p xorg-cf-files-1.0.6.orig/gnu.cf xorg-cf-files-1.0.6/gnu.cf ---- xorg-cf-files-1.0.6.orig/gnu.cf 2021-01-04 12:47:28.399794000 +0100 -+++ xorg-cf-files-1.0.6/gnu.cf 2021-01-04 12:49:14.978974000 +0100 +Index: xorg-cf-files-1.0.7/gnu.cf +=================================================================== +--- xorg-cf-files-1.0.7.orig/gnu.cf ++++ xorg-cf-files-1.0.7/gnu.cf @@ -21,7 +21,7 @@ XCOMM operating system: OSName (OSMajor #define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ @@ -10,10 +11,11 @@ diff -u -p xorg-cf-files-1.0.6.orig/gnu.cf xorg-cf-files-1.0.6/gnu.cf XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? -diff -u -p xorg-cf-files-1.0.6.orig/linux.cf xorg-cf-files-1.0.6/linux.cf ---- xorg-cf-files-1.0.6.orig/linux.cf 2021-01-04 12:47:28.194801000 +0100 -+++ xorg-cf-files-1.0.6/linux.cf 2021-01-04 12:49:59.493049000 +0100 -@@ -232,7 +232,7 @@ InstallNamedTargetNoClobber(install,file +Index: xorg-cf-files-1.0.7/linux.cf +=================================================================== +--- xorg-cf-files-1.0.7.orig/linux.cf ++++ xorg-cf-files-1.0.7/linux.cf +@@ -238,7 +238,7 @@ InstallNamedTargetNoClobber(install,file #if LinuxCLibMajorVersion >= 6 # define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE \ @@ -22,7 +24,7 @@ diff -u -p xorg-cf-files-1.0.6.orig/linux.cf xorg-cf-files-1.0.6/linux.cf -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxLocaleDefines -@@ -251,7 +251,7 @@ InstallNamedTargetNoClobber(install,file +@@ -257,7 +257,7 @@ InstallNamedTargetNoClobber(install,file # endif #else # define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ diff --git a/xorg-cf-files-1.0.6.tar.bz2 b/xorg-cf-files-1.0.6.tar.bz2 deleted file mode 100644 index 719fbe6..0000000 --- a/xorg-cf-files-1.0.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d -size 337859 diff --git a/xorg-cf-files-1.0.7.tar.bz2 b/xorg-cf-files-1.0.7.tar.bz2 new file mode 100644 index 0000000..462364a --- /dev/null +++ b/xorg-cf-files-1.0.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308 +size 345575 diff --git a/xorg-cf-files.changes b/xorg-cf-files.changes index 1663f68..577b829 100644 --- a/xorg-cf-files.changes +++ b/xorg-cf-files.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 2 10:36:53 UTC 2021 - Stefan Dirsch + +- Update to version 1.0.7 + * This is a minor update to resolve a compatibility issue with + GNU binutils 2.36. +- supersedes u_ar-clq-Imake.tmpl-binutils_2.36.patch +- refreshed u_riscv.patch, u_xorg-cf-files-D_DEFAULT_SOURCE.patch + ------------------------------------------------------------------- Wed Mar 3 17:27:07 UTC 2021 - Marguerite Su diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec index 477810c..d908956 100644 --- a/xorg-cf-files.spec +++ b/xorg-cf-files.spec @@ -17,7 +17,7 @@ Name: xorg-cf-files -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Data files for the imake utility License: MIT @@ -26,8 +26,6 @@ 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 @@ -57,7 +55,6 @@ converted. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 cat > host.def << EOF #define ConfigDir %_configdir