summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-07-05 01:24:39 +0200
committerpiernov <piernov@piernov.org>2012-07-05 01:24:39 +0200
commitd58492170bd426b7e752c68d82405f6dc9a3e40f (patch)
tree69982a196e8d39f4c75e0b31fb1c37988c218874
parent1163ddddb7dff7505cb51dc1efabf350244df201 (diff)
parentc9bd2437326b8e83df0e22d655987736023bae70 (diff)
downloadgnome3-d58492170bd426b7e752c68d82405f6dc9a3e40f.tar.gz
gnome3-d58492170bd426b7e752c68d82405f6dc9a3e40f.tar.bz2
gnome3-d58492170bd426b7e752c68d82405f6dc9a3e40f.tar.xz
gnome3-d58492170bd426b7e752c68d82405f6dc9a3e40f.zip
Merge branch 'master' of ssh://piernov.org/srv/git/gnome3
-rw-r--r--gnome-common/.md5sum.i6861
-rw-r--r--gnome-common/.md5sum.x86_641
-rwxr-xr-xgnome-common/Pkgfile4
-rw-r--r--gnome-common/automake-1.12-support.patch35
4 files changed, 40 insertions, 1 deletions
diff --git a/gnome-common/.md5sum.i686 b/gnome-common/.md5sum.i686
index 33999a5..c09e69e 100644
--- a/gnome-common/.md5sum.i686
+++ b/gnome-common/.md5sum.i686
@@ -1 +1,2 @@
+88a680b0397b8b077f99784797f177e6 automake-1.12-support.patch
18480be01c632577002462054062c42b gnome-common-3.4.0.1.tar.xz
diff --git a/gnome-common/.md5sum.x86_64 b/gnome-common/.md5sum.x86_64
index 33999a5..c09e69e 100644
--- a/gnome-common/.md5sum.x86_64
+++ b/gnome-common/.md5sum.x86_64
@@ -1 +1,2 @@
+88a680b0397b8b077f99784797f177e6 automake-1.12-support.patch
18480be01c632577002462054062c42b gnome-common-3.4.0.1.tar.xz
diff --git a/gnome-common/Pkgfile b/gnome-common/Pkgfile
index 58e267a..2069195 100755
--- a/gnome-common/Pkgfile
+++ b/gnome-common/Pkgfile
@@ -8,10 +8,12 @@
name=gnome-common
version=3.4.0.1
release=1
-source=(http://download.gnome.org/sources/$name/${version%.*.*}/$name-$version.tar.xz)
+source=(http://download.gnome.org/sources/$name/${version%.*.*}/$name-$version.tar.xz
+ automake-1.12-support.patch)
build() {
cd $name-$version
+ patch -p1 < ../automake-1.12-support.patch
./configure --prefix=/usr
make
make DESTDIR=$PKG install
diff --git a/gnome-common/automake-1.12-support.patch b/gnome-common/automake-1.12-support.patch
new file mode 100644
index 0000000..d4470a9
--- /dev/null
+++ b/gnome-common/automake-1.12-support.patch
@@ -0,0 +1,35 @@
+From 1fed4ee7015b89a1ac4c4a535aeb753e820e4970 Mon Sep 17 00:00:00 2001
+From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+Date: Sun, 29 Apr 2012 17:44:32 +0000
+Subject: Add support for automake 1.12
+
+Bug #675093.
+---
+diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
+index 9967f89..3179c3f 100644
+--- a/macros2/gnome-autogen.sh
++++ b/macros2/gnome-autogen.sh
+@@ -325,13 +325,14 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
+
+ case $REQUIRED_AUTOMAKE_VERSION in
+ 1.4*) automake_progs="automake-1.4" ;;
+- 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+- 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+- 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+- 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+- 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+- 1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+- 1.11*) automake_progs="automake-1.11" ;;
++ 1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++ 1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++ 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++ 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++ 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++ 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
++ 1.11*) automake_progs="automake-1.12 automake-1.11" ;;
++ 1.12*) automake_progs="automake-1.12" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
+--
+cgit v0.9.0.2