OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jun-2006 14:34:21
Branch: HEAD Handle: 2006061913342001
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
resolve conflict of ftglue.c (allows FreeType 1 code to access
FreeType 2 API) code which exists in both Pango and Fontconfig by
renaming the symbols in Pango's local copy
Summary:
Revision Changes Path
1.13 +59 -11 openpkg-src/pango/pango.patch
1.56 +7 -1 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 pango.patch
--- openpkg-src/pango/pango.patch 22 May 2006 09:07:34 -0000 1.12
+++ openpkg-src/pango/pango.patch 19 Jun 2006 12:34:20 -0000 1.13
@@ -1,6 +1,6 @@
Index: Makefile.in
---- Makefile.in.orig 2006-04-27 06:05:33 +0200
-+++ Makefile.in 2006-05-22 10:58:59 +0200
+--- Makefile.in.orig 2006-05-27 00:43:15 +0200
++++ Makefile.in 2006-06-19 10:02:23 +0200
@@ -286,7 +286,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -12,7 +12,7 @@
autogen.sh \
Index: pango.pc.in
--- pango.pc.in.orig 2005-01-09 01:30:45 +0100
-+++ pango.pc.in 2006-05-22 10:58:59 +0200
++++ pango.pc.in 2006-06-19 10:02:23 +0200
@@ -10,5 +10,5 @@
Version: @VERSION@
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
@@ -21,8 +21,8 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
Index: pango/Makefile.in
---- pango/Makefile.in.orig 2006-04-27 06:05:59 +0200
-+++ pango/Makefile.in 2006-05-22 10:58:59 +0200
+--- pango/Makefile.in.orig 2006-05-27 00:43:44 +0200
++++ pango/Makefile.in 2006-06-19 10:03:38 +0200
@@ -356,7 +356,7 @@
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
@@ -32,9 +32,57 @@
@[EMAIL PROTECTED] = -lm
+@@ -437,10 +437,7 @@
+ libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
+ libpangox_1_0_la_LIBADD = \
+ libpango-$(PANGO_API_VERSION).la \
+- $(INCLUDED_X_MODULES) \
+- $(GLIB_LIBS) \
+- $(X_LIBS) \
+- $(X_EXTRA_LIBS)
++ $(INCLUDED_X_MODULES)
+
+ libpangox_1_0_la_DEPENDENCIES = \
+ libpango-$(PANGO_API_VERSION).la \
+@@ -459,10 +456,7 @@
+ libpangoft2_1_0_la_LIBADD = \
+ opentype/libmini-harfbuzz.la \
+ libpango-$(PANGO_API_VERSION).la \
+- $(INCLUDED_FC_MODULES) \
+- $(GLIB_LIBS) \
+- $(FREETYPE_LIBS) \
+- $(libm)
++ $(INCLUDED_FC_MODULES)
+
+ libpangoft2_1_0_la_DEPENDENCIES = \
+ opentype/libmini-harfbuzz.la \
+@@ -490,10 +484,7 @@
+ libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
+ libpangoxft_1_0_la_LIBADD = \
+ libpangoft2-$(PANGO_API_VERSION).la \
+- libpango-$(PANGO_API_VERSION).la \
+- $(GLIB_LIBS) \
+- $(XFT_LIBS) \
+- $(libm)
++ libpango-$(PANGO_API_VERSION).la
+
+ libpangoxft_1_0_la_DEPENDENCIES = \
+ libpangoft2-$(PANGO_API_VERSION).la \
+@@ -508,10 +499,7 @@
+
+ libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_13)
+ libpangocairo_1_0_la_LIBADD = \
+- libpango-$(PANGO_API_VERSION).la \
+- $(GLIB_LIBS) \
+- $(CAIRO_LIBS) \
+- $(libm)\
++ libpango-$(PANGO_API_VERSION).la \
+ $(am__append_15) $(am__append_17)
+ libpangocairo_1_0_la_DEPENDENCIES = \
+ libpango-$(PANGO_API_VERSION).la\
Index: pango/opentype/Makefile.in
---- pango/opentype/Makefile.in.orig 2006-04-27 06:06:06 +0200
-+++ pango/opentype/Makefile.in 2006-05-22 10:58:59 +0200
+--- pango/opentype/Makefile.in.orig 2006-05-27 00:43:46 +0200
++++ pango/opentype/Makefile.in 2006-06-19 10:02:23 +0200
@@ -311,7 +311,6 @@
libmini_harfbuzz_la_LIBADD = \
$(x_ldflags) \
@@ -45,7 +93,7 @@
Index: pango/querymodules.c
--- pango/querymodules.c.orig 2006-02-15 06:39:20 +0100
-+++ pango/querymodules.c 2006-05-22 10:58:59 +0200
++++ pango/querymodules.c 2006-06-19 10:02:23 +0200
@@ -240,7 +240,6 @@
path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
@@ -56,7 +104,7 @@
Index: pangoft2.pc.in
--- pangoft2.pc.in.orig 2002-06-06 21:28:19 +0200
-+++ pangoft2.pc.in 2006-05-22 10:58:59 +0200
++++ pangoft2.pc.in 2006-06-19 10:02:23 +0200
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -66,7 +114,7 @@
Index: pangox.pc.in
--- pangox.pc.in.orig 2002-03-05 18:20:57 +0100
-+++ pangox.pc.in 2006-05-22 10:58:59 +0200
++++ pangox.pc.in 2006-06-19 10:02:23 +0200
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -76,7 +124,7 @@
Index: pangoxft.pc.in
--- pangoxft.pc.in.orig 2005-06-15 00:32:46 +0200
-+++ pangoxft.pc.in 2006-05-22 10:58:59 +0200
++++ pangoxft.pc.in 2006-06-19 10:02:23 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 pango.spec
--- openpkg-src/pango/pango.spec 28 May 2006 07:55:50 -0000 1.55
+++ openpkg-src/pango/pango.spec 19 Jun 2006 12:34:21 -0000 1.56
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: %{V_pango}
-Release: 20060528
+Release: 20060619
# list of sources
Source0:
ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -83,6 +83,12 @@
-e '/moduledir =/s;/\$(PANGO_MODULE_VERSION);;g' \
Makefile.in */Makefile.in */*/Makefile.in \
pango\*.pc.in
+ %{l_shtool} subst \
+ -e 's;ftglue_;pango_ftglue_;g' \
+ pango/opentype/ftglue.[ch] \
+ pango/opentype/ftxgdef.c \
+ pango/opentype/ftxgpos.c \
+ pango/opentype/ftxgsub.c
%build
( echo "ac_cv_lib_cairo_cairo_ft_scaled_font_lock_face=yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
