pool/xorg-cf-files
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 909747 from X11:XOrg

Browse Source 
- 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/request/show/909747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-cf-files?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2021-08-04 20:28:36 +00:00 committed by Git OBS Bridge
commit 4bbed14e96
7 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
u_ar-clq-Imake.tmpl-binutils_2.36.patch
View File

@ -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

28
u_riscv.patch
View File

@ -2,10 +2,10 @@ Author: Andreas Schwab <schwab@suse.de>
Subject: Add support for riscv64 Subject: Add support for riscv64
Patch-Mainline: To be upstreamed 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.7.orig/Imake.cf
+++ xorg-cf-files-1.0.6/Imake.cf +++ xorg-cf-files-1.0.7/Imake.cf
@@ -1037,6 +1037,11 @@ XCOMM Keep cpp from replacing path eleme @@ -1037,6 +1037,11 @@ XCOMM Keep cpp from replacing path eleme
# define AArch64Architecture # define AArch64Architecture
# undef __aarch64__ # undef __aarch64__
@ -18,11 +18,11 @@ Index: xorg-cf-files-1.0.6/Imake.cf
#endif /* linux || __GLIBC__ */ #endif /* linux || __GLIBC__ */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) #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.7.orig/linux.cf
+++ xorg-cf-files-1.0.6/linux.cf +++ xorg-cf-files-1.0.7/linux.cf
@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file @@ -584,7 +584,7 @@ InstallNamedTargetNoClobber(install,file
#define MkdirHierCmd mkdir -p #define MkdirHierCmd mkdir -p
#ifndef HaveLib64 #ifndef HaveLib64
@ -31,7 +31,7 @@ Index: xorg-cf-files-1.0.6/linux.cf
# define HaveLib64 YES # define HaveLib64 YES
# else # else
# define HaveLib64 NO # define HaveLib64 NO
@@ -994,6 +994,15 @@ InstallNamedTargetNoClobber(install,file @@ -1000,6 +1000,15 @@ InstallNamedTargetNoClobber(install,file
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AArch64Architecture */ #endif /* AArch64Architecture */
@ -47,10 +47,10 @@ Index: xorg-cf-files-1.0.6/linux.cf
#ifndef StandardDefines #ifndef StandardDefines
# ifdef __linux__ # ifdef __linux__
# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines # 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.7.orig/xfree86.cf
+++ xorg-cf-files-1.0.6/xfree86.cf +++ xorg-cf-files-1.0.7/xfree86.cf
@@ -2052,6 +2052,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane @@ -2052,6 +2052,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane
# endif # endif
#endif #endif
@ -64,10 +64,10 @@ Index: xorg-cf-files-1.0.6/xfree86.cf
#ifndef DefaultGcc2DebugOpt #ifndef DefaultGcc2DebugOpt
# define DefaultGcc2DebugOpt -g # define DefaultGcc2DebugOpt -g
#endif #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.7.orig/xorg.cf
+++ xorg-cf-files-1.0.6/xorg.cf +++ xorg-cf-files-1.0.7/xorg.cf
@@ -1603,6 +1603,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane @@ -1603,6 +1603,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane
# endif # endif
#endif #endif

18
u_xorg-cf-files-D_DEFAULT_SOURCE.patch
View File

@ -1,6 +1,7 @@
diff -u -p xorg-cf-files-1.0.6.orig/gnu.cf xorg-cf-files-1.0.6/gnu.cf Index: xorg-cf-files-1.0.7/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 --- 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 @@ -21,7 +21,7 @@ XCOMM operating system: OSName (OSMajor
#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ #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? 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 Index: xorg-cf-files-1.0.7/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 --- xorg-cf-files-1.0.7.orig/linux.cf
@@ -232,7 +232,7 @@ InstallNamedTargetNoClobber(install,file +++ xorg-cf-files-1.0.7/linux.cf
@@ -238,7 +238,7 @@ InstallNamedTargetNoClobber(install,file
#if LinuxCLibMajorVersion >= 6 #if LinuxCLibMajorVersion >= 6
# define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ # define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE -D_XOPEN_SOURCE \ -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 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxAdditionalIncludes LinuxGnuSourceDefines \
LinuxLocaleDefines LinuxLocaleDefines
@@ -251,7 +251,7 @@ InstallNamedTargetNoClobber(install,file @@ -257,7 +257,7 @@ InstallNamedTargetNoClobber(install,file
# endif # endif
#else #else
# define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ # define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \

3
xorg-cf-files-1.0.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
size 337859

3
xorg-cf-files-1.0.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308
size 345575

9
xorg-cf-files.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Aug 2 10:36:53 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- 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 <i@marguerite.su> Wed Mar 3 17:27:07 UTC 2021 - Marguerite Su <i@marguerite.su>

5
xorg-cf-files.spec
View File

@ -17,7 +17,7 @@
Name: xorg-cf-files Name: xorg-cf-files
Version: 1.0.6 Version: 1.0.7
Release: 0 Release: 0
Summary: Data files for the imake utility Summary: Data files for the imake utility
License: MIT License: MIT
@ -26,8 +26,6 @@ URL: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
Patch0: u_riscv.patch Patch0: u_riscv.patch
Patch1: u_xorg-cf-files-D_DEFAULT_SOURCE.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: font-util >= 1.1
BuildRequires: pkgconfig(xorg-macros) >= 1.4 BuildRequires: pkgconfig(xorg-macros) >= 1.4
Requires: gccmakedep Requires: gccmakedep
@ -57,7 +55,6 @@ converted.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
cat > host.def << EOF cat > host.def << EOF
#define ConfigDir %_configdir #define ConfigDir %_configdir