index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
author | Andreas Baumann <mail@andreasbaumann.cc> | 2020-02-23 11:02:41 +0100 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2020-02-23 11:02:41 +0100 |
commit | f85231ef96ff5f5ca8be780931a78a82b7318829 (patch) | |
tree | 22342b8b4731715528ce1ba73fa68f90ccd88138 | |
parent | 573924bec50064634395583ad4f33cf071fe1f34 (diff) |
-rw-r--r-- | extra/gtk2/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/gtk2/gtk2-automake-1.15_16.diff | 35 |
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD deleted file mode 100644 index 8620931c..00000000 --- a/extra/gtk2/PKGBUILD +++ /dev/null @@ -1,12 +0,0 @@ -# new automake support, see FS#62022 - -source+=('gtk2-automake-1.15_16.diff') -sha256sums+=('d47fe647289e59d3f2b4b35c0c718f1bf643758485c9aa5a129a965b9efdb244') - -eval "$( - declare -f prepare | \ - sed ' - /patch/ a \ - patch -p1 -i $srcdir/gtk2-automake-1.15_16.diff - ' -)" diff --git a/extra/gtk2/gtk2-automake-1.15_16.diff b/extra/gtk2/gtk2-automake-1.15_16.diff deleted file mode 100644 index 5ddd58b9..00000000 --- a/extra/gtk2/gtk2-automake-1.15_16.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/autogen.sh b/autogen.sh -index 078f483f5adced2d762abe3db687aac8b9844f4f..63e2d5c4951b87ad6740d39494d91acc29253084 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -48,7 +48,10 @@ fi - DIE=1 - } - --if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then -+if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then -+ AUTOMAKE=automake-1.16 -+ ACLOCAL=aclocal-1.16 -+else if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake-1.15 - ACLOCAL=aclocal-1.15 - else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then -@@ -71,8 +74,8 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then - ACLOCAL=aclocal-1.7 - else - echo -- echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x" -- echo "or 1.15.x installed to compile $PROJECT." -+ echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x," -+ echo "1.15.x or 1.16.x installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" - DIE=1 -@@ -83,6 +86,7 @@ fi - fi - fi - fi -+fi - - if test "$DIE" -eq 1; then - exit 1 |