From 09b2f24fba94ca23a1c040aeb3864c4a8cb96a36 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 19 Dec 2014 09:54:24 +0100 Subject: [PATCH] gnome-common: update to 3.14.0. --- srcpkgs/gnome-common/patches/git-fixes.patch | 75 -------------------- srcpkgs/gnome-common/template | 10 +-- 2 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 srcpkgs/gnome-common/patches/git-fixes.patch diff --git a/srcpkgs/gnome-common/patches/git-fixes.patch b/srcpkgs/gnome-common/patches/git-fixes.patch deleted file mode 100644 index 8d0a585748e..00000000000 --- a/srcpkgs/gnome-common/patches/git-fixes.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh -index 5da964e..be70371 100644 ---- macros2/gnome-autogen.sh -+++ 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 ---- macros2/gnome-code-coverage.m4 -+++ 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) diff --git a/srcpkgs/gnome-common/template b/srcpkgs/gnome-common/template index a661dc5e7ed..082f0948582 100644 --- a/srcpkgs/gnome-common/template +++ b/srcpkgs/gnome-common/template @@ -1,8 +1,8 @@ # Template file for 'gnome-common' pkgname=gnome-common -version=3.7.4 -revision=3 -noarch="yes" +version=3.14.0 +revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="automake" depends="automake" @@ -10,5 +10,5 @@ short_desc="Common scripts and macros to develop with GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -distfiles="${GNOME_SITE}/${pkgname}/3.7/${pkgname}-${version}.tar.xz" -checksum=2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c