CVS commit: pkgsrc/www/firefox52

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Dec 18 09:31:45 UTC 2023

Modified Files:
        pkgsrc/www/firefox52: Makefile distinfo
        pkgsrc/www/firefox52/patches: patch-gfx_thebes_gfxFont.cpp
Added Files:
        pkgsrc/www/firefox52/patches:
            patch-intl_lwbrk_nsJISx4051LineBreaker.cpp

Log Message:
Fix build with icu >= 74.1

Bump PKGREVISION. No ACK from MAINTAINER but wanting to get package
building before the branch


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp
cvs rdiff -u -r0 -r1.1 \
    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.93 pkgsrc/www/firefox52/Makefile:1.94
--- pkgsrc/www/firefox52/Makefile:1.93  Tue Nov 14 14:03:04 2023
+++ pkgsrc/www/firefox52/Makefile       Mon Dec 18 09:31:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2023/11/14 14:03:04 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2023/12/18 09:31:44 abs 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=   62
+PKGREVISION=   63
 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.33 pkgsrc/www/firefox52/distinfo:1.34
--- pkgsrc/www/firefox52/distinfo:1.33  Fri Jun  3 16:30:00 2022
+++ pkgsrc/www/firefox52/distinfo       Mon Dec 18 09:31:44 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2022/06/03 16:30:00 martin Exp $
+$NetBSD: distinfo,v 1.34 2023/12/18 09:31:44 abs Exp $
 
 BLAKE2s (firefox-52.9.0esr.source.tar.xz) = 68da851ecfe1b03231157bf79732865d3cf81b7c10128a2e2a9e6e7be3963348
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
@@ -45,13 +45,14 @@ SHA1 (patch-gfx_graphite2_src_Bidi.cpp) 
 SHA1 (patch-gfx_moz.build) = 0d669ac6dc1af17ea8ed7e84e4915947c2a6b1ca
 SHA1 (patch-gfx_skia_generate__mozbuild.py) = fba2f212f84e6cc20a4269e21ed654c348ae8fee
 SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871
-SHA1 (patch-gfx_thebes_gfxFont.cpp) = 5e244e242d169203b806244a382840ca72780f27
+SHA1 (patch-gfx_thebes_gfxFont.cpp) = ed61421753af0717c32c8ba2d2a1d32c7acb2cfe
 SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456
 SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf
 SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb
 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_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/patches/patch-gfx_thebes_gfxFont.cpp
diff -u pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp:1.1 pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp:1.2
--- pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp:1.1       Mon Jun 21 14:21:28 2021
+++ pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp   Mon Dec 18 09:31:44 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-gfx_thebes_gfxFont.cpp,v 1.1 2021/06/21 14:21:28 martin Exp $
+$NetBSD: patch-gfx_thebes_gfxFont.cpp,v 1.2 2023/12/18 09:31:44 abs Exp $
 
 Add an explicit template instantiation to make it work
 with newer gcc (older gcc did not create specialized inline
 clones).
 
---- gfx/thebes/gfxFont.cpp.orig        2017-04-11 04:13:08.000000000 +0200
-+++ gfx/thebes/gfxFont.cpp     2021-06-21 15:18:43.789260654 +0200
+--- gfx/thebes/gfxFont.cpp.orig        2017-04-11 02:13:08.000000000 +0000
++++ gfx/thebes/gfxFont.cpp
 @@ -2614,6 +2614,18 @@ gfxFont::GetShapedWord(DrawTarget *aDraw
      return sw;
  }
@@ -25,4 +25,3 @@ clones).
  bool
  gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
  {
-

Added files:

Index: pkgsrc/www/firefox52/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp:1.1
--- /dev/null   Mon Dec 18 09:31:45 2023
+++ pkgsrc/www/firefox52/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp     Mon Dec 18 09:31:44 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-intl_lwbrk_nsJISx4051LineBreaker.cpp,v 1.1 2023/12/18 09:31:44 abs Exp $
+
+Update for icu >= 74.1 support.
+
+--- intl/lwbrk/nsJISx4051LineBreaker.cpp.orig  2023-12-13 23:14:55.231839980 +0000
++++ intl/lwbrk/nsJISx4051LineBreaker.cpp
+@@ -550,8 +550,13 @@ GetClass(uint32_t u)
+     /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+     /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+     /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-    /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER
+-  };
++    /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++    /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++    /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++    /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++    /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++    /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
++};
+ 
+ #if ENABLE_INTL_API
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),