Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/pango/files: pango-1.30.1-AM_CONFIG_HEADER.patch pango-1.32.5-AM_CONFIG_HEADER.patch
Date: Tue, 30 Apr 2013 14:04:23
Message-Id: 20130430140419.BD0DB2171E@flycatcher.gentoo.org
1 tetromino 13/04/30 14:04:19
2
3 Added: pango-1.30.1-AM_CONFIG_HEADER.patch
4 pango-1.32.5-AM_CONFIG_HEADER.patch
5 Log:
6 Fix build failure with automake-1.13 (bug #467126, thanks to Alexandre et al.)
7
8 (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
9
10 Revision Changes Path
11 1.1 x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch?rev=1.1&content-type=text/plain
15
16 Index: pango-1.30.1-AM_CONFIG_HEADER.patch
17 ===================================================================
18 From 51f952a6e018049d4b52bbd419653745cf1aaab3 Mon Sep 17 00:00:00 2001
19 From: Behdad Esfahbod <behdad@××××××.org>
20 Date: Sun, 6 Jan 2013 23:15:44 -0600
21 Subject: [PATCH] Bug 691263 - Build with automake-1.13 broken
22
23 Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS.
24 automake-1.13 errors out upon seeing former.
25
26 Signed-off-by: Marko Lindqvist <cazfi74@×××××.com>
27 ---
28 configure.in | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31 diff --git a/configure.in b/configure.in
32 index 8362280..dcd115e 100644
33 --- a/configure.in
34 +++ b/configure.in
35 @@ -54,7 +54,7 @@ dnl -Wno-portability tells automake to stop complaining about the
36 dnl usage of GNU Make specific features.
37 AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability)
38 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
39 -AM_CONFIG_HEADER([config.h])
40 +AC_CONFIG_HEADERS([config.h])
41
42
43 PANGO_VERSION_MAJOR=pango_version_major()
44 --
45 1.8.2.1
46
47
48
49
50 1.1 x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch?rev=1.1&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch?rev=1.1&content-type=text/plain
54
55 Index: pango-1.32.5-AM_CONFIG_HEADER.patch
56 ===================================================================
57 From f45cdd9a4fef1096b071e6bad4cc40e06f48ba46 Mon Sep 17 00:00:00 2001
58 From: Behdad Esfahbod <behdad@××××××.org>
59 Date: Sun, 6 Jan 2013 23:15:44 -0600
60 Subject: [PATCH] Bug 691263 - Build with automake-1.13 broken
61
62 Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS.
63 automake-1.13 errors out upon seeing former.
64
65 Signed-off-by: Marko Lindqvist <cazfi74@×××××.com>
66 ---
67 configure.ac | 2 +-
68 1 file changed, 1 insertion(+), 1 deletion(-)
69
70 diff --git a/configure.ac b/configure.ac
71 index bb37a60..7ed2832 100644
72 --- a/configure.ac
73 +++ b/configure.ac
74 @@ -54,7 +54,7 @@ dnl -Wno-portability tells automake to stop complaining about the
75 dnl usage of GNU Make specific features.
76 AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability)
77 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
78 -AM_CONFIG_HEADER([config.h])
79 +AC_CONFIG_HEADERS([config.h])
80
81
82 PANGO_VERSION_MAJOR=pango_version_major()
83 --
84 1.8.2.1