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

Accepting request 1067082 from X11:XOrg

Browse Source 
- Update to version 1.0.8
  * This is a minor update to ship the contributed support for Linux
    on RISC-V & LoongArch, and AArch64 on Darwin (MacOS), as well as
    to fix incompatibility when using GNU binutils 2.36 and later on
    FreeBSD, and to correct the setting of the rarely (never?) used
    ENCODINGSDIR in site.def.
- supersedes u_riscv.patch
- refreshed u_xorg-cf-files-D_DEFAULT_SOURCE.patch

OBS-URL: https://build.opensuse.org/request/show/1067082
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-cf-files?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2023-02-23 15:28:04 +00:00 committed by Git OBS Bridge
commit 6ba472cfcc
6 changed files with 28 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
u_riscv.patch
View File

@ -1,83 +0,0 @@
Author: Andreas Schwab <schwab@suse.de>
Subject: Add support for riscv64
Patch-Mainline: To be upstreamed
Index: xorg-cf-files-1.0.7/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__
# endif
+# if defined(__riscv) && __riscv_xlen == 64
+# define RiscV64Architecture
+# undef __riscv
+# undef __riscv_xlen
+# endif
#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.7/linux.cf
===================================================================
--- 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
-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined(RiscV64Architecture)
# define HaveLib64 YES
# else
# define HaveLib64 NO
@@ -1000,6 +1000,15 @@ InstallNamedTargetNoClobber(install,file
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AArch64Architecture */
+#ifdef RiscV64Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags DefaultGcc2RiscV64Opt
+# endif
+# define LinuxMachineDefines -D__riscv -D__riscv_xlen=64
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* RiscV64Architecture */
+
#ifndef StandardDefines
# ifdef __linux__
# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
Index: xorg-cf-files-1.0.7/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
+#if HasGcc2 && defined(RiscV64Architecture)
+# ifndef DefaultGcc2RiscV64Opt
+# define DefaultGcc2RiscV64Opt -O2 GccAliasingArgs
+# endif
+#endif
+
#ifndef DefaultGcc2DebugOpt
# define DefaultGcc2DebugOpt -g
#endif
Index: xorg-cf-files-1.0.7/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
+#if HasGcc2 && defined(RiscV64Architecture)
+# ifndef DefaultGcc2RiscV64Opt
+# define DefaultGcc2RiscV64Opt -O2 GccAliasingArgs
+# endif
+#endif
+
#ifndef DefaultGcc2DebugOpt
# define DefaultGcc2DebugOpt -g
#endif

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

@ -1,7 +1,7 @@
Index: xorg-cf-files-1.0.7/gnu.cf Index: xorg-cf-files-1.0.8/gnu.cf
=================================================================== ===================================================================
--- xorg-cf-files-1.0.7.orig/gnu.cf --- xorg-cf-files-1.0.8.orig/gnu.cf
+++ xorg-cf-files-1.0.7/gnu.cf +++ xorg-cf-files-1.0.8/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 \
@ -11,11 +11,11 @@ Index: xorg-cf-files-1.0.7/gnu.cf
XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
Index: xorg-cf-files-1.0.7/linux.cf Index: xorg-cf-files-1.0.8/linux.cf
=================================================================== ===================================================================
--- xorg-cf-files-1.0.7.orig/linux.cf --- xorg-cf-files-1.0.8.orig/linux.cf
+++ xorg-cf-files-1.0.7/linux.cf +++ xorg-cf-files-1.0.8/linux.cf
@@ -238,7 +238,7 @@ InstallNamedTargetNoClobber(install,file @@ -242,7 +242,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 \
@ -24,7 +24,7 @@ Index: xorg-cf-files-1.0.7/linux.cf
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxAdditionalIncludes LinuxGnuSourceDefines \
LinuxLocaleDefines LinuxLocaleDefines
@@ -257,7 +257,7 @@ InstallNamedTargetNoClobber(install,file @@ -261,7 +261,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.7.tar.bz2
View File

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

BIN
xorg-cf-files-1.0.8.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

12
xorg-cf-files.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Feb 22 03:25:24 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 1.0.8
* This is a minor update to ship the contributed support for Linux
on RISC-V & LoongArch, and AArch64 on Darwin (MacOS), as well as
to fix incompatibility when using GNU binutils 2.36 and later on
FreeBSD, and to correct the setting of the rarely (never?) used
ENCODINGSDIR in site.def.
- supersedes u_riscv.patch
- refreshed u_xorg-cf-files-D_DEFAULT_SOURCE.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 2 10:36:53 UTC 2021 - Stefan Dirsch <sndirsch@suse.com> Mon Aug 2 10:36:53 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

11
xorg-cf-files.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xorg-cf-files # spec file for package xorg-cf-files
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,14 +17,13 @@
Name: xorg-cf-files Name: xorg-cf-files
Version: 1.0.7 Version: 1.0.8
Release: 0 Release: 0
Summary: Data files for the imake utility Summary: Data files for the imake utility
License: MIT License: MIT
Group: Development/Tools/Building Group: Development/Tools/Building
URL: http://xorg.freedesktop.org/ 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.xz
Patch0: u_riscv.patch
Patch1: u_xorg-cf-files-D_DEFAULT_SOURCE.patch Patch1: u_xorg-cf-files-D_DEFAULT_SOURCE.patch
BuildRequires: font-util >= 1.1 BuildRequires: font-util >= 1.1
BuildRequires: pkgconfig(xorg-macros) >= 1.4 BuildRequires: pkgconfig(xorg-macros) >= 1.4
@ -53,7 +52,6 @@ converted.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1 %patch1 -p1
cat > host.def << EOF cat > host.def << EOF
@ -123,7 +121,8 @@ make %{?_smp_mflags}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc ChangeLog COPYING README %license COPYING
%doc ChangeLog README
%dir %{_datadir}/X11 %dir %{_datadir}/X11
%{_datadir}/X11/config/ %{_datadir}/X11/config/