diff --git a/srcpkgs/icu-libs b/srcpkgs/icu-libs deleted file mode 120000 index d82cfe3c4998ab..00000000000000 --- a/srcpkgs/icu-libs +++ /dev/null @@ -1 +0,0 @@ -libicu73 \ No newline at end of file diff --git a/srcpkgs/libicu73-devel b/srcpkgs/libicu73-devel deleted file mode 120000 index d82cfe3c4998ab..00000000000000 --- a/srcpkgs/libicu73-devel +++ /dev/null @@ -1 +0,0 @@ -libicu73 \ No newline at end of file diff --git a/srcpkgs/libicu73/patches/standardize-vtzone-output.patch b/srcpkgs/libicu73/patches/standardize-vtzone-output.patch deleted file mode 100644 index 7274f539991a74..00000000000000 --- a/srcpkgs/libicu73/patches/standardize-vtzone-output.patch +++ /dev/null @@ -1,33 +0,0 @@ -Patch-Source: https://github.com/chimera-linux/cports/blob/c48ec38c2d88f6e5962299583a8f862159c89349/main/icu/patches/standardize-vtzone-output.patch -https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 -https://unicode-org.atlassian.net/browse/ICU-22132 -needed for thunderbird --- -diff --git a/intl/icu/source/i18n/vtzone.cpp b/intl/icu/source/i18n/vtzone.cpp ---- a/source/i18n/vtzone.cpp -+++ b/source/i18n/vtzone.cpp -@@ -1735,14 +1735,17 @@ VTimeZone::write(VTZWriter& writer, UErr - } - } - } else { -- UnicodeString icutzprop; -- UVector customProps(nullptr, uhash_compareUnicodeString, status); -+ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status); - if (olsonzid.length() > 0 && icutzver.length() > 0) { -- icutzprop.append(olsonzid); -- icutzprop.append(u'['); -- icutzprop.append(icutzver); -- icutzprop.append(u']'); -- customProps.addElement(&icutzprop, status); -+ LocalPointer icutzprop(new UnicodeString(ICU_TZINFO_PROP), status); -+ if (U_FAILURE(status)) { -+ return; -+ } -+ icutzprop->append(olsonzid); -+ icutzprop->append(u'['); -+ icutzprop->append(icutzver); -+ icutzprop->append(u']'); -+ customProps.adoptElement(icutzprop.orphan(), status); - } - writeZone(writer, *tz, &customProps, status); - } diff --git a/srcpkgs/libicu73/template b/srcpkgs/libicu73/template deleted file mode 100644 index 9efdfb8e9dbce6..00000000000000 --- a/srcpkgs/libicu73/template +++ /dev/null @@ -1,124 +0,0 @@ -# Template file for 'libicu73' -pkgname=libicu73 -version=73.2 -revision=6 -build_wrksrc=source -build_style=gnu-configure -# use archive data instead of .so data for correct cross-compiling -configure_args="--with-data-packaging=archive --enable-static" -hostmakedepends="pkg-config" -checkdepends="diffutils python3" -short_desc="Robust and fully-featured Unicode libraries" -maintainer="Orphaned " -license="ICU" -homepage="https://home.unicode.org/" -distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz" -checksum=818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 -# replaces="icu-libs>=0" -provides="icu-libs-${version}_${revision}" - -CFLAGS="-fPIC -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" -CXXFLAGS="-fPIC -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64" - -# we will be managing icudata manually, because when cross-compiling for -# another endianness the output data is broken... fortunately, we can use -# icupkg to convert host-endianness data to target-endianness data -_icu_dat="icudt${version%.*}" -_icu_data="source/data/in" - -if [ $XBPS_TARGET_LIBC = musl ]; then - configure_args+=" ac_cv_func_strtod_l=no" -fi - -pre_configure() { - if [ "$CROSS_BUILD" ]; then - # Configure and build for host. - mkdir host-build - ( - cd host-build - env CC=cc LD=ld CXX=g++ AR=ar RANLIB=ranlib \ - AS=as STRIP=strip CFLAGS="-Os -fPIE" CXXFLAGS="-Os -fPIE" \ - LDFLAGS="" ../configure --prefix=/ - make ${makejobs} - mkdir -p ${wrksrc}/host-icu/config - cp config/icucross.* ${wrksrc}/host-icu/config - make DESTDIR=${wrksrc}/host-icu install - mv ${wrksrc}/host-icu/sbin/* ${wrksrc}/host-icu/bin - make distclean - ) - configure_args+=" --with-cross-build=${wrksrc}/host-icu" - fi - - # libicudata must be linked to libc, otherwise it's soft-float on ARM. - # probably other stuff breaks too, so let's just do it. - # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457 - sed -e 's,-nostdlib,,g' -i ${wrksrc}/source/config/mh-linux - - export CFLAGS="${CFLAGS} -DICU_DATA_DIR=\\\"/usr/share/icu/${version}\\\"" - export CXXFLAGS="${CFLAGS} -DICU_DATA_DIR=\\\"/usr/share/icu/${version}\\\"" - - # makefile dependency bug: this directory needs to be created manually - mkdir -p ${wrksrc}/source/data/out/tmp -} - -_rm_tools() { - # Remove files of icu-tools - for _file in ${DESTDIR}/usr/bin/* \ - ${DESTDIR}/usr/share/man/man1/*; do - case "${_file}" in - *icu-config*) ;; - *) rm -f ${_file} ;; - esac - done - rm -rf ${DESTDIR}/usr/share/man/man8 -} - -post_install() { - vlicense $wrksrc/LICENSE - _rm_tools - - # for little endian just use the file that's there - if [ "$XBPS_TARGET_ENDIAN" != "be" ]; then - return - fi - - rm -f ${DESTDIR}/usr/share/icu/${version}/${_icu_dat}l.dat - # for big endian, we need to convert the file that's there with icupkg - local _icupkg_path="${DESTDIR}/usr" - if [ "$CROSS_BUILD" ]; then - _icupkg_path="${wrksrc}/host-icu" - fi - - rm -f ${wrksrc}/${_icu_data}/${_icu_dat}b.dat - - LD_LIBRARY_PATH="${_icupkg_path}/lib" ${_icupkg_path}/bin/icupkg -tb \ - ${wrksrc}/${_icu_data}/${_icu_dat}l.dat \ - ${wrksrc}/${_icu_data}/${_icu_dat}b.dat - vinstall ${wrksrc}/${_icu_data}/${_icu_dat}b.dat \ - 0644 usr/share/icu/${version}/ -} - -libicu73-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - replaces="libicu-devel>=0" - provides="libicu-devel-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/icu - vmove "usr/lib/*.a" - vmove usr/lib/pkgconfig - vmove usr/share/icu/${version}/config - vmove "usr/share/icu/${version}/*install*" - vmove usr/bin/icu-config - vmove "usr/share/man/man1/icu-config*" - vmove "usr/lib/*.so" - } -} - -icu-libs_package() { - short_desc+=" - transitional package" - lib32mode=full - depends="${sourcepkg}>=${version}_${revision}" - metapackage=yes -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 626fd3b4b58e12..071a2891ebcb55 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -339,6 +339,7 @@ replaces=" icecat-i18n-zh-CN<=78.6.1_1 icecat-i18n-zh-TW<=78.6.1_1 icecat<=78.6.1_1 + icu-libs<=73.2_6 icu4lua-devel<=0.2B_14 icu4lua<=0.2B_14 ilmbase-devel<=2.4.2_2 @@ -464,6 +465,7 @@ replaces=" libgnome-keyring<=3.12.0_5 libgroff<=1.22.4_3 libgtkhtml<=4.10.0_1 + libicu73<=73.2_6 libkcddb<=24.08.0_1 libksane-devel<=24.08.3_1 libksane<=24.08.3_1