mingw-w64-gtk3: 3.24.4 -> 3.24.5

4 files changed, 93 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 366a04b9c87f..5b1232469fb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan 22 22:08:25 UTC 2019
+# Tue Feb 12 16:29:39 UTC 2019
 pkgbase = mingw-w64-gtk3
 	pkgdesc = GObject-based multi-platform GUI toolkit (mingw-w64)
-	pkgver = 3.24.4
+	pkgver = 3.24.5
 	pkgrel = 1
 	url = http://www.gtk.org
 	install = mingw-w64-gtk3.install
@@ -11,12 +11,14 @@ pkgbase = mingw-w64-gtk3
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
 	makedepends = mingw-w64-configure
+	makedepends = gobject-introspection
 	makedepends = gtk-update-icon-cache
 	makedepends = python
 	depends = mingw-w64-crt
 	depends = mingw-w64-adwaita-icon-theme
 	depends = mingw-w64-atk>=2.15.1
 	depends = mingw-w64-cairo>=1.14.2-3
+	depends = mingw-w64-fribidi>=0.19.7
 	depends = mingw-w64-gdk-pixbuf2>=2.30.0
 	depends = mingw-w64-glib2>=2.53.4
 	depends = mingw-w64-libepoxy>=1.4
@@ -24,8 +26,12 @@ pkgbase = mingw-w64-gtk3
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.4.tar.xz
-	sha256sums = d84f59ff02a87cc90c9df4a572a13eca4e3506e2bf511e2b9cbdb4526fa0cb9c
+	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.5.tar.xz
+	source = gtk3-link-gdk-against-fribidi.patch
+	source = gtk3-fribidi-private-dependency.patch
+	sha256sums = 0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f
+	sha256sums = 7d92bc28c1b8d5aacc69d2414419a60a23e664e1ffe19835f79cea21b9f99864
+	sha256sums = 8f3fceda7ec0deb93df405060e95e4aa65af94b10d75697057781e472535cfe9
 
 pkgname = mingw-w64-gtk3
 
diff --git a/PKGBUILD b/PKGBUILD
index 12de7897154d..d2468455be13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: lantw44 at gmail dot com
 
 pkgname=mingw-w64-gtk3
-pkgver=3.24.4
+pkgver=3.24.5
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit (mingw-w64)'
 arch=('any')
@@ -12,6 +12,7 @@ makedepends=(
   'mingw-w64-gcc'
   'mingw-w64-pkg-config'
   'mingw-w64-configure'
+  'gobject-introspection'
   'gtk-update-icon-cache'
   'python') # python is required to run gdbus-codegen
 depends=(
@@ -19,22 +20,38 @@ depends=(
   'mingw-w64-adwaita-icon-theme'
   'mingw-w64-atk>=2.15.1'
   'mingw-w64-cairo>=1.14.2-3'
+  'mingw-w64-fribidi>=0.19.7'
   'mingw-w64-gdk-pixbuf2>=2.30.0'
   'mingw-w64-glib2>=2.53.4'
   'mingw-w64-libepoxy>=1.4'
   'mingw-w64-pango>=1.41.0')
 options=('!strip' '!buildflags' 'staticlibs')
-source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
-sha256sums=('d84f59ff02a87cc90c9df4a572a13eca4e3506e2bf511e2b9cbdb4526fa0cb9c')
+source=(
+  "https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
+  'gtk3-link-gdk-against-fribidi.patch'
+  'gtk3-fribidi-private-dependency.patch')
+sha256sums=(
+  '0be5fb0d302bc3de26ab58c32990d895831e2b7c7418d0ffea1206d6a3ddb02f'
+  '7d92bc28c1b8d5aacc69d2414419a60a23e664e1ffe19835f79cea21b9f99864'
+  '8f3fceda7ec0deb93df405060e95e4aa65af94b10d75697057781e472535cfe9')
 
 _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
 
 prepare() {
   cd "${srcdir}/gtk+-${pkgver}"
+  local source_file
+  for source_file in "${source[@]}"; do
+    case "${source_file}" in
+      *.patch)
+        patch -p1 < "${srcdir}/${source_file}"
+        ;;
+    esac
+  done
 }
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
+  autoreconf -fiv
   for _arch in "${_architectures[@]}"; do
     export PKG_CONFIG="${_arch}-pkg-config"
     export PKG_CONFIG_FOR_BUILD="pkg-config"
diff --git a/gtk3-fribidi-private-dependency.patch b/gtk3-fribidi-private-dependency.patch
new file mode 100644
index 000000000000..98ab6cdcf757
--- /dev/null
+++ b/gtk3-fribidi-private-dependency.patch
@@ -0,0 +1,37 @@
+From 47e4a111c2666961ab47b6df48460d3c9075d92d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 5 Feb 2019 08:04:14 -0500
+Subject: [PATCH] Try again
+
+We only want fribidi as a private dependency.
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c591c02e89..388db32c5a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1376,8 +1376,8 @@ fi
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+ 
+-GDK_PACKAGES="$PANGO_PACKAGES fribidi >= fribidi_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
+-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
++GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
++GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
+ 
+ PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
+ GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
+@@ -1411,7 +1411,7 @@ fi
+ PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
+ 
+ GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
+-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
++GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_dep"
+ if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
+   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
+ fi
+-- 
+2.18.1
+
diff --git a/gtk3-link-gdk-against-fribidi.patch b/gtk3-link-gdk-against-fribidi.patch
new file mode 100644
index 000000000000..dd31143159c8
--- /dev/null
+++ b/gtk3-link-gdk-against-fribidi.patch
@@ -0,0 +1,26 @@
+From f533ef8650e59f800ea4d958b16b4a6691a103ac Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 5 Feb 2019 07:17:07 -0500
+Subject: [PATCH] Link gdk against fribidi
+
+It is required now.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 447e49e0df..c591c02e89 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1376,7 +1376,7 @@ fi
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+ 
+-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
++GDK_PACKAGES="$PANGO_PACKAGES fribidi >= fribidi_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
+ GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
+ 
+ PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
+-- 
+2.18.1
+