pool/gtk2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 591653 from home:dimstar:Factory

Browse Source 
- Add 0001-build-support-automake-1.16.patch: Support automake
  1.16.

OBS-URL: https://build.opensuse.org/request/show/591653
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=266
This commit is contained in:
Dominique Leuenberger 2018-03-28 13:07:29 +00:00 committed by Git OBS Bridge
parent a587ea2459
commit 59d0e3525c
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-build-support-automake-1.16.patch Normal file
View File

@ -0,0 +1,47 @@
From 2dbf31c0ea4f17a817b931c731f8de14c278300d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 27 Mar 2018 16:24:02 +0200
Subject: [PATCH] build: support automake 1.16
---
autogen.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 078f483f5a..63e2d5c495 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
--
2.16.2

6
gtk2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 27 14:29:49 UTC 2018 - dimstar@opensuse.org
- Add 0001-build-support-automake-1.16.patch: Support automake
1.16.
-------------------------------------------------------------------
Tue Mar 20 17:13:36 UTC 2018 - dimstar@opensuse.org

3
gtk2.spec
View File

@ -51,6 +51,8 @@ Patch6: gtk2-bgo743166-remember-printing-authentication.patch
Patch7: gtk2-converter-python3.patch
# PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch olh@opensuse.org -- Have gtp-update-icon-cache sort the file list before producing a cache
Patch8: gtk2-updateiconcache_sort.patch
# PATCH-FIX-UPSTREAM 0001-build-support-automake-1.16.patch dimstar@opensuse.org -- Support automake 1.16
Patch9: 0001-build-support-automake-1.16.patch
BuildRequires: atk-devel
BuildRequires: cairo-devel
BuildRequires: cups-devel
@ -326,6 +328,7 @@ cp -a %{SOURCE2} .
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
gnome-patch-translation-update
%build