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

2020-05-27 Thread Balló György via arch-commits 
Date: Wednesday, May 27, 2020 @ 15:24:49
  Author: bgyorgy
Revision: 635929

upgpkg: gnome-flashback 3.36.3-1: Update to new version

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

--+
 PKGBUILD |8 ++--
 gettext.diff |   12 
 2 files changed, 2 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-27 15:15:02 UTC (rev 635928)
+++ PKGBUILD2020-05-27 15:24:49 UTC (rev 635929)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György 
 
 pkgname=gnome-flashback
-pkgver=3.35.2+25+g2553c69
+pkgver=3.36.3
 pkgrel=1
 pkgdesc="GNOME Flashback session"
 arch=('x86_64')
@@ -12,14 +12,12 @@
 optdepends=('gnome-backgrounds: Default background'
 'gnome-control-center: System settings'
 'network-manager-applet: Network management')
-_commit=2553c69eb477a5222c76ee1f0cbb8d7889c53611  # master
+_commit=5036ec999d9f9ad8772e863e4cee2b679beb569f  # tags/3.36.3^0
 
source=("git+https://gitlab.gnome.org/GNOME/gnome-flashback.git#commit=$_commit";
 "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";
-gettext.diff
 gnome-flashback.pam)
 sha256sums=('SKIP'
 'SKIP'
-'e947f51efca2efcae36755406f1b9a191981fc09a819fe148bc41451a08341d4'
 '7148b3b1773fa312d6cd14798338cc70cffb6df7504ff1787687edd0363138d2')
 
 pkgver() {
@@ -29,8 +27,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../gettext.diff  # Unbreak build with gettext 0.20
-
   git submodule init
   git submodule set-url gvc/gvc "$srcdir/libgnome-volume-control"
   git submodule update

Deleted: gettext.diff
===
--- gettext.diff2020-05-27 15:15:02 UTC (rev 635928)
+++ gettext.diff2020-05-27 15:24:49 UTC (rev 635929)
@@ -1,12 +0,0 @@
-diff --git i/configure.ac w/configure.ac
-index 5dbd86d..0e586c1 100644
 i/configure.ac
-+++ w/configure.ac
-@@ -71,6 +71,7 @@ dnl 
**
- 
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.19.4])
-+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.4])
- 
- GETTEXT_PACKAGE=gnome-flashback
- AC_SUBST([GETTEXT_PACKAGE])

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

2019-09-13 Thread Jan Steffens via arch-commits 
Date: Friday, September 13, 2019 @ 21:34:57
  Author: heftig
Revision: 510405

3.34.0-1

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

--+
 PKGBUILD |   15 ++-
 gettext.diff |   12 
 2 files changed, 22 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 21:32:55 UTC (rev 510404)
+++ PKGBUILD2019-09-13 21:34:57 UTC (rev 510405)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György 
 
 pkgname=gnome-flashback
-pkgver=3.32.0
+pkgver=3.34.0
 pkgrel=1
 pkgdesc="GNOME Flashback session"
 arch=('x86_64')
@@ -13,11 +13,13 @@
 'gnome-control-center: System settings'
 'gnome-screensaver: Lock screen'
 'network-manager-applet: Network management')
-_commit=3dd159c787a0e87b9b84f3504b572ca164a4afd9  # tags/3.32.0^0
+_commit=58cf1160cc2716a0e1530165922a6bda42e40825  # tags/3.34.0^0
 
source=("git+https://gitlab.gnome.org/GNOME/gnome-flashback.git#commit=$_commit";
-"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";)
+"git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git";
+gettext.diff)
 sha256sums=('SKIP'
-'SKIP')
+'SKIP'
+'e947f51efca2efcae36755406f1b9a191981fc09a819fe148bc41451a08341d4')
 
 pkgver() {
   cd $pkgname
@@ -26,8 +28,11 @@
 
 prepare() {
   cd $pkgname
+  patch -Np1 -i ../gettext.diff  # Unbreak build with gettext 0.20
+
+  git submodule init
   git config --local submodule.gnome-flashback/libsound-applet/gvc.url 
"$srcdir/libgnome-volume-control"
-  git submodule update --init
+  git submodule update
 
   NOCONFIGURE=1 ./autogen.sh
 }

Added: gettext.diff
===
--- gettext.diff(rev 0)
+++ gettext.diff2019-09-13 21:34:57 UTC (rev 510405)
@@ -0,0 +1,12 @@
+diff --git i/configure.ac w/configure.ac
+index 5dbd86d..0e586c1 100644
+--- i/configure.ac
 w/configure.ac
+@@ -71,6 +71,7 @@ dnl 
**
+ 
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.4])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.4])
+ 
+ GETTEXT_PACKAGE=gnome-flashback
+ AC_SUBST([GETTEXT_PACKAGE])