From 13aa8f7da46d6ff227fd6e527d1c71efd74fa82e Mon Sep 17 00:00:00 2001 From: zhangpan Date: Thu, 15 Aug 2024 11:12:15 +0000 Subject: [PATCH] backport patch from upstream --- guile-2.0.14-gc_pkgconfig_private.patch | 15 ++++++++++++++ guile.spec | 27 +++++++++++++++---------- 2 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 guile-2.0.14-gc_pkgconfig_private.patch diff --git a/guile-2.0.14-gc_pkgconfig_private.patch b/guile-2.0.14-gc_pkgconfig_private.patch new file mode 100644 index 0000000..d8ee031 --- /dev/null +++ b/guile-2.0.14-gc_pkgconfig_private.patch @@ -0,0 +1,15 @@ +diff -up guile-2.2.7/meta/guile-2.2.pc.in.pkgconfig_private guile-2.2.7/meta/guile-2.2.pc.in +--- guile-2.2.7/meta/guile-2.2.pc.in.pkgconfig_private 2016-12-14 18:03:33.000000000 -0600 ++++ guile-2.0.7/meta/guile-2.2.pc.in 2018-02-20 11:53:56.344379283 -0600 +@@ -21,9 +21,9 @@ guile=${bindir}/@guile@ + Name: GNU Guile + Description: GNU's Ubiquitous Intelligent Language for Extension + Version: @GUILE_VERSION@ +-Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@ ++Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ + Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \ + @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \ + @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \ +- @INET_PTON_LIB@ ++ @INET_PTON_LIB@ @BDW_GC_LIBS@ + Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@ diff --git a/guile.spec b/guile.spec index fb2c4f9..c1baf93 100644 --- a/guile.spec +++ b/guile.spec @@ -1,6 +1,6 @@ Name: guile Version: 2.2.7 -Release: 4 +Release: 5 Epoch: 5 Summary: GNU's Ubiquitous Intelligent Language for Extension License: LGPLv3+ @@ -18,6 +18,8 @@ Patch3: guile-threadstest.patch Patch4: disable-out-of-memory-test.patch #https://src.fedoraproject.org/rpms/guile22/blob/f38/f/guile-configure.patch Patch5: guile-configure.patch +#https://src.fedoraproject.org/rpms/guile/blob/rawhide/f/guile-2.0.14-gc_pkgconfig_private.patch +Patch6000: guile-2.0.14-gc_pkgconfig_private.patch BuildRequires: gcc libtool gmp-devel readline-devel gc-devel libffi-devel BuildRequires: gettext-devel libunistring-devel libtool-ltdl-devel @@ -112,35 +114,38 @@ fi %{_mandir}/man1/guile.1.gz %changelog -* Wed Jan 03 2024 konglidong - 2.2.7-4 +* Thu Aug 15 2024 zhangpan - 5:2.2.7-5 +- backport patch from upstream + +* Wed Jan 03 2024 konglidong - 5:2.2.7-4 - fix bad macro expansion in changelog -* Sat Apr 8 2023 Z572 <873216071@qq.com> - 2.2.7-3 +* Sat Apr 8 2023 Z572 <873216071@qq.com> - 5:2.2.7-3 - fix guile-tools alias 'guile2-tools' -> 'guile-tools2' -* Mon Feb 20 2023 zhouwenpei - 2.2.7-2 +* Mon Feb 20 2023 zhouwenpei - 5:2.2.7-2 - delete old so files -* Mon Feb 13 2023 zhouwenpei - 2.2.7-1 +* Mon Feb 13 2023 zhouwenpei - 5:2.2.7-1 - upgrade to 2.2.7 -* Mon Apr 25 2022 yangcheng - 2.0.14-18 +* Mon Apr 25 2022 yangcheng - 5:2.0.14-18 - Remove multithreaded builds to resolve binary bep differences -* Fri Jul 30 2021 chenyanpanHW - 2.0.14-17 +* Fri Jul 30 2021 chenyanpanHW - 5:2.0.14-17 - DESC: delete -S git from autosetup, and delete BuildRequires git -* Wed Jul 21 2021 yushaogui - 2.0.14-16 +* Wed Jul 21 2021 yushaogui - 5:2.0.14-16 - delete gdb in buildrequires -* Fri Mar 20 2020 songnannan - 2.0.14-15 +* Fri Mar 20 2020 songnannan - 5:2.0.14-15 - add gdb in buildrequires -* Sat Sep 28 2019 openEuler Buildteam - 2.0.14-14 +* Sat Sep 28 2019 openEuler Buildteam - 5:2.0.14-14 - Type:bugfix - Id:NA - SUG:NA - DESC:remove the libguile-2.0.so.22.8.1-gdb.scm from package -* Tue Sep 18 2019 openEuler Buildteam - 2.0.14-13 +* Tue Sep 18 2019 openEuler Buildteam - 5:2.0.14-13 - Package init -- Gitee