Rebuild for icu 69.1

3 files changed, 26 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f2728f94db5..4526a235a452 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkitgtk
 	pkgdesc = Legacy Web content engine for GTK+ 3
 	pkgver = 2.4.11
-	pkgrel = 23
+	pkgrel = 24
 	epoch = 3
 	url = https://webkitgtk.org/
 	install = webkitgtk.install
@@ -54,7 +54,7 @@ pkgbase = webkitgtk
 	sha256sums = d1a9ccc1ae5cb042bc47ae846ff84513ca7b9c7bc999c546ffba48572f0373a0
 	sha256sums = 7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9
 	sha256sums = 5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193
-	sha256sums = 453e826ad09cdceb12cad750e16cf6b9d43d8810eb1ea14bd291e5556a14d9df
+	sha256sums = db202fedd72a21318646c561afcd76656ea8ba6b1d641363fc7b69ae5687aa28
 
 pkgname = webkitgtk
 
diff --git a/PKGBUILD b/PKGBUILD
index 8e6d7320fd35..bce4772290d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=webkitgtk
 pkgver=2.4.11
-pkgrel=23
+pkgrel=24
 epoch=3
 pkgdesc="Legacy Web content engine for GTK+ 3"
 arch=("armv7h" "i686" "x86_64")
@@ -45,7 +45,7 @@ sha256sums=(
   "d1a9ccc1ae5cb042bc47ae846ff84513ca7b9c7bc999c546ffba48572f0373a0"
   "7341eb4c229656046be6ac526f94b9f4a742a66178412caf22a988677f5bf9d9"
   "5a62fbd0df69c6951562e72cd7b3c58cae7f2807338ced7b4a1973440b3dd193"
-  "453e826ad09cdceb12cad750e16cf6b9d43d8810eb1ea14bd291e5556a14d9df"
+  "db202fedd72a21318646c561afcd76656ea8ba6b1d641363fc7b69ae5687aa28"
 )
 
 prepare() {
@@ -66,6 +66,9 @@ prepare() {
 
   # https://www.linuxquestions.org/questions/slackware-14/sbo-scripts-not-building-on-current-read-1st-post-pls-4175561999/page195.html#post6160562
   patch -Np1 -i "${srcdir}/grammar.patch"
+
+  # glib>=2.68.0
+  patch -Np1 -i "${srcdir}/glib-2.68.0.patch"
 }
 
 build() (
@@ -86,11 +89,6 @@ build() (
     --disable-webkit2 \
     --disable-gtk-doc
 
-  # patch for glib>=2.68.0
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/glib-2.68.0.patch"
-  cd "${srcdir}/build-gtk"
-
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i "s/ -shared / -Wl,-O1,--as-needed\0/g" "${srcdir}/build-gtk/libtool"
 
diff --git a/glib-2.68.0.patch b/glib-2.68.0.patch
index a5ef51700ba1..3be1b22f9b23 100644
--- a/glib-2.68.0.patch
+++ b/glib-2.68.0.patch
@@ -1,5 +1,22 @@
---- Source/WTF/wtf/gobject/GRefPtr.h	2021-04-22 00:32:56.644133999 +0900
-+++ Source/WTF/wtf/gobject/GRefPtr.h	2021-04-22 00:33:57.755315484 +0900
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index 7d4d21c..646197f 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -96250,8 +96250,8 @@ $(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
+ 	@true
+ 
+ stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
+-	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
++	$(AM_V_GEN)	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
++	sed -i '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+ 	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+ 	echo timestamp > $(@F)
+ 
+diff --git a/Source/WTF/wtf/gobject/GRefPtr.h b/Source/WTF/wtf/gobject/GRefPtr.h
+index b25b7bb..447015e 100644
+--- a/Source/WTF/wtf/gobject/GRefPtr.h
++++ b/Source/WTF/wtf/gobject/GRefPtr.h
 @@ -25,11 +25,11 @@
  
  #if USE(GLIB)
@@ -14,16 +31,3 @@
  
  namespace WTF {
  
---- GNUmakefile.in	2021-04-22 00:35:24.846905490 +0900
-+++ GNUmakefile.in	2021-04-22 00:42:04.543194694 +0900
-@@ -96250,8 +96250,8 @@
- 	@true
- 
- stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
--	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
--	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
-+	$(AM_V_GEN)	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
-+	sed -i '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
- 	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
- 	echo timestamp > $(@F)
-