[packages/xfsprogs] fix linking with icu 76
atler
atler at pld-linux.org
Sat Jan 18 19:49:09 CET 2025
commit 3ff7ec6adfbfb2f04043019d81190e4d694763dd
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Jan 18 19:31:23 2025 +0100
fix linking with icu 76
icu76.spec | 9 +++++++++
xfsprogs.spec | 8 +++++---
2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/icu76.spec b/icu76.spec
new file mode 100644
index 0000000..0935227
--- /dev/null
+++ b/icu76.spec
@@ -0,0 +1,9 @@
+--- xfsprogs-6.12.0/m4/package_icu.m4.orig 2024-11-21 12:56:04.000000000 +0100
++++ xfsprogs-6.12.0/m4/package_icu.m4 2025-01-14 21:41:08.360037770 +0100
+@@ -1,5 +1,5 @@
+ AC_DEFUN([AC_HAVE_LIBICU],
+- [ PKG_CHECK_MODULES([libicu], [icu-i18n], [have_libicu=yes], [have_libicu=no])
++ [ PKG_CHECK_MODULES([libicu], [icu-i18n icu-uc], [have_libicu=yes], [have_libicu=no])
+ AC_SUBST(have_libicu)
+ AC_SUBST(libicu_CFLAGS)
+ AC_SUBST(libicu_LIBS)
diff --git a/xfsprogs.spec b/xfsprogs.spec
index fbe11d4..1097f44 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -18,6 +18,7 @@ Source1: xfs_lsprojid
Patch0: %{name}-miscfix-v2.patch
Patch1: %{name}-pl.po-update.patch
Patch2: man-page-name.patch
+Patch3: icu76.spec
URL: https://xfs.wiki.kernel.org/
# for <attr/attributes.h>
BuildRequires: attr-devel
@@ -122,8 +123,9 @@ Biblioteki statyczne do XFS.
%prep
%setup -q
-%patch0 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
# files order in pot changes in every version, making diff huge - sort entries first
%{__mv} po/xfsprogs.pot po/xfsprogs.pot.upstream
@@ -131,7 +133,7 @@ msgcat -F po/xfsprogs.pot.upstream -o po/xfsprogs.pot
# update line numbers etc.
%{__mv} po/pl.po po/pl.po.upstream
msgmerge po/pl.po.upstream po/xfsprogs.pot -o po/pl.po
-%patch1 -p1 -b .orig
+%patch -P 1 -p1 -b .orig
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scrub/xfs_scrub_all.in tools/xfsbuflock.py
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfsprogs.git/commitdiff/3ff7ec6adfbfb2f04043019d81190e4d694763dd
More information about the pld-cvs-commit
mailing list