1 |
eva 09/10/29 21:25:57 |
2 |
|
3 |
Added: pango-1.26.0-lib64.patch |
4 |
pango-1.26.0-introspection-automagic.patch |
5 |
Log: |
6 |
New version for GNOME 2.28. Clean up old revisions. |
7 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-libs/pango/files/pango-1.26.0-lib64.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/pango/files/pango-1.26.0-lib64.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/pango/files/pango-1.26.0-lib64.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: pango-1.26.0-lib64.patch |
16 |
=================================================================== |
17 |
--- pango/Makefile.am |
18 |
+++ pango/Makefile.am |
19 |
@@ -16,6 +16,7 @@ |
20 |
-DPANGO_ENABLE_BACKEND \ |
21 |
-DPANGO_ENABLE_ENGINE \ |
22 |
-DSYSCONFDIR=\"$(sysconfdir)\" \ |
23 |
+ -DHOST=\"$(host_triplet)\" \ |
24 |
-DLIBDIR=\"$(libdir)\" \ |
25 |
-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ |
26 |
-DG_DISABLE_DEPRECATED \ |
27 |
--- pango/modules.c |
28 |
+++ pango/modules.c |
29 |
@@ -353,6 +353,7 @@ |
30 |
|
31 |
if (!file_str) |
32 |
file_str = g_build_filename (pango_get_sysconf_subdirectory (), |
33 |
+ HOST, |
34 |
"pango.modules", |
35 |
NULL); |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.1 x11-libs/pango/files/pango-1.26.0-introspection-automagic.patch |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/pango/files/pango-1.26.0-introspection-automagic.patch?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/pango/files/pango-1.26.0-introspection-automagic.patch?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: pango-1.26.0-introspection-automagic.patch |
46 |
=================================================================== |
47 |
Use the introspection.m4 macro for checking for introspection. Fixes automagic, |
48 |
and keeps variable name consistency across modules. |
49 |
|
50 |
--- |
51 |
--- configure.in |
52 |
+++ configure.in |
53 |
@@ -58,6 +58,7 @@ |
54 |
AM_INIT_AUTOMAKE(1.9 gnits dist-bzip2 no-dist-gzip -Wno-portability) |
55 |
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) |
56 |
AM_CONFIG_HEADER([config.h]) |
57 |
+AC_CONFIG_MACRO_DIR([m4]) |
58 |
|
59 |
|
60 |
PANGO_VERSION_MAJOR=pango_version_major() |
61 |
@@ -493,27 +494,7 @@ |
62 |
# |
63 |
# Checks for GObject Introspection |
64 |
# |
65 |
-have_introspection=false |
66 |
-PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.6.4, have_introspection=true, have_introspection=false) |
67 |
-AM_CONDITIONAL(HAVE_INTROSPECTION, $have_introspection) |
68 |
- |
69 |
-G_IR_SCANNER= |
70 |
-G_IR_COMPILER= |
71 |
-G_IR_GENERATE= |
72 |
-GIRDIR= |
73 |
-TYPELIBDIR= |
74 |
-if $have_introspection; then |
75 |
- G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
76 |
- G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
77 |
- G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
78 |
- GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
79 |
- TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
80 |
-fi |
81 |
-AC_SUBST(G_IR_SCANNER) |
82 |
-AC_SUBST(G_IR_COMPILER) |
83 |
-AC_SUBST(G_IR_GENERATE) |
84 |
-AC_SUBST(GIRDIR) |
85 |
-AC_SUBST(TYPELIBDIR) |
86 |
+GOBJECT_INTROSPECTION_CHECK(0.6.4) |
87 |
|
88 |
# |
89 |
# Modules to build |
90 |
--- m4/introspection.m4 |
91 |
+++ m4/introspection.m4 |
92 |
@@ -0,0 +1,92 @@ |
93 |
+dnl -*- mode: autoconf -*- |
94 |
+dnl Copyright 2009 Johan Dahlin |
95 |
+dnl |
96 |
+dnl This file is free software; the author(s) gives unlimited |
97 |
+dnl permission to copy and/or distribute it, with or without |
98 |
+dnl modifications, as long as this notice is preserved. |
99 |
+dnl |
100 |
+ |
101 |
+# serial 1 |
102 |
+ |
103 |
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
104 |
+[ |
105 |
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
106 |
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
107 |
+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
108 |
+ |
109 |
+ dnl enable/disable introspection |
110 |
+ m4_if([$2], [require], |
111 |
+ [dnl |
112 |
+ enable_introspection=yes |
113 |
+ ],[dnl |
114 |
+ AC_ARG_ENABLE(introspection, |
115 |
+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
116 |
+ [Enable introspection for this build]),, |
117 |
+ [enable_introspection=auto]) |
118 |
+ ])dnl |
119 |
+ |
120 |
+ AC_MSG_CHECKING([for gobject-introspection]) |
121 |
+ |
122 |
+ dnl presence/version checking |
123 |
+ AS_CASE([$enable_introspection], |
124 |
+ [no], [dnl |
125 |
+ found_introspection="no (disabled, use --enable-introspection to enable)" |
126 |
+ ],dnl |
127 |
+ [yes],[dnl |
128 |
+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
129 |
+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
130 |
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
131 |
+ found_introspection=yes, |
132 |
+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
133 |
+ ],dnl |
134 |
+ [auto],[dnl |
135 |
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
136 |
+ ],dnl |
137 |
+ [dnl |
138 |
+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
139 |
+ ])dnl |
140 |
+ |
141 |
+ AC_MSG_RESULT([$found_introspection]) |
142 |
+ |
143 |
+ INTROSPECTION_SCANNER= |
144 |
+ INTROSPECTION_COMPILER= |
145 |
+ INTROSPECTION_GENERATE= |
146 |
+ INTROSPECTION_GIRDIR= |
147 |
+ INTROSPECTION_TYPELIBDIR= |
148 |
+ if test "x$found_introspection" = "xyes"; then |
149 |
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
150 |
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
151 |
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
152 |
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
153 |
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
154 |
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
155 |
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
156 |
+ fi |
157 |
+ AC_SUBST(INTROSPECTION_SCANNER) |
158 |
+ AC_SUBST(INTROSPECTION_COMPILER) |
159 |
+ AC_SUBST(INTROSPECTION_GENERATE) |
160 |
+ AC_SUBST(INTROSPECTION_GIRDIR) |
161 |
+ AC_SUBST(INTROSPECTION_TYPELIBDIR) |
162 |
+ AC_SUBST(INTROSPECTION_CFLAGS) |
163 |
+ AC_SUBST(INTROSPECTION_LIBS) |
164 |
+ |
165 |
+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
166 |
+]) |
167 |
+ |
168 |
+ |
169 |
+dnl Usage: |
170 |
+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
171 |
+ |
172 |
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
173 |
+[ |
174 |
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
175 |
+]) |
176 |
+ |
177 |
+dnl Usage: |
178 |
+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
179 |
+ |
180 |
+ |
181 |
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
182 |
+[ |
183 |
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
184 |
+]) |
185 |
--- Makefile.am |
186 |
+++ Makefile.am |
187 |
@@ -2,6 +2,8 @@ |
188 |
|
189 |
SUBDIRS= pango modules pango-view examples docs tools tests |
190 |
|
191 |
+ACLOCAL_AMFLAGS = -I m4 -I . |
192 |
+ |
193 |
EXTRA_DIST = \ |
194 |
autogen.sh \ |
195 |
pango.pc.in \ |
196 |
--- pango/Makefile.am |
197 |
+++ pango/Makefile.am |
198 |
@@ -163,8 +163,8 @@ |
199 |
Pango-1.0.gir: $(libpango_1_0_la_SOURCES) |
200 |
Pango-1.0.gir: $(pango_headers) |
201 |
Pango-1.0.gir: libpango-1.0.la |
202 |
-Pango-1.0.gir: $(G_IR_SCANNER) Makefile |
203 |
- $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \ |
204 |
+Pango-1.0.gir: $(INTROSPECTION_SCANNER) Makefile |
205 |
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace Pango --nsversion=1.0 \ |
206 |
--add-include-path=$(srcdir) --add-include-path=. \ |
207 |
--include=GObject-2.0 \ |
208 |
--include=cairo-1.0 \ |
209 |
@@ -278,8 +278,8 @@ |
210 |
PangoFT2-1.0.gir: $(pangoft2_headers) |
211 |
PangoFT2-1.0.gir: $(libpangoft2_1_0_la_SOURCES) |
212 |
PangoFT2-1.0.gir: libpangoft2-1.0.la |
213 |
-PangoFT2-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER) Makefile |
214 |
- $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \ |
215 |
+PangoFT2-1.0.gir: Pango-1.0.gir $(INTROSPECTION_SCANNER) Makefile |
216 |
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \ |
217 |
--add-include-path=$(srcdir) --add-include-path=. \ |
218 |
--include=GObject-2.0 \ |
219 |
--include=Pango-1.0 \ |
220 |
@@ -335,8 +335,8 @@ |
221 |
PangoXft-1.0.gir: $(pangoxft_headers) |
222 |
PangoXft-1.0.gir: $(libpangoxft_1_0_la_SOURCES) |
223 |
PangoXft-1.0.gir: libpangoxft-1.0.la |
224 |
-PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER) Makefile |
225 |
- $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \ |
226 |
+PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(INTROSPECTION_SCANNER) Makefile |
227 |
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace PangoXft --nsversion=1.0 \ |
228 |
--add-include-path=$(srcdir) --add-include-path=. \ |
229 |
--include=GObject-2.0 \ |
230 |
--include=xft-2.0 \ |
231 |
@@ -424,8 +424,8 @@ |
232 |
PangoCairo-1.0.gir: $(libpangocairo_1_0_la_SOURCES) |
233 |
PangoCairo-1.0.gir: $(pangocairo_headers) |
234 |
PangoCairo-1.0.gir: libpangocairo-1.0.la |
235 |
-PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir $(G_IR_SCANNER) Makefile |
236 |
- $(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \ |
237 |
+PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir $(INTROSPECTION_SCANNER) Makefile |
238 |
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \ |
239 |
--add-include-path=$(srcdir) --add-include-path=. \ |
240 |
--include=GObject-2.0 \ |
241 |
--include=cairo-1.0 \ |
242 |
@@ -551,14 +551,14 @@ |
243 |
|
244 |
if HAVE_INTROSPECTION |
245 |
|
246 |
-girdir = $(GIRDIR) |
247 |
+girdir = $(INTROSPECTION_GIRDIR) |
248 |
gir_DATA = $(BUILT_GIRSOURCES) |
249 |
|
250 |
-typelibsdir = $(TYPELIBDIR) |
251 |
+typelibsdir = $(INTROSPECTION_TYPELIBDIR) |
252 |
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
253 |
|
254 |
-%.typelib: %.gir $(G_IR_COMPILER) |
255 |
- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F) |
256 |
+%.typelib: %.gir $(INTROSPECTION_COMPILER) |
257 |
+ $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F) |
258 |
|
259 |
endif # HAVE_INTROSPECTION |