Package upgrade to latest

0001-imake-1.0.2-for-abort.patch

@@ -0,0 +1,31 @@
+From b7f12f0a3b7bbfa782e68490036861eb774c9e38 Mon Sep 17 00:00:00 2001
+From: houlifei <houlifei@uniontech.com>
+Date: Fri, 21 Jul 2023 17:00:20 +0800
+Subject: [PATCH] imake-1.0.2-for-abort
+
+---
+ imake.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/imake.c b/imake.c
+index 4597f6c..103d7ca 100644
+--- a/imake.c
++++ b/imake.c
+@@ -1000,8 +1000,12 @@ get_libc_version(FILE *inFile)
+ 
+   len = pclose (fp);
+   remove (aout);
+-  if (len)
+-    abort ();
++  if (len) {
++      /* handwave furiously */
++      printf("#define DefaultLinuxCLibMajorVersion 6\n");
++      printf("#define DefaultLinuxCLibMinorVersion 12\n");
++      printf("#define DefaultLinuxCLibTeenyVersion 0\n");
++  }
+ }
+ #endif
+ 
+-- 
+2.33.0
+

0001-xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils.patch

@@ -0,0 +1,25 @@
+From 42e91e64378aad306614d1b9793933b83dcead6d Mon Sep 17 00:00:00 2001
+From: houlifei <houlifei@uniontech.com>
+Date: Fri, 21 Jul 2023 17:20:54 +0800
+Subject: [PATCH] xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils
+
+---
+ Imake.tmpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Imake.tmpl b/Imake.tmpl
+index 0f8832f..3467242 100644
+--- a/Imake.tmpl
++++ b/Imake.tmpl
+@@ -1078,7 +1078,7 @@ TCLIBDIR = TclLibDir
+ #define ArCmdBase ar
+ #endif
+ #ifndef ArCmd
+-#if HasLargeTmp || SystemV4 || HasGnuAr
++#if HasLargeTmp || SystemV4 || HasGnuAr || LinuxBinUtilsMajorVersion
+ #define ArCmd ArCmdBase cq
+ #else
+ #define ArCmd ArCmdBase clq
+-- 
+2.33.0
+

imake-1.0.2-abort.patch

@@ -1,18 +0,0 @@
-diff -up imake-1.0.2/imake.c.jx imake-1.0.2/imake.c
---- imake-1.0.2/imake.c.jx	2006-05-15 16:28:14.000000000 -0400
-+++ imake-1.0.2/imake.c	2010-10-25 17:14:37.000000000 -0400
-@@ -1030,8 +1030,12 @@ get_libc_version(FILE *inFile)
- 
-   len = pclose (fp);
-   remove (aout);
--  if (len)
--    abort ();
-+  if (len) {
-+      /* handwave furiously */
-+      printf("#define DefaultLinuxCLibMajorVersion 6\n");
-+      printf("#define DefaultLinuxCLibMinorVersion 12\n");
-+      printf("#define DefaultLinuxCLibTeenyVersion 0\n");
-+  }
- }
- #endif
- 

imake.spec

@@ -1,19 +1,19 @@
 Summary: imake source code configuration and build system
 Name: imake
-Version: 1.0.8
+Version: 1.0.9
 Release: 1
 License: MIT
 URL: http://www.x.org
 
-Source0: https://www.x.org/pub/individual/util/imake-1.0.8.tar.bz2
-Source1: https://www.x.org/pub/individual/util/makedepend-1.0.6.tar.bz2
+Source0: https://www.x.org/pub/individual/util/imake-1.0.9.tar.gz
+Source1: https://www.x.org/pub/individual/util/makedepend-1.0.8.tar.gz
 Source2: https://www.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
-Source3: https://www.x.org/pub/individual/util/xorg-cf-files-1.0.6.tar.bz2
-Source4: https://www.x.org/pub/individual/util/lndir-1.0.3.tar.bz2	
+Source3: https://www.x.org/pub/individual/util/xorg-cf-files-1.0.8.tar.gz
+Source4: https://www.x.org/pub/individual/util/lndir-1.0.4.tar.gz
 # Adapt ar invocation to binutils 2.36, bug #1943274, in upstream after 1.0.6,
 # <https://gitlab.freedesktop.org/xorg/util/cf/-/merge_requests/2>
-Patch1: xorg-cf-files-1.0.6-Imake.tmpl-Invoke-ar-cq-with-binutils.patch
-Patch2: imake-1.0.2-abort.patch
+Patch1: 0001-xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils.patch
+Patch2: 0001-imake-1.0.2-for-abort.patch
 
 BuildRequires: pkgconfig gcc gcc-c++ xorg-x11-util-macros xorg-x11-proto-devel
 
@@ -34,7 +34,7 @@ Brunhoff at Tektronix.
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 
-pushd xorg-cf-files-1.0.6
+pushd xorg-cf-files-1.0.8
 %patch1 -p1 -b .ar
 popd
 
@@ -77,6 +77,9 @@ popd
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jul 21 2023 houlifei <houlifei@uniontech.com> - 1.0.9-1
+- Upgrade to version 1.0.9
+
 * Tue Jun 21 2022 SimpleUpdate Robot <tc@openeuler.org> - 1.0.8-1
 - Upgrade to version 1.0.8
 

xorg-cf-files-1.0.6-Imake.tmpl-Invoke-ar-cq-with-binutils.patch

@@ -1,43 +0,0 @@
-From a6d4d6223ef75119d5373fa4cc04161bcdb4e769 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Mon, 29 Mar 2021 10:45:10 +0200
-Subject: [PATCH] Imake.tmpl: Invoke "ar cq" with binutils
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GNU binutils 2.36 repurposed "l" modifier. It used to be ignored, now
-it specifies the dependencies of a static library to be recorded in an
-archive.
-
-That broke nas which uses imake as a build configiration tool:
-
-$ ar clq libdia.a dispatch.o dixutils.o events.o globals.o main.o resource.o swapreq.o        tables.o swaprep.o        audispatch.o auswap.o autables.o auevents.o auutil.o auconfig.o        auprocess.o  nasconf.o lex.o gram.o
-ar: libdeps specified more than once
-
-This patch changes AR command from "ar clq" to "ar cq" if binutils are
-used.
-
-<https://bugzilla.redhat.com/show_bug.cgi?id=1943274>
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- Imake.tmpl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Imake.tmpl b/Imake.tmpl
-index 9d02cb6..3f89ebf 100644
---- a/Imake.tmpl
-+++ b/Imake.tmpl
-@@ -1078,7 +1078,7 @@ TCLIBDIR = TclLibDir
- #define ArCmdBase ar
- #endif
- #ifndef ArCmd
--#if HasLargeTmp || SystemV4
-+#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
- #define ArCmd ArCmdBase cq
- #else
- #define ArCmd ArCmdBase clq
--- 
-2.26.3
-