Date: Tuesday, July 2, 2013 @ 11:13:57 Author: jgc Revision: 189286 archrelease: copy trunk to extra-any
Added: gnome-common/repos/extra-any/PKGBUILD (from rev 189285, gnome-common/trunk/PKGBUILD) gnome-common/repos/extra-any/git-fixes.patch (from rev 189285, gnome-common/trunk/git-fixes.patch) Deleted: gnome-common/repos/extra-any/PKGBUILD -----------------+ PKGBUILD | 54 ++++++++++++++++++++++---------------- git-fixes.patch | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 23 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-07-02 09:13:45 UTC (rev 189285) +++ PKGBUILD 2013-07-02 09:13:57 UTC (rev 189286) @@ -1,23 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=gnome-common -pkgver=3.7.4 -pkgrel=1 -pkgdesc="Common development macros for GNOME" -arch=(any) -license=('GPL') -url="http://www.gnome.org" -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: gnome-common/repos/extra-any/PKGBUILD (from rev 189285, gnome-common/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-07-02 09:13:57 UTC (rev 189286) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=gnome-common +pkgver=3.7.4 +pkgrel=2 +pkgdesc="Common development macros for GNOME" +arch=(any) +depends=('sh') +license=('GPL') +url="http://www.gnome.org" +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz + git-fixes.patch) +sha256sums=('2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b' + '978d43799927b6e8ee7e8e33838126df44fdeade0f4ea5154a261286cdeb5d93') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../git-fixes.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Copied: gnome-common/repos/extra-any/git-fixes.patch (from rev 189285, gnome-common/trunk/git-fixes.patch) =================================================================== --- git-fixes.patch (rev 0) +++ git-fixes.patch 2013-07-02 09:13:57 UTC (rev 189286) @@ -0,0 +1,75 @@ +diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh +index 5da964e..be70371 100644 +--- a/macros2/gnome-autogen.sh ++++ b/macros2/gnome-autogen.sh +@@ -345,15 +345,16 @@ done + + case $REQUIRED_AUTOMAKE_VERSION in + 1.4*) automake_progs="automake-1.4" ;; +- 1.5*) automake_progs="automake-1.13 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.13 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.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; +- 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; +- 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; +- 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; +- 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; +- 1.12*) automake_progs="automake-1.13 automake-1.12" ;; +- 1.13*) automake_progs="automake-1.13" ;; ++ 1.5*) automake_progs="automake-1.14 automake-1.13 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.14 automake-1.13 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.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; ++ 1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; ++ 1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; ++ 1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; ++ 1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;; ++ 1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;; ++ 1.13*) automake_progs="automake-1.14 automake-1.13" ;; ++ 1.14*) automake_progs="automake-1.14" ;; + esac + version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ + "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" +diff --git a/macros2/gnome-code-coverage.m4 b/macros2/gnome-code-coverage.m4 +index 618ccbe..62375e6 100644 +--- a/macros2/gnome-code-coverage.m4 ++++ b/macros2/gnome-code-coverage.m4 +@@ -44,7 +44,7 @@ AC_DEFUN([GNOME_CODE_COVERAGE],[ + ]) + + # List of supported lcov versions. +- lcov_version_list="1.6 1.7 1.8 1.9" ++ lcov_version_list="1.6 1.7 1.8 1.9 1.10" + + AC_CHECK_PROG([LCOV], [lcov], [lcov]) + AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) +@@ -120,7 +120,7 @@ code_coverage_quiet_0 = --quiet + + # Use recursive makes in order to ignore errors during check + check-code-coverage: +-ifdef CODE_COVERAGE_ENABLED ++ifeq ($(CODE_COVERAGE_ENABLED),yes) + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture + else +@@ -129,7 +129,7 @@ endif + + # Capture code coverage data + code-coverage-capture: code-coverage-capture-hook +-ifdef CODE_COVERAGE_ENABLED ++ifeq ($(CODE_COVERAGE_ENABLED),yes) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp +@@ -142,11 +142,13 @@ endif + # Hook rule executed before code-coverage-capture, overridable by the user + code-coverage-capture-hook: + ++ifeq ($(CODE_COVERAGE_ENABLED),yes) + clean: code-coverage-clean + code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . -name "*.gcda" -o -name "*.gcov" -delete ++endif + + GITIGNOREFILES ?= + GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)