[arch-commits] Commit in gnome-panel/trunk (PKGBUILD gettext.diff)

[Jan Steffens]

    Date: Friday, September 13, 2019 @ 21:26:15
  Author: heftig
Revision: 510399

3.34.0-1

Added:
  gnome-panel/trunk/gettext.diff
Modified:
  gnome-panel/trunk/PKGBUILD

--------------+
 PKGBUILD     |   11 +++++++----
 gettext.diff |   12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-13 21:25:11 UTC (rev 510398)
+++ PKGBUILD	2019-09-13 21:26:15 UTC (rev 510399)
@@ -2,7 +2,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.32.0
+pkgver=3.34.0
 pkgrel=1
 pkgdesc="Panel of GNOME Flashback"
 arch=('x86_64')
@@ -12,9 +12,11 @@
 makedepends=('intltool' 'itstool' 'python' 'git' 'gtk-doc' 'yelp-tools' 'autoconf-archive')
 optdepends=('alacarte: Main menu editor'
             'gnome-applets: Extra applets for the panel')
-_commit=10f757b147c2ef8fb92bcb9114c96ca6e5e71117  # tags/3.32.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-panel.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=e78941f27e5edd560338da44e76cadfc0fc6ce9b  # tags/3.34.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-panel.git#commit=$_commit"
+        gettext.diff)
+sha256sums=('SKIP'
+            '0049e87e4d671ad4890239d3cb9a8652eabc616c2597a5930bcdd2ee31162127')
 
 pkgver() {
   cd $pkgname
@@ -23,6 +25,7 @@
 
 prepare() {
   cd $pkgname
+  patch -Np1 -i ../gettext.diff  # Unbreak build with gettext 0.20
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: gettext.diff
===================================================================
--- gettext.diff	                        (rev 0)
+++ gettext.diff	2019-09-13 21:26:15 UTC (rev 510399)
@@ -0,0 +1,12 @@
+diff --git i/configure.ac w/configure.ac
+index 873907512..fa39e0d31 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -79,6 +79,7 @@ dnl **************************************************************************
+ 
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.8])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
+ 
+ GETTEXT_PACKAGE=gnome-panel
+ AC_SUBST([GETTEXT_PACKAGE])