[arch-commits] Commit in automake/trunk (PKGBUILD test_vala-mix2.sh.diff)

[Lukas Fleischer via arch-commits]

Date: Saturday, November 28, 2020 @ 14:15:44
  Author: lfleischer
Revision: 402357

upgpkg: automake 1.16.3-1: upstream update

Modified:
  automake/trunk/PKGBUILD
Deleted:
  automake/trunk/test_vala-mix2.sh.diff

+
 PKGBUILD   |   19 +--
 test_vala-mix2.sh.diff |   22 --
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-28 10:57:15 UTC (rev 402356)
+++ PKGBUILD2020-11-28 14:15:44 UTC (rev 402357)
@@ -3,8 +3,8 @@
 # Contributor: judd 
 
 pkgname=automake
-pkgver=1.16.2
-pkgrel=3
+pkgver=1.16.3
+pkgrel=1
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
@@ -18,22 +18,13 @@
   # fixes for current texlive release
   #'texlive-bin' 'texinfo'
   'python' 'python-virtualenv')
-source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-test_vala-mix2.sh.diff)
-sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b'
-'SKIP'
-
'e6cc9cb41cfd10cbd4ab0263859bfa8c892112c68a69043601c6d7da7c70300ccfe29b242a597bdf6c00bf14c12c19180eedbd66e80ae2bbea9513e36d999108')
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+sha512sums=('7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa'
+'SKIP')
 validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573'   # Stefano Lattarini
   'F2A38D7EEB2B66405761070D0ADEE10094604D37'   # Mathieu Lirzin
   '155D3FC500C834486D1EEA677FD9FCCB000B')  # Jim Meyering
 
-prepare() {
-   # upstream suggested gcc10 fix for failing test
-   # https://lists.gnu.org/archive/html/bug-automake/2020-06/msg3.html
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -Np1 -i ../test_vala-mix2.sh.diff
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --build=$CHOST --prefix=/usr

Deleted: test_vala-mix2.sh.diff
===
--- test_vala-mix2.sh.diff  2020-11-28 10:57:15 UTC (rev 402356)
+++ test_vala-mix2.sh.diff  2020-11-28 14:15:44 UTC (rev 402357)
@@ -1,22 +0,0 @@
-diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
-index 8e6a214..933a3ff 100644
 a/t/vala-mix2.sh
-+++ b/t/vala-mix2.sh
-@@ -44,7 +44,7 @@ int main ()
- END
- 
- cat > foo.h <<'END'
--int foo;
-+extern int foo;
- int bar (void);
- int baz (void);
- END
-@@ -56,7 +56,7 @@ END
- 
- cat > baz.c <<'END'
- #include "foo.h"
--extern int foo = 0;
-+int foo = 0;
- int baz (void) { return 0; }
- END
- 

[arch-commits] Commit in automake/trunk (PKGBUILD test_vala-mix2.sh.diff)

[Andreas Radke via arch-commits]

Date: Saturday, June 6, 2020 @ 20:09:51
  Author: andyrtr
Revision: 388388

upgpkg: automake 1.16.2-3: apply upstream suggested fix to pass test

Added:
  automake/trunk/test_vala-mix2.sh.diff
Modified:
  automake/trunk/PKGBUILD

+
 PKGBUILD   |   20 
 test_vala-mix2.sh.diff |   22 ++
 2 files changed, 34 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-06 19:50:23 UTC (rev 388387)
+++ PKGBUILD2020-06-06 20:09:51 UTC (rev 388388)
@@ -4,7 +4,7 @@
 
 pkgname=automake
 pkgver=1.16.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
@@ -18,19 +18,23 @@
   # fixes for current texlive release
   #'texlive-bin' 'texinfo'
   'python' 'python-virtualenv')
-source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+test_vala-mix2.sh.diff)
 
sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b'
-'SKIP')
+'SKIP'
+
'e6cc9cb41cfd10cbd4ab0263859bfa8c892112c68a69043601c6d7da7c70300ccfe29b242a597bdf6c00bf14c12c19180eedbd66e80ae2bbea9513e36d999108')
 validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573'   # Stefano Lattarini
   'F2A38D7EEB2B66405761070D0ADEE10094604D37'   # Mathieu Lirzin
   '155D3FC500C834486D1EEA677FD9FCCB000B')  # Jim Meyering
 
+prepare() {
+   # upstream suggested gcc10 fix for failing test
+   # https://lists.gnu.org/archive/html/bug-automake/2020-06/msg3.html
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -Np1 -i ../test_vala-mix2.sh.diff
+}
+
 build() {
-   # revert to behavior before gcc10 to pass tests
-   # FAIL t/vala-mix2.sh (exit status: 2)
-   # bugreport has been sent upstream
-   export CFLAGS="$CFLAGS -fcommon"
-
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --build=$CHOST --prefix=/usr
make

Added: test_vala-mix2.sh.diff
===
--- test_vala-mix2.sh.diff  (rev 0)
+++ test_vala-mix2.sh.diff  2020-06-06 20:09:51 UTC (rev 388388)
@@ -0,0 +1,22 @@
+diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
+index 8e6a214..933a3ff 100644
+--- a/t/vala-mix2.sh
 b/t/vala-mix2.sh
+@@ -44,7 +44,7 @@ int main ()
+ END
+ 
+ cat > foo.h <<'END'
+-int foo;
++extern int foo;
+ int bar (void);
+ int baz (void);
+ END
+@@ -56,7 +56,7 @@ END
+ 
+ cat > baz.c <<'END'
+ #include "foo.h"
+-extern int foo = 0;
++int foo = 0;
+ int baz (void) { return 0; }
+ END
+