From 42e5a2ab37aaa9e99b2b8824a57bde3bb02ae1b1 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 9 Oct 2017 09:31:37 +0200
Subject: [PATCH] glade: Update to 3.20.1 (#3021)

---
 mingw-w64-glade/0008-localedir-fix.patch | 32 ------------------------
 mingw-w64-glade/PKGBUILD                 | 19 ++++++--------
 2 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 mingw-w64-glade/0008-localedir-fix.patch

diff --git a/mingw-w64-glade/0008-localedir-fix.patch b/mingw-w64-glade/0008-localedir-fix.patch
deleted file mode 100644
index 9319bd24fe..0000000000
--- a/mingw-w64-glade/0008-localedir-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- glade-3.18.3/po/Makefile.in.in	2012-01-18 16:37:06 +0000
-+++ glade-3.18.3/po/Makefile.in.in	2013-05-12 17:12:40 +0000
-@@ -33,8 +33,7 @@
- datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+localedir = @localedir@
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-@@ -108,7 +107,7 @@
- install-data-yes: all
- 	linguas="$(USE_LINGUAS)"; \
- 	for lang in $$linguas; do \
--	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkdir_p) $$dir; \
- 	  if test -r $$lang.gmo; then \
- 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-@@ -142,8 +141,8 @@
- uninstall:
- 	linguas="$(USE_LINGUAS)"; \
- 	for lang in $$linguas; do \
--	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
--	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- 	done
- 
- check: all $(GETTEXT_PACKAGE).pot
diff --git a/mingw-w64-glade/PKGBUILD b/mingw-w64-glade/PKGBUILD
index 6f51c9013d..d208f096ec 100644
--- a/mingw-w64-glade/PKGBUILD
+++ b/mingw-w64-glade/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=glade
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.20.0
-pkgrel=2
+pkgver=3.20.1
+pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME (mingw-w64)"
 arch=('any')
 url="https://glade.gnome.org/"
@@ -17,10 +17,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-python2-gobject"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "gtk-doc"
+             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
+             "${MINGW_PACKAGE_PREFIX}-gnome-common"
              "intltool"
-             "itstool"
-             "docbook-xsl")
+             "itstool")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python2: Python widgets support"
             #'devhelp: help browser'
             )
@@ -29,14 +29,12 @@ source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname
         0001-Fix-windres-invocation.mingw.patch
         0005-give-gtk-cflags-to-gir.patch
         0006-disable-gnome-help.patch
-        0007-glade-3.16.1-no-undefined.patch
-        0008-localedir-fix.patch)
-sha256sums=('82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe'
+        0007-glade-3.16.1-no-undefined.patch)
+sha256sums=('8064676dd46baa7e00c38ec1cc3ddc75c4ef5e714cd9d1491309b4df3e9cb1df'
             'cec3e7ad59ff17313eb8c33912a8df67427c77562864cafdd4b4cc82c17aef63'
             '0e46e53437b444e64ed83d4ac2e70c73cb4ea3ca7669f5932d201e10ce0d58a7'
             '636ead9163a1a23cf7fc8144cf99de94db55c4bc97c0def2fed670bd4ec7900d'
-            'bf90d055a7bdd99599ebea9c610eb56850e0dd976532d543787f64a136d35939'
-            '48b3c143344418a202975299b4b5292c7daeae6daf4ec5d18521337d4b6cd500')
+            'bf90d055a7bdd99599ebea9c610eb56850e0dd976532d543787f64a136d35939')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -44,7 +42,6 @@ prepare() {
   patch -p1 -i ${srcdir}/0005-give-gtk-cflags-to-gir.patch
   patch -p1 -i ${srcdir}/0006-disable-gnome-help.patch
   patch -p1 -i ${srcdir}/0007-glade-3.16.1-no-undefined.patch
-  patch -p1 -i ${srcdir}/0008-localedir-fix.patch
 
   autoreconf -fi
 }