[MacPorts] #59387: webkit2-gtk: rebuild fails since icu 65.1 update due to missing patch for U16_NEXT change

[MacPorts]

#59387: webkit2-gtk: rebuild fails since icu 65.1 update due to missing patch for
U16_NEXT change
--------------------------+-------------------------
 Reporter:  ewenmcneill   |      Owner:  (none)
     Type:  defect        |     Status:  new
 Priority:  Normal        |  Milestone:
Component:  ports         |    Version:
 Keywords:  icu U16_NEXT  |       Port:  webkit2-gtk
--------------------------+-------------------------
 {{{icu}}} was updated by [[https://github.com/macports/macports-
 ports/commit/8cf9b206c3c2fcca0e0f6ee2a46f47bc828a3cb7]] from 58.2 to 65.1.
 This resulted in a number of ports needing to be rebuilt, including
 {{{webkit2-gtk}}}.  That commit did bump the {{{webkit2-gtk}}} port
 revision to cause a rebuild (and a rebuild is also triggered by broken
 binaries).  But unfortunately it seems like it does not build from source
 any longer (ie with the new {{{icu}}}).

 From some hunting around it appears that in order to build with {{{icu}}}
 65.1 it will be necessary to apply the patch in
 [[https://gitlab.gnome.org/GNOME/jhbuild/commit/e8b48870602c3a8e474e54cf1c6151b98651aae9]].
 It looks like the {{{icu}}} upgrade commit above did apply something very
 much like that patch to {{{aqua/qt5}}}, but it doesn't seem to have been
 applied to {{{webkit2-gtk}}} resulting in the build errors on each use of
 {{{U16_NEXT}}}:

 {{{
 :info:build In file included from
 /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_webkit2-gtk/webkit2-gtk/work/build/DerivedSources/WebCore
 /unified-sources/UnifiedSource214.cpp:4:
 :info:build
 /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_webkit2-gtk/webkit2-gtk/work/webkitgtk-2.20.5/Source/WebCore/dom/Document.cpp:4691:39:
 error: expected ';' after do/while statement
 :info:build     U16_NEXT(characters, i, length, c)
 :info:build                                       ^
 :info:build                                       ;
 :info:build
 /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_webkit2-gtk/webkit2-gtk/work/webkitgtk-2.20.5/Source/WebCore/dom/Document.cpp:4696:43:
 error: expected ';' after do/while statement
 :info:build         U16_NEXT(characters, i, length, c)
 :info:build                                           ^
 :info:build                                           ;
 :info:build
 /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_webkit2-gtk/webkit2-gtk/work/webkitgtk-2.20.5/Source/WebCore/dom/Document.cpp:4756:46:
 error: expected ';' after do/while statement
 :info:build         U16_NEXT(qualifiedName, i, length, c)
 :info:build                                              ^
 :info:build                                              ;
 }}}

 (That's all the references to {{{U16_NEXT}}} in the file; see also
 [[https://trac.webkit.org/changeset/250747/webkit]] and
 [[https://bugs.webkit.org/show_bug.cgi?id=202600]] for more upstream
 references to this fix.)

 {{{webkit-gtk}}} (ie, not {{{webkit2-gtk}}}) did seem to rebuild okay,
 which seems to be because it ''did'' get the extra patch
 ([[https://github.com/macports/macports-
 ports/commit/8cf9b206c3c2fcca0e0f6ee2a46f47bc828a3cb7#diff-
 ea4a1230839e4382823790f8fb451ce2]]).  But somehow {{{webkit2-gtk}}} (and
 maybe {{{webkit2-gtk-devel}}} which didn't get a rev bump?) were
 overlooked.  That explains why {{{webkit-gtk}}} builds, but
 {{{webkit2-gtk}}} does not.

 I'm using macOS 10.14.6, without having updated XCode to the 10.15
 release.  These are the {{{webkit-gtk}}} and {{{webkit2-gtk}}} versions I
 have installed:

 {{{
 ewen at ashram:/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/www/webkit2-gtk$
 port installed | grep webkit
   webkit-gtk @2.4.11_2+video
   webkit-gtk @2.4.11_3+video (active)
   webkit2-gtk @2.20.5_0+gtk2+x11
   webkit2-gtk @2.20.5_1+gtk2+x11 (active)
 ewen at ashram:/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/www/webkit2-gtk$
 }}}

 Everything else has upgraded/rebuilt correctly after the {{{icu}}}
 upgrade, except {{{webkit2-gtk}}}:

 {{{
 ewen at ashram:~$ port outdated
 The following installed ports are outdated:
 webkit2-gtk                    2.20.5_1 < 2.20.5_2
 ewen at ashram:~$
 }}}

-- 
Ticket URL: <https://trac.macports.org/ticket/59387>
MacPorts <https://www.macports.org/>
Ports system for macOS