openkylin
/
xutils-dev
mirror of https://gitee.com/openkylin/xutils-dev.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
denghao 2023-04-10 10:15:39 +08:00
parent 4229c47767
commit b998174640
7 changed files with 1132 additions and 1030 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/patches/03_xutils-dev-FHS.diff vendored
View File

@ -1,8 +1,17 @@
Index: xutils-dev-1.0.2/xorg-cf-files/linux.cf
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Mon, 10 Apr 2023 10:15:38 +0800
Subject: _xutils-dev-FHS
===================================================================
--- xutils-dev-1.0.2.orig/xorg-cf-files/linux.cf 2006-04-16 16:53:09.000000000 +0800
+++ xutils-dev-1.0.2/xorg-cf-files/linux.cf 2006-04-16 16:54:41.000000000 +0800
@@ -86,6 +86,19 @@
---
xorg-cf-files/linux.cf | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf
index 3d61076..0662cdf 100644
--- a/xorg-cf-files/linux.cf
+++ b/xorg-cf-files/linux.cf
@@ -86,6 +86,19 @@ XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
# define BuildPDFdocs NO
#endif

1930
debian/patches/04_xutils-dev-debian.diff vendored
View File

File diff suppressed because it is too large Load Diff

104
debian/patches/05_xaw_without_xp.diff vendored
View File

@ -1,56 +1,18 @@
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Mon, 10 Apr 2023 10:15:39 +0800
Subject: _xaw_without_xp
---
xorg-cf-files/FreeBSD.cf | 10 ++++++++++
xorg-cf-files/gnu.cf | 10 ++++++++++
xorg-cf-files/linux.cf | 10 ++++++++++
xorg-cf-files/FreeBSD.cf | 10 ++++++++++
xorg-cf-files/gnu.cf | 10 ++++++++++
xorg-cf-files/linux.cf | 10 ++++++++++
3 files changed, 30 insertions(+)
Index: xutils-dev/xorg-cf-files/linux.cf
===================================================================
--- xutils-dev.orig/xorg-cf-files/linux.cf
+++ xutils-dev/xorg-cf-files/linux.cf
@@ -1158,6 +1158,16 @@ InstallNamedTargetNoClobber(install,file
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+#ifndef ExtraXawClientLibs
+# define ExtraXawClientLibs /**/
+#endif
+#ifndef ExtraXawClientDepLibs
+# define ExtraXawClientDepLibs /**/
+#endif
+#ifndef ExtraXawReqs
+# define ExtraXawReqs /**/
+#endif
+
#if HaveLib64
# ifndef LibDirName
# define LibDirName lib64
Index: xutils-dev/xorg-cf-files/gnu.cf
===================================================================
--- xutils-dev.orig/xorg-cf-files/gnu.cf
+++ xutils-dev/xorg-cf-files/gnu.cf
@@ -541,6 +541,16 @@ InstallNamedTargetNoClobber(install,file
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+#ifndef ExtraXawClientLibs
+# define ExtraXawClientLibs /**/
+#endif
+#ifndef ExtraXawClientDepLibs
+# define ExtraXawClientDepLibs /**/
+#endif
+#ifndef ExtraXawReqs
+# define ExtraXawReqs /**/
+#endif
+
#ifndef BuildDmx
#define BuildDmx YES
#endif
Index: xutils-dev/xorg-cf-files/FreeBSD.cf
===================================================================
--- xutils-dev.orig/xorg-cf-files/FreeBSD.cf
+++ xutils-dev/xorg-cf-files/FreeBSD.cf
@@ -570,6 +570,16 @@ XCOMM operating system: OSName (OSMajor
diff --git a/xorg-cf-files/FreeBSD.cf b/xorg-cf-files/FreeBSD.cf
index 8f9cac3..db2ca96 100644
--- a/xorg-cf-files/FreeBSD.cf
+++ b/xorg-cf-files/FreeBSD.cf
@@ -570,6 +570,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#endif
@ -67,3 +29,45 @@ Index: xutils-dev/xorg-cf-files/FreeBSD.cf
/*
* A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
*/
diff --git a/xorg-cf-files/gnu.cf b/xorg-cf-files/gnu.cf
index ae767b5..fb2c20d 100644
--- a/xorg-cf-files/gnu.cf
+++ b/xorg-cf-files/gnu.cf
@@ -541,6 +541,16 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+#ifndef ExtraXawClientLibs
+# define ExtraXawClientLibs /**/
+#endif
+#ifndef ExtraXawClientDepLibs
+# define ExtraXawClientDepLibs /**/
+#endif
+#ifndef ExtraXawReqs
+# define ExtraXawReqs /**/
+#endif
+
#ifndef BuildDmx
#define BuildDmx YES
#endif
diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf
index 984f518..0b3de25 100644
--- a/xorg-cf-files/linux.cf
+++ b/xorg-cf-files/linux.cf
@@ -1173,6 +1173,16 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+#ifndef ExtraXawClientLibs
+# define ExtraXawClientLibs /**/
+#endif
+#ifndef ExtraXawClientDepLibs
+# define ExtraXawClientDepLibs /**/
+#endif
+#ifndef ExtraXawReqs
+# define ExtraXawReqs /**/
+#endif
+
#if HaveLib64
# ifndef LibDirName
# define LibDirName lib64

17
debian/patches/06_font_path.diff vendored
View File

@ -1,8 +1,17 @@
Index: xutils-dev/xorg-cf-files/X11.tmpl
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Mon, 10 Apr 2023 10:15:39 +0800
Subject: _font_path
===================================================================
--- xutils-dev.orig/xorg-cf-files/X11.tmpl 2006-12-19 20:55:05.000000000 -0500
+++ xutils-dev/xorg-cf-files/X11.tmpl 2006-12-19 20:56:03.000000000 -0500
@@ -1512,10 +1512,10 @@
---
xorg-cf-files/X11.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xorg-cf-files/X11.tmpl b/xorg-cf-files/X11.tmpl
index 034d88e..8fa289d 100644
--- a/xorg-cf-files/X11.tmpl
+++ b/xorg-cf-files/X11.tmpl
@@ -1512,10 +1512,10 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define DocPdfDir $(DOCDIR)/PDF
#endif
#ifndef FontDir

17
debian/patches/07_gnu_manpath.diff vendored
View File

@ -1,8 +1,17 @@
This patch is Debian-specific, see bugs.debian.org/638016
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Mon, 10 Apr 2023 10:15:39 +0800
Subject: _gnu_manpath
--- xutils-dev-7.6+5/xorg-cf-files/gnu.cf 2011-08-16 16:06:57.000000000 +0200
+++ xutils-dev-7.6+5/xorg-cf-files/gnu.cf.new 2011-08-16 16:09:58.000000000 +0200
@@ -29,6 +29,13 @@
This patch is Debian-specific, see bugs.debian.org/638016
---
xorg-cf-files/gnu.cf | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/xorg-cf-files/gnu.cf b/xorg-cf-files/gnu.cf
index fb2c20d..dcd1ba9 100644
--- a/xorg-cf-files/gnu.cf
+++ b/xorg-cf-files/gnu.cf
@@ -29,6 +29,13 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.2 2004/04/23 18:41:58 eich Exp $
# define GnuBinUtilsMajorVersion DefaultGnuBinUtilsMajorVersion
#endif

27
debian/patches/99_ppc64el.diff vendored
View File

@ -1,7 +1,17 @@
diff -Nru xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.cf xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.cf
--- xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.cf 2013-07-30 12:22:15.000000000 -0600
+++ xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.cf 2013-12-18 05:22:24.000000000 -0700
@@ -930,6 +930,11 @@
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Mon, 10 Apr 2023 10:15:39 +0800
Subject: _ppc64el
---
xorg-cf-files/Imake.cf | 5 +++++
xorg-cf-files/Imake.tmpl | 2 ++
2 files changed, 7 insertions(+)
diff --git a/xorg-cf-files/Imake.cf b/xorg-cf-files/Imake.cf
index 0942fb0..1215d4b 100644
--- a/xorg-cf-files/Imake.cf
+++ b/xorg-cf-files/Imake.cf
@@ -941,6 +941,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef __powerpc__
# endif
# ifdef __powerpc64__
@ -13,10 +23,11 @@ diff -Nru xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.cf xutils-dev-7.7~1ubuntu6
# ifndef Ppc64Architecture
# define Ppc64Architecture
# endif
diff -Nru xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.tmpl xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.tmpl
--- xutils-dev-7.7~1ubuntu5/xorg-cf-files/Imake.tmpl 2013-07-30 16:53:35.000000000 -0600
+++ xutils-dev-7.7~1ubuntu6/xorg-cf-files/Imake.tmpl 2013-12-18 05:25:04.000000000 -0700
@@ -528,6 +528,8 @@
diff --git a/xorg-cf-files/Imake.tmpl b/xorg-cf-files/Imake.tmpl
index 9302a5a..7308e91 100644
--- a/xorg-cf-files/Imake.tmpl
+++ b/xorg-cf-files/Imake.tmpl
@@ -528,6 +528,8 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(RsArchitecture)
#define ByteOrder X_BIG_ENDIAN

50
debian/patches/riscv64-support.patch vendored
View File

@ -1,8 +1,20 @@
Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/Imake.cf
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Mon, 10 Apr 2023 10:15:39 +0800
Subject: riscv64-support
===================================================================
--- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/Imake.cf
+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/Imake.cf
@@ -1042,6 +1042,10 @@ XCOMM Keep cpp from replacing path eleme
---
xorg-cf-files/Imake.cf | 4 ++++
xorg-cf-files/linux.cf | 9 +++++++++
xorg-cf-files/xfree86.cf | 6 ++++++
xorg-cf-files/xorg.cf | 6 ++++++
4 files changed, 25 insertions(+)
diff --git a/xorg-cf-files/Imake.cf b/xorg-cf-files/Imake.cf
index 1215d4b..21781dd 100644
--- a/xorg-cf-files/Imake.cf
+++ b/xorg-cf-files/Imake.cf
@@ -1042,6 +1042,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# define AArch64Architecture
# undef __aarch64__
# endif
@ -13,11 +25,11 @@ Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/Imake.cf
#endif /* linux || __GLIBC__ */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/linux.cf
===================================================================
--- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/linux.cf
+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/linux.cf
@@ -1111,6 +1111,15 @@ InstallNamedTargetNoClobber(install,file
diff --git a/xorg-cf-files/linux.cf b/xorg-cf-files/linux.cf
index 0b3de25..fb5924d 100644
--- a/xorg-cf-files/linux.cf
+++ b/xorg-cf-files/linux.cf
@@ -1117,6 +1117,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AArch64Architecture */
@ -33,11 +45,11 @@ Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/linux.cf
#ifndef StandardDefines
# ifdef __linux__
# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xfree86.cf
===================================================================
--- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/xfree86.cf
+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xfree86.cf
@@ -2067,6 +2067,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane
diff --git a/xorg-cf-files/xfree86.cf b/xorg-cf-files/xfree86.cf
index 5edfec9..2133f91 100644
--- a/xorg-cf-files/xfree86.cf
+++ b/xorg-cf-files/xfree86.cf
@@ -2067,6 +2067,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
# endif
#endif
@ -50,11 +62,11 @@ Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xfree86.cf
#if HasGcc2 && defined(AlphaArchitecture)
# ifndef DefaultGcc2AxpOpt
# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
Index: xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xorg.cf
===================================================================
--- xutils-dev-7.7+5ubuntu1+riscv64.1.orig/xorg-cf-files/xorg.cf
+++ xutils-dev-7.7+5ubuntu1+riscv64.1/xorg-cf-files/xorg.cf
@@ -1584,6 +1584,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane
diff --git a/xorg-cf-files/xorg.cf b/xorg-cf-files/xorg.cf
index 3d711ee..3a3892f 100644
--- a/xorg-cf-files/xorg.cf
+++ b/xorg-cf-files/xorg.cf
@@ -1584,6 +1584,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
# endif
#endif