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

[Balló György]

    Date: Wednesday, May 27, 2020 @ 14:22:42
  Author: bgyorgy
Revision: 635919

upgpkg: gnome-panel 3.36.1-1: Update to new version

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 14:16:52 UTC (rev 635918)
+++ PKGBUILD	2020-05-27 14:22:42 UTC (rev 635919)
@@ -2,7 +2,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.36.0
+pkgver=3.36.1
 pkgrel=1
 pkgdesc="Panel of GNOME Flashback"
 arch=('x86_64')
@@ -12,11 +12,9 @@
 makedepends=('intltool' 'itstool' 'python' 'git' 'gtk-doc' 'yelp-tools' 'autoconf-archive')
 optdepends=('alacarte: Main menu editor'
             'gnome-applets: Extra applets for the panel')
-_commit=ccbfe817288bef398d1be5fc83a336dd3593bdad  # tags/3.36.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-panel.git#commit=$_commit"
-        gettext.diff)
-sha256sums=('SKIP'
-            '0049e87e4d671ad4890239d3cb9a8652eabc616c2597a5930bcdd2ee31162127')
+_commit=3512627f7a2ac6b9fc270ff2f4318505ddd02fa6  # tags/3.36.1^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-panel.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,7 +23,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../gettext.diff  # Unbreak build with gettext 0.20
   NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: gettext.diff
===================================================================
--- gettext.diff	2020-05-27 14:16:52 UTC (rev 635918)
+++ gettext.diff	2020-05-27 14:22:42 UTC (rev 635919)
@@ -1,12 +0,0 @@
-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])