From 4b81626282c8afdc2a96f6535d19b65a8b1ee222 Mon Sep 17 00:00:00 2001 From: wzx Date: Thu, 20 Oct 2022 10:27:03 +0800 Subject: [PATCH] Add sw64 architecture Signed-off-by: wzx --- fontconfig-2.13.94-sw.patch | 24 ++++++++++++++++++++++++ fontconfig.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 fontconfig-2.13.94-sw.patch diff --git a/fontconfig-2.13.94-sw.patch b/fontconfig-2.13.94-sw.patch new file mode 100755 index 0000000..25320ea --- /dev/null +++ b/fontconfig-2.13.94-sw.patch @@ -0,0 +1,24 @@ +diff -Naur fontconfig-2.13.94.org/configure fontconfig-2.13.94.sw/configure +--- fontconfig-2.13.94.org/configure 2022-02-25 06:55:07.530000000 +0000 ++++ fontconfig-2.13.94.sw/configure 2022-02-25 06:57:04.540000000 +0000 +@@ -21822,7 +21822,7 @@ + typedef unsigned long long uint64_t; + #endif + +-#elif defined __alpha || (defined __mips && defined _ABIN32) ++#elif defined __alpha || defined __sw_64 || (defined __mips && defined _ABIN32) + #if !defined _NO_LONGLONG + typedef long int64_t; + typedef unsigned long uint64_t; +diff -Naur fontconfig-2.13.94.org/m4/ax_create_stdint_h.m4 fontconfig-2.13.94.sw/m4/ax_create_stdint_h.m4 +--- fontconfig-2.13.94.org/m4/ax_create_stdint_h.m4 2022-02-25 06:55:07.380000000 +0000 ++++ fontconfig-2.13.94.sw/m4/ax_create_stdint_h.m4 2022-02-25 06:57:34.340000000 +0000 +@@ -412,7 +412,7 @@ + typedef unsigned long long uint64_t; + #endif + +-#elif defined __alpha || (defined __mips && defined _ABIN32) ++#elif defined __alpha || defined __sw_64 || (defined __mips && defined _ABIN32) + #if !defined _NO_LONGLONG + typedef long int64_t; + typedef unsigned long uint64_t; diff --git a/fontconfig.spec b/fontconfig.spec index 8076b92..b76c3e2 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -2,7 +2,7 @@ Name: fontconfig Version: 2.13.94 -Release: 2 +Release: 3 Summary: Fontconfig is a library for configuring and customizing font access License: MIT and Public Domain and UCD URL: http://fontconfig.org @@ -11,6 +11,7 @@ Source1: fc-cache Source2: FcConfigGetFilename.3 Patch6000: backport-fontconfig-disable-network-required-test.patch +Patch6001: fontconfig-2.13.94-sw.patch BuildRequires: libxml2-devel freetype-devel >= %{freetype_version} fontpackages-devel libuuid-devel BuildRequires: autoconf automake libtool gettext itstool gperf @@ -43,6 +44,9 @@ applications that uses fontconfig. %prep %autosetup -n %{name}-%{version} -p1 +%ifnarch sw_64 +%patch6001 -R -p1 +%endif cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{version}/doc %build @@ -120,6 +124,9 @@ HOME=/root /usr/bin/fc-cache -s %{_mandir}/man3/* %changelog +* Thu Oct 20 2022 wuzx - 2.13.94-3 +- add sw64 patch + * Mon Jun 13 2022 wuchaochao - 2.13.94-2 - fix changelog