CVS commit: pkgsrc/textproc/icu

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov  1 12:45:27 UTC 2024

Modified Files:
        pkgsrc/textproc/icu: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/textproc/icu/patches: patch-configure patch-configure.ac
Added Files:
        pkgsrc/textproc/icu/patches: patch-Makefile.in

Log Message:
icu: downgrade to 75.1

The world is not ready for 76.1 yet:
- c++17 requirement (I think)
- more libraries need to be explicitly listed


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/textproc/icu/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/textproc/icu/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/textproc/icu/buildlink3.mk
cvs rdiff -u -r1.106 -r1.107 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/textproc/icu/patches/patch-Makefile.in
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/icu/patches/patch-configure
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/icu/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/icu/Makefile
diff -u pkgsrc/textproc/icu/Makefile:1.156 pkgsrc/textproc/icu/Makefile:1.157
--- pkgsrc/textproc/icu/Makefile:1.156  Fri Nov  1 00:47:09 2024
+++ pkgsrc/textproc/icu/Makefile        Fri Nov  1 12:45:26 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.156 2024/11/01 00:47:09 wiz Exp $
+# $NetBSD: Makefile,v 1.157 2024/11/01 12:45:26 wiz Exp $
 
-DISTNAME=      icu4c-76_1-src
+DISTNAME=      icu4c-75_1-src
 PKGNAME=       ${DISTNAME:S/4c//:S/-src//:S/_/./g}
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=unicode-org/}
 GITHUB_PROJECT=        icu
-GITHUB_RELEASE=        release-76-1
+GITHUB_RELEASE=        release-75-1
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/textproc/icu/PLIST
diff -u pkgsrc/textproc/icu/PLIST:1.58 pkgsrc/textproc/icu/PLIST:1.59
--- pkgsrc/textproc/icu/PLIST:1.58      Fri Nov  1 00:47:09 2024
+++ pkgsrc/textproc/icu/PLIST   Fri Nov  1 12:45:26 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.58 2024/11/01 00:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.59 2024/11/01 12:45:26 wiz Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
@@ -222,27 +222,27 @@ lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
 lib/libicudata.so.${PKGVERSION}
-lib/libicudata.so.76
+lib/libicudata.so.75
 lib/libicui18n.a
 lib/libicui18n.so
 lib/libicui18n.so.${PKGVERSION}
-lib/libicui18n.so.76
+lib/libicui18n.so.75
 lib/libicuio.a
 lib/libicuio.so
 lib/libicuio.so.${PKGVERSION}
-lib/libicuio.so.76
+lib/libicuio.so.75
 lib/libicutest.a
 lib/libicutest.so
 lib/libicutest.so.${PKGVERSION}
-lib/libicutest.so.76
+lib/libicutest.so.75
 lib/libicutu.a
 lib/libicutu.so
 lib/libicutu.so.${PKGVERSION}
-lib/libicutu.so.76
+lib/libicutu.so.75
 lib/libicuuc.a
 lib/libicuuc.so
 lib/libicuuc.so.${PKGVERSION}
-lib/libicuuc.so.76
+lib/libicuuc.so.75
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
 lib/pkgconfig/icu-uc.pc
@@ -267,7 +267,6 @@ sbin/gencmn
 sbin/gennorm2
 sbin/gensprep
 sbin/icupkg
-share/icu/${PKGVERSION}/LICENSE
 share/icu/${PKGVERSION}/config/${MH_NAME}
 share/icu/${PKGVERSION}/install-sh
 share/icu/${PKGVERSION}/mkinstalldirs

Index: pkgsrc/textproc/icu/buildlink3.mk
diff -u pkgsrc/textproc/icu/buildlink3.mk:1.54 pkgsrc/textproc/icu/buildlink3.mk:1.55
--- pkgsrc/textproc/icu/buildlink3.mk:1.54      Fri Nov  1 00:50:35 2024
+++ pkgsrc/textproc/icu/buildlink3.mk   Fri Nov  1 12:45:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.54 2024/11/01 00:50:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2024/11/01 12:45:26 wiz Exp $
 
 BUILDLINK_TREE+=       icu
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        icu
 ICU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.icu+=    icu>=3.4
-BUILDLINK_ABI_DEPENDS.icu+=    icu>=76.1
+BUILDLINK_ABI_DEPENDS.icu+=    icu>=75.1
 BUILDLINK_PKGSRCDIR.icu?=      ../../textproc/icu
 
 GCC_REQD+=             4.9

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.106 pkgsrc/textproc/icu/distinfo:1.107
--- pkgsrc/textproc/icu/distinfo:1.106  Fri Nov  1 00:47:09 2024
+++ pkgsrc/textproc/icu/distinfo        Fri Nov  1 12:45:26 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.106 2024/11/01 00:47:09 wiz Exp $
+$NetBSD: distinfo,v 1.107 2024/11/01 12:45:26 wiz Exp $
 
-BLAKE2s (icu4c-76_1-src.tgz) = 9dac34f4c7b3efaab4dfb97e15ac583b3ce4a55dfe434d14805f70cf73073ac2
-SHA512 (icu4c-76_1-src.tgz) = b702ab62fb37a1574d5f4a768326d0f8fa30d9db5b015605b5f8215b5d8547f83d84880c586d3dcc7b6c76f8d47ef34e04b0f51baa55908f737024dd79a42a6c
-Size (icu4c-76_1-src.tgz) = 27437767 bytes
+BLAKE2s (icu4c-75_1-src.tgz) = b0ce386eb6da5695553f3d657114d73781b659870dc9e9a0fab34d0ac7218bdf
+SHA512 (icu4c-75_1-src.tgz) = 70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45
+Size (icu4c-75_1-src.tgz) = 26568378 bytes
+SHA1 (patch-Makefile.in) = be52aa478e96e5f32ff95924d6a58860806585a8
 SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09
 SHA1 (patch-common_putil.cpp) = cc867aaef753c23ff12db019e41836c0dd5ac6d1
 SHA1 (patch-common_putilimp.h) = 0924d38a780b626fea78754aa2da6cf3ca19b9b7
@@ -15,8 +16,8 @@ SHA1 (patch-config_Makefile.inc.in) = e7
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-darwin) = 4fd2c664b23078692b61557ebb66693712d333cd
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
-SHA1 (patch-configure) = f2fc0cfee448d230e416e1b48bcc248648817d47
-SHA1 (patch-configure.ac) = 99874d8ca44f915b04c0afe6ca1c49ab989ce444
+SHA1 (patch-configure) = 0043c23cffaab9851b6121e9f46eb474175dbc26
+SHA1 (patch-configure.ac) = 2cb4601e20ee6b93e08e8790df3f8212510aeb1b
 SHA1 (patch-i18n_double-conversion-utils.h) = 9bee115bb9ddc597607e30f95050de7b21751fca
 SHA1 (patch-icudefs.mk.in) = 15be482cf7541c9b518b8bfb05865ac994313cb7
 SHA1 (patch-runConfigureICU) = 3cd60613104fa4f1b81529795e75d5cf7f477b64

Index: pkgsrc/textproc/icu/patches/patch-configure
diff -u pkgsrc/textproc/icu/patches/patch-configure:1.12 pkgsrc/textproc/icu/patches/patch-configure:1.13
--- pkgsrc/textproc/icu/patches/patch-configure:1.12    Fri Nov  1 00:47:09 2024
+++ pkgsrc/textproc/icu/patches/patch-configure Fri Nov  1 12:45:27 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.12 2024/11/01 00:47:09 wiz Exp $
+$NetBSD: patch-configure,v 1.13 2024/11/01 12:45:27 wiz Exp $
 
 Portability fix.
 Solaris seems to need -std=c99 with recent pkgsrc so keep it.
 Add support for Bitrig.
 
---- configure.orig     2024-10-24 18:24:00.000000000 +0000
+--- configure.orig     2022-04-07 22:41:55.000000000 +0000
 +++ configure
-@@ -5858,7 +5858,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -5314,7 +5314,7 @@ rm -f core conftest.err conftest.$ac_obj
                *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
                esac
        fi ;;
@@ -15,7 +15,7 @@ Add support for Bitrig.
  *-*-aix*)
        if test "$GCC" = yes; then
                icu_cv_host_frag=mh-aix-gcc
-@@ -5884,6 +5884,7 @@ powerpc*-apple-darwin*)  icu_cv_host_frag
+@@ -5339,6 +5339,7 @@ rm -f core conftest.err conftest.$ac_obj
  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
  *-*-nto*)     icu_cv_host_frag=mh-qnx ;;
  *-ncr-*)      icu_cv_host_frag=mh-mpras ;;
@@ -23,7 +23,7 @@ Add support for Bitrig.
  *)            icu_cv_host_frag=mh-unknown ;;
  esac
  
-@@ -6511,6 +6512,29 @@ if test "x$plugins" = "xtrue"; then
+@@ -5947,6 +5948,29 @@ if test "x$plugins" = "xtrue"; then
  fi
  
  
@@ -52,8 +52,8 @@ Add support for Bitrig.
 +
  U_ENABLE_DYLOAD=1
  enable=yes
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5
-@@ -8415,7 +8439,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5
+@@ -7941,7 +7965,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
  case "${host}" in
        *-*-solaris*)   platform=U_SOLARIS ;;
        *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;

Index: pkgsrc/textproc/icu/patches/patch-configure.ac
diff -u pkgsrc/textproc/icu/patches/patch-configure.ac:1.7 pkgsrc/textproc/icu/patches/patch-configure.ac:1.8
--- pkgsrc/textproc/icu/patches/patch-configure.ac:1.7  Fri Nov  1 00:47:09 2024
+++ pkgsrc/textproc/icu/patches/patch-configure.ac      Fri Nov  1 12:45:27 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure.ac,v 1.7 2024/11/01 00:47:09 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.8 2024/11/01 12:45:27 wiz Exp $
 
 * Detect NetBSD libatomic
 * test(1) portability fix
 * Add support for Bitrig
 
---- configure.ac.orig  2024-10-24 18:24:00.000000000 +0000
+--- configure.ac.orig  2019-03-27 18:47:14.000000000 +0000
 +++ configure.ac
-@@ -426,6 +426,18 @@ if test "x$plugins" = "xtrue"; then
+@@ -449,6 +449,18 @@ if test "x$plugins" = "xtrue"; then
  fi
  
  
@@ -25,7 +25,7 @@ $NetBSD: patch-configure.ac,v 1.7 2024/1
  U_ENABLE_DYLOAD=1
  enable=yes
  AC_MSG_CHECKING([whether to enable dynamic loading of plugins. Ignored if plugins disabled.])
-@@ -1174,7 +1186,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
+@@ -1260,7 +1272,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
  case "${host}" in
        *-*-solaris*)   platform=U_SOLARIS ;;
        *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
@@ -34,8 +34,8 @@ $NetBSD: patch-configure.ac,v 1.7 2024/1
        *-*-aix*)       platform=U_AIX ;;
        *-*-hpux*)      platform=U_HPUX ;;
        *-apple-darwin*|*-apple-rhapsody*)      platform=U_DARWIN ;;
-@@ -1194,6 +1206,7 @@ case "${host}" in
-       *-*-haiku)      platform=U_HAIKU ;;
+@@ -1279,6 +1291,7 @@ case "${host}" in
+       *-*-beos)               platform=U_BEOS ;;
        *-*-irix*)              platform=U_IRIX ;;
        *-ncr-*)                platform=U_MPRAS ;;
 +      *-*-sco3.2v5*)          platform=USCOOSR5 ;;

Added files:

Index: pkgsrc/textproc/icu/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/textproc/icu/patches/patch-Makefile.in:1.4
--- /dev/null   Fri Nov  1 12:45:27 2024
+++ pkgsrc/textproc/icu/patches/patch-Makefile.in       Fri Nov  1 12:45:27 2024
@@ -0,0 +1,43 @@
+$NetBSD: patch-Makefile.in,v 1.4 2024/11/01 12:45:27 wiz Exp $
+
+In 74.2, LICENSE is a symlink to non-existing file, so it can't be installed.
+Add linker flags for finding the libraries to pkg-config files.
+Avoid using programs which need elevated privileges during the build.
+
+--- Makefile.in.orig   2023-12-11 22:27:41.000000000 +0000
++++ Makefile.in
+@@ -190,7 +190,6 @@ install-icu: $(INSTALLED_BUILT_FILES)
+       $(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
+       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
+       $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
+-      $(INSTALL_DATA) $(top_srcdir)/../LICENSE $(DESTDIR)$(pkgdatadir)/LICENSE
+ ifeq ($(INSTALL_ICU_CONFIG),true)
+       $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
+ endif
+@@ -284,7 +283,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
+       @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
+       @echo "Name: $(PACKAGE)-i18n" >> $@
+       @echo "Requires: icu-uc" >> $@
+-      @echo "Libs:" "${ICULIBS_I18N}" >> $@
++      @echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@
+       @echo $@ updated.
+ 
+ config/icu-io.pc: config/icu.pc Makefile icudefs.mk
+@@ -292,7 +291,7 @@ config/icu-io.pc: config/icu.pc Makefile
+       @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@
+       @echo "Name: $(PACKAGE)-io" >> $@
+       @echo "Requires: icu-i18n" >> $@
+-      @echo "Libs:" "${ICULIBS_IO}" >> $@
++      @echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@
+       @echo $@ updated.
+ 
+ ICULEHB_LIBS=@ICULEHB_LIBS@
+@@ -311,7 +310,7 @@ ifneq ($(ICULEHB_LIBS),)
+ else
+       @echo "Requires: icu-le" >> $@
+ endif
+-      @echo "Libs:" "${ICULIBS_LX}" >> $@
++      @echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@
+       @echo $@ updated.
+ 
+