CVS commit: pkgsrc/www/firefox52

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug  3 09:28:42 UTC 2024

Modified Files:
        pkgsrc/www/firefox52: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox52/patches: patch-as
Added Files:
        pkgsrc/www/firefox52/patches: patch-intl_icu_source_configure
Removed Files:
        pkgsrc/www/firefox52/patches:
            patch-intl_lwbrk_nsJISx4051LineBreaker.cpp

Log Message:
firefox52: use vendored icu library

It has its own preferred version and it doesn't make much sense to
continue to chase incompatibilities and ABI breakage the latest point
release is introducing.

Should help the build.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox52/patches/patch-as
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox52/patches/patch-intl_icu_source_configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox52/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp

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

Modified files:

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.99 pkgsrc/www/firefox52/Makefile:1.100
--- pkgsrc/www/firefox52/Makefile:1.99  Wed May 29 16:34:49 2024
+++ pkgsrc/www/firefox52/Makefile       Sat Aug  3 09:28:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2024/05/29 16:34:49 adam Exp $
+# $NetBSD: Makefile,v 1.100 2024/08/03 09:28:41 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   68
+PKGREVISION=   69
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.35 pkgsrc/www/firefox52/distinfo:1.36
--- pkgsrc/www/firefox52/distinfo:1.35  Fri Aug  2 08:55:33 2024
+++ pkgsrc/www/firefox52/distinfo       Sat Aug  3 09:28:41 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.35 2024/08/02 08:55:33 martin Exp $
+$NetBSD: distinfo,v 1.36 2024/08/03 09:28:41 nia Exp $
 
 BLAKE2s (firefox-52.9.0esr.source.tar.xz) = 68da851ecfe1b03231157bf79732865d3cf81b7c10128a2e2a9e6e7be3963348
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
 Size (firefox-52.9.0esr.source.tar.xz) = 214087304 bytes
 SHA1 (patch-aa) = 31ba818e5f507c0ebdddd178b4801ab81e1bbbe5
 SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5
-SHA1 (patch-as) = b596132c7b6902c4f7ddb901e28e1437b99bb428
+SHA1 (patch-as) = 03cc0f37718188613285093fc80116ac7c2ea38a
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
 SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e
 SHA1 (patch-build_moz.configure_keyfiles.configure) = dd46c7c29464f374eed3f0762f4653d42032c261
@@ -53,7 +53,7 @@ SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) =
 SHA1 (patch-image_Downscaler.h) = c92aa17c22310d0b16cdc4bb778d3029c4b154e3
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f
 SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655
-SHA1 (patch-intl_lwbrk_nsJISx4051LineBreaker.cpp) = f5a94cf64b2d2cfda70ca5c856750c4f0b87c0a6
+SHA1 (patch-intl_icu_source_configure) = 20d4d68285c1a40b38442dba62af01188db3f6dc
 SHA1 (patch-intl_unicharutil_util_moz.build) = 2e604c8695b490657ee14cae01ca84d7bd51236c
 SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a
 SHA1 (patch-ipc_chromium_src_base_atomicops__internals__arm__gcc.h) = cceefce420cfcfc67f74375e3fe5d17a75a562e4

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.17 pkgsrc/www/firefox52/mozilla-common.mk:1.18
--- pkgsrc/www/firefox52/mozilla-common.mk:1.17 Mon Oct 23 06:37:56 2023
+++ pkgsrc/www/firefox52/mozilla-common.mk      Sat Aug  3 09:28:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.17 2023/10/23 06:37:56 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.18 2024/08/03 09:28:41 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -39,7 +39,6 @@ CXXFLAGS+=            -mstackrealign
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}intl/icu/source/configure
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
 CHECK_PORTABILITY_SKIP+=       ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
@@ -53,7 +52,6 @@ CONFIGURE_ARGS+=      --enable-system-pixman
 CONFIGURE_ARGS+=       --with-system-libvpx
 CONFIGURE_ARGS+=       --enable-system-hunspell
 CONFIGURE_ARGS+=       --enable-system-ffi
-CONFIGURE_ARGS+=       --with-system-icu
 CONFIGURE_ARGS+=       --with-system-nss
 CONFIGURE_ARGS+=       --with-system-nspr
 CONFIGURE_ARGS+=       --with-system-jpeg
@@ -143,7 +141,6 @@ BUILDLINK_API_DEPENDS.libevent+=    libeven
 .include "../../devel/libffi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.12
 .include "../../devel/nspr/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/www/firefox52/patches/patch-as
diff -u pkgsrc/www/firefox52/patches/patch-as:1.2 pkgsrc/www/firefox52/patches/patch-as:1.3
--- pkgsrc/www/firefox52/patches/patch-as:1.2   Mon Jul 30 12:23:11 2018
+++ pkgsrc/www/firefox52/patches/patch-as       Sat Aug  3 09:28:42 2024
@@ -1,7 +1,6 @@
-$NetBSD: patch-as,v 1.2 2018/07/30 12:23:11 jmcneill Exp $
+$NetBSD: patch-as,v 1.3 2024/08/03 09:28:42 nia Exp $
 
 * Treat DragonFly like FreeBSD.
-* Add system ICU support
 * Enable ARM64 JIT
 
 --- js/src/old-configure.in.orig       2017-04-11 02:13:16.000000000 +0000

Added files:

Index: pkgsrc/www/firefox52/patches/patch-intl_icu_source_configure
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-intl_icu_source_configure:1.1
--- /dev/null   Sat Aug  3 09:28:42 2024
+++ pkgsrc/www/firefox52/patches/patch-intl_icu_source_configure        Sat Aug  3 09:28:42 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-intl_icu_source_configure,v 1.1 2024/08/03 09:28:42 nia Exp $
+
+Shell portability. This is fixed upstream in later versions.
+
+--- intl/icu/source/configure.orig     2024-08-03 09:22:25.037362805 +0000
++++ intl/icu/source/configure
+@@ -7778,13 +7778,13 @@ fi
+ # Now that we're done using CPPFLAGS etc. for tests, we can change it
+ # for build.
+ 
+-if test "${CC}" == "clang"; then
++if test "${CC}" = "clang"; then
+    CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
+ else
+    CLANGCFLAGS=""
+ fi
+ 
+-if test "${CXX}" == "clang++"; then
++if test "${CXX}" = "clang++"; then
+    CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
+ else
+    CLANGCXXFLAGS=""