head 1.22; access; symbols OPENPKG_E1_MP_HEAD:1.14 OPENPKG_E1_MP:1.14 OPENPKG_E1_MP_2_STABLE:1.13.2.1 OPENPKG_E1_FP:1.13.2.1 OPENPKG_2_STABLE_MP:1.14 OPENPKG_2_STABLE_20061018:1.13.2.1 OPENPKG_2_STABLE_20060622:1.13 OPENPKG_2_STABLE:1.13.0.2 OPENPKG_2_STABLE_BP:1.13 OPENPKG_2_5_RELEASE:1.11 OPENPKG_2_5_SOLID:1.11.0.2 OPENPKG_2_5_SOLID_BP:1.11 OPENPKG_2_4_RELEASE:1.8 OPENPKG_2_4_SOLID:1.8.0.2 OPENPKG_2_4_SOLID_BP:1.8 OPENPKG_CW_FP:1.8 OPENPKG_2_3_RELEASE:1.7 OPENPKG_2_3_SOLID:1.7.0.2 OPENPKG_2_3_SOLID_BP:1.7 OPENPKG_2_2_RELEASE:1.6 OPENPKG_2_2_SOLID:1.6.0.4 OPENPKG_2_2_SOLID_BP:1.6 OPENPKG_2_1_RELEASE:1.6 OPENPKG_2_1_SOLID:1.6.0.2 OPENPKG_2_1_SOLID_BP:1.6 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3 OPENPKG_1_3_RELEASE:1.2.2.1 OPENPKG_1_3_SOLID:1.2.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.2.2.1 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_MP:1.2; locks; strict; comment @# @; 1.22 date 2009.09.10.18.42.03; author rse; state Exp; branches; next 1.21; commitid IDty8j84V8KRda3u; 1.21 date 2009.03.18.17.38.23; author rse; state Exp; branches; next 1.20; commitid 6SVcthu5OYFLwxGt; 1.20 date 2008.10.16.14.39.55; author rse; state Exp; branches; next 1.19; commitid bYJOXL2KhpissRmt; 1.19 date 2008.09.27.13.40.55; author rse; state Exp; branches; next 1.18; commitid 02Q8zupgpJv5Kpkt; 1.18 date 2008.09.07.17.41.30; author rse; state Exp; branches; next 1.17; commitid w6tXYD9LOwBtIRht; 1.17 date 2008.04.24.06.21.40; author rse; state Exp; branches; next 1.16; commitid dLc4UL7tc9Dhkk0t; 1.16 date 2007.09.30.09.14.50; author rse; state Exp; branches; next 1.15; commitid 1S6U0cSXw7TdWJzs; 1.15 date 2007.02.28.10.00.25; author rse; state Exp; branches; next 1.14; commitid i5KBtpmsX1Tk4f8s; 1.14 date 2006.10.17.08.47.24; author rse; state Exp; branches; next 1.13; commitid Cluv1kBMMozkY0Rr; 1.13 date 2006.06.19.12.34.20; author rse; state Exp; branches 1.13.2.1; next 1.12; commitid MYB29fCXOMCj5CBr; 1.12 date 2006.05.22.09.07.34; author rse; state Exp; branches; next 1.11; commitid ICVe9wxMAhgcQZxr; 1.11 date 2005.09.03.09.40.16; author mk; state Exp; branches; next 1.10; 1.10 date 2005.08.20.21.54.34; author rse; state Exp; branches; next 1.9; 1.9 date 2005.08.02.19.15.49; author thl; state Exp; branches; next 1.8; 1.8 date 2005.03.05.08.32.22; author rse; state Exp; branches; next 1.7; 1.7 date 2004.12.24.18.38.33; author rse; state Exp; branches; next 1.6; 1.6 date 2004.04.06.13.44.01; author rse; state Exp; branches; next 1.5; 1.5 date 2004.04.06.06.52.51; author rse; state Exp; branches; next 1.4; 1.4 date 2004.03.22.08.06.36; author tho; state Exp; branches; next 1.3; 1.3 date 2003.11.16.12.08.00; author rse; state Exp; branches; next 1.2; 1.2 date 2003.05.31.10.38.50; author rse; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2003.05.09.14.50.26; author mlelstv; state Exp; branches; next ; 1.13.2.1 date 2006.10.17.09.25.04; author rse; state Exp; branches; next ; commitid WUO2iSVwjqbgb1Rr; 1.2.2.1 date 2003.07.24.20.50.17; author rse; state Exp; branches; next ; desc @@ 1.22 log @upgrading package: pango 1.24.5 -> 1.25.6 @ text @Index: Makefile.in --- Makefile.in.orig 2009-09-08 17:43:10 +0200 +++ Makefile.in 2009-09-10 20:35:07 +0200 @@@@ -324,7 +324,7 @@@@ top_build_prefix = @@top_build_prefix@@ top_builddir = @@top_builddir@@ top_srcdir = @@top_srcdir@@ -SUBDIRS = pango modules pango-view examples docs tools tests +SUBDIRS = pango modules pango-view docs tools tests EXTRA_DIST = \ autogen.sh \ pango.pc.in \ Index: pango.pc.in --- pango.pc.in.orig 2009-02-07 00:49:34 +0100 +++ pango.pc.in 2009-09-10 20:35:07 +0200 @@@@ -10,4 +10,4 @@@@ Version: @@VERSION@@ Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0 Libs: -L${libdir} -lpango-@@PANGO_API_VERSION@@ @@PKGCONFIG_MATH_LIBS@@ -Cflags: -I${includedir}/pango-1.0 +Cflags: -I${includedir}/pango-1.0 -I${includedir} Index: pango/Makefile.in --- pango/Makefile.in.orig 2009-09-08 17:43:09 +0200 +++ pango/Makefile.in 2009-09-10 20:35:42 +0200 @@@@ -535,7 +535,7 @@@@ $(X_CFLAGS) BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h -pangoincludedir = $(includedir)/pango-1.0/pango +pangoincludedir = $(includedir)/pango @@OS_WIN32_FALSE@@libm = -lm # ------------------- libpango ------------------- @@@@ -619,10 +619,7 @@@@ libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_5) 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 \ $(INCLUDED_X_MODULES) $(am__append_6) @@@@ -652,10 +649,7 @@@@ libpangoft2_1_0_la_LIBADD = \ opentype/libharfbuzz.la \ libpango-$(PANGO_API_VERSION).la \ - $(INCLUDED_FC_MODULES) \ - $(GLIB_LIBS) \ - $(FREETYPE_LIBS) \ - $(libm) + $(INCLUDED_FC_MODULES) libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz.la \ libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \ @@@@ -680,12 +674,7 @@@@ $(am__append_15) libpangoxft_1_0_la_LIBADD = \ libpangoft2-$(PANGO_API_VERSION).la \ - libpango-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) \ - $(X_LIBS) \ - $(XFT_LIBS) \ - $(FREETYPE_LIBS) \ - $(libm) + libpango-$(PANGO_API_VERSION).la libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la \ libpango-$(PANGO_API_VERSION).la $(am__append_16) @@@@ -699,7 +688,7 @@@@ libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \ $(am__append_20) $(am__append_30) libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_22) \ + $(CAIRO_LIBS) $(libm) $(am__append_22) \ $(am__append_25) $(am__append_31) libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \ $(am__append_21) $(am__append_23) $(am__append_26) Index: pango/querymodules.c --- pango/querymodules.c.orig 2009-08-28 19:10:40 +0200 +++ pango/querymodules.c 2009-09-10 20:35:07 +0200 @@@@ -240,7 +240,6 @@@@ path = pango_config_key_get ("Pango/ModulesPath"); if (!path) path = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, "modules", NULL); Index: pangoft2.pc.in --- pangoft2.pc.in.orig 2009-02-07 00:49:34 +0100 +++ pangoft2.pc.in 2009-09-10 20:35:07 +0200 @@@@ -8,4 +8,4 @@@@ Version: @@VERSION@@ Requires: pango freetype2 fontconfig Libs: -L${libdir} -lpangoft2-@@PANGO_API_VERSION@@ -Cflags: -I${includedir}/pango-1.0 +Cflags: -I${includedir}/pango-1.0 -I${includedir} Index: pangox.pc.in --- pangox.pc.in.orig 2009-02-07 00:49:34 +0100 +++ pangox.pc.in 2009-09-10 20:35:07 +0200 @@@@ -8,4 +8,4 @@@@ Version: @@VERSION@@ Requires: pango Libs: -L${libdir} -lpangox-@@PANGO_API_VERSION@@ @@X_LIBS@@ -Cflags: -I${includedir}/pango-1.0 @@X_CFLAGS@@ +Cflags: -I${includedir}/pango-1.0 -I${includedir} @@X_CFLAGS@@ Index: pangoxft.pc.in --- pangoxft.pc.in.orig 2009-02-07 00:49:34 +0100 +++ pangoxft.pc.in 2009-09-10 20:35:07 +0200 @@@@ -8,4 +8,4 @@@@ Version: @@VERSION@@ Requires: pango pangoft2 xft Libs: -L${libdir} -lpangoxft-@@PANGO_API_VERSION@@ -Cflags: -I${includedir}/pango-1.0 +Cflags: -I${includedir}/pango-1.0 -I${includedir} @ 1.21 log @upgrading package: pango 1.22.4 -> 1.24.0 @ text @d2 3 a4 3 --- Makefile.in.orig 2009-03-16 23:35:05 +0100 +++ Makefile.in 2009-03-18 18:31:21 +0100 @@@@ -272,7 +272,7 @@@@ d15 1 a15 1 +++ pango.pc.in 2009-03-18 18:31:21 +0100 d23 3 a25 3 --- pango/Makefile.in.orig 2009-03-16 23:35:04 +0100 +++ pango/Makefile.in 2009-03-18 18:33:29 +0100 @@@@ -461,7 +461,7 @@@@ d34 2 a35 2 @@@@ -544,10 +544,7 @@@@ libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) d44 3 a46 3 libpangox_1_0_la_DEPENDENCIES = \ libpango-$(PANGO_API_VERSION).la \ @@@@ -579,10 +576,7 @@@@ d48 1 a48 1 opentype/libharfbuzz-1.la \ d56 1 a56 1 libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \ d58 2 a59 2 @@@@ -606,12 +600,7 @@@@ libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) d70 3 a72 3 libpangoxft_1_0_la_DEPENDENCIES = \ libpangoft2-$(PANGO_API_VERSION).la \ @@@@ -627,7 +616,7 @@@@ d74 1 a74 1 $(am__append_17) $(am__append_27) d76 3 a78 3 - $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_19) \ + $(CAIRO_LIBS) $(libm) $(am__append_19) \ $(am__append_22) $(am__append_28) d80 1 a80 1 $(am__append_18) $(am__append_20) $(am__append_23) d82 2 a83 2 --- pango/querymodules.c.orig 2009-02-07 00:49:34 +0100 +++ pango/querymodules.c 2009-03-18 18:31:21 +0100 d94 1 a94 1 +++ pangoft2.pc.in 2009-03-18 18:31:21 +0100 d103 1 a103 1 +++ pangox.pc.in 2009-03-18 18:31:21 +0100 d112 1 a112 1 +++ pangoxft.pc.in 2009-03-18 18:31:21 +0100 @ 1.20 log @upgrading package: pango 1.21.6 -> 1.22.0 @ text @d2 3 a4 3 --- Makefile.in.orig 2008-08-26 20:28:50 +0200 +++ Makefile.in 2008-09-07 19:37:53 +0200 @@@@ -260,7 +260,7 @@@@ d14 2 a15 2 --- pango.pc.in.orig 2008-07-05 20:34:52 +0200 +++ pango.pc.in 2008-09-07 19:37:53 +0200 d23 3 a25 3 --- pango/Makefile.in.orig 2008-08-26 20:28:49 +0200 +++ pango/Makefile.in 2008-09-07 19:38:23 +0200 @@@@ -437,7 +437,7 @@@@ d34 1 a34 1 @@@@ -518,10 +518,7 @@@@ d46 1 a46 1 @@@@ -540,10 +537,7 @@@@ d58 1 a58 1 @@@@ -569,12 +563,7 @@@@ d72 1 a72 1 @@@@ -589,7 +578,7 @@@@ d74 1 a74 1 $(am__append_13) $(am__append_23) d76 3 a78 3 - $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_15) \ + $(CAIRO_LIBS) $(libm) $(am__append_15) \ $(am__append_18) $(am__append_24) d80 1 a80 1 $(am__append_14) $(am__append_16) $(am__append_19) d82 2 a83 2 --- pango/querymodules.c.orig 2008-07-05 20:34:52 +0200 +++ pango/querymodules.c 2008-09-07 19:37:53 +0200 d93 2 a94 2 --- pangoft2.pc.in.orig 2008-07-05 20:34:52 +0200 +++ pangoft2.pc.in 2008-09-07 19:37:53 +0200 d102 2 a103 2 --- pangox.pc.in.orig 2008-07-05 20:34:52 +0200 +++ pangox.pc.in 2008-09-07 19:37:53 +0200 d111 2 a112 2 --- pangoxft.pc.in.orig 2008-07-05 20:34:52 +0200 +++ pangoxft.pc.in 2008-09-07 19:37:53 +0200 @ 1.19 log @latest cairo has renamed function @ text @a118 12 Index: pango/pangocairo-render.c --- pango/pangocairo-render.c.orig 2008-08-06 11:13:59 +0200 +++ pango/pangocairo-render.c 2008-09-26 23:00:06 +0200 @@@@ -710,7 +710,7 @@@@ cairo_get_current_point (renderer->cr, &renderer->x_offset, &renderer->y_offset); /* abuse save_current_point() to cache cairo_has_show_text_glyphs() result */ - renderer->has_show_text_glyphs = cairo_has_show_text_glyphs (renderer->cr); + renderer->has_show_text_glyphs = INT_cairo_surface_cairo_has_show_text_glyphs (renderer->cr); } static void @ 1.18 log @upgrading package: pango 1.20.5 -> 1.21.5 @ text @d119 12 @ 1.17 log @upgrading package: pango 1.18.4 -> 1.20.2 @ text @d2 4 a5 4 --- Makefile.in.orig 2008-04-09 21:04:21 +0200 +++ Makefile.in 2008-04-24 08:01:58 +0200 @@@@ -256,7 +256,7 @@@@ target_alias = @@target_alias@@ d14 2 a15 2 --- pango.pc.in.orig 2008-01-29 23:26:57 +0100 +++ pango.pc.in 2008-04-24 08:17:21 +0200 d23 3 a25 3 --- pango/Makefile.in.orig 2008-04-09 21:04:19 +0200 +++ pango/Makefile.in 2008-04-24 08:19:15 +0200 @@@@ -432,7 +432,7 @@@@ d34 1 a34 1 @@@@ -511,10 +511,7 @@@@ d46 1 a46 1 @@@@ -533,10 +530,7 @@@@ d58 1 a58 1 @@@@ -562,11 +556,7 @@@@ d66 1 d72 1 a72 1 @@@@ -581,7 +571,7 @@@@ d82 2 a83 2 --- pango/querymodules.c.orig 2007-07-05 23:30:24 +0200 +++ pango/querymodules.c 2008-04-24 08:01:58 +0200 d93 2 a94 2 --- pangoft2.pc.in.orig 2008-01-29 23:26:29 +0100 +++ pangoft2.pc.in 2008-04-24 08:17:51 +0200 d102 2 a103 2 --- pangox.pc.in.orig 2008-01-29 23:34:09 +0100 +++ pangox.pc.in 2008-04-24 08:18:08 +0200 d111 2 a112 2 --- pangoxft.pc.in.orig 2008-01-29 23:00:57 +0100 +++ pangoxft.pc.in 2008-04-24 08:18:23 +0200 @ 1.16 log @upgrading package: pango 1.16.4 -> 1.18.0 @ text @d2 3 a4 3 --- Makefile.in.orig 2007-08-21 05:06:04 +0200 +++ Makefile.in 2007-09-30 11:11:50 +0200 @@@@ -260,7 +260,7 @@@@ d14 3 a16 3 --- pango.pc.in.orig 2007-07-05 23:30:28 +0200 +++ pango.pc.in 2007-09-30 11:11:26 +0200 @@@@ -10,5 +10,5 @@@@ a21 1 d23 3 a25 3 --- pango/Makefile.in.orig 2007-08-21 05:06:03 +0200 +++ pango/Makefile.in 2007-09-30 11:11:26 +0200 @@@@ -434,7 +434,7 @@@@ d34 1 a34 1 @@@@ -513,10 +513,7 @@@@ d46 1 a46 1 @@@@ -535,10 +532,7 @@@@ d58 1 a58 1 @@@@ -564,11 +558,7 @@@@ d71 1 a71 1 @@@@ -583,7 +573,7 @@@@ d76 2 a77 2 + $(libm) $(CAIRO_LIBS) $(libm) $(am__append_15) \ $(am__append_18) d82 1 a82 1 +++ pango/querymodules.c 2007-09-30 11:11:26 +0200 d92 3 a94 3 --- pangoft2.pc.in.orig 2007-07-05 23:30:28 +0200 +++ pangoft2.pc.in 2007-09-30 11:11:26 +0200 @@@@ -8,5 +8,5 @@@@ d96 4 a99 5 Requires: pango Libs: -L${libdir} -lpangoft2-@@PANGO_API_VERSION@@ @@PKGCONFIG_FREETYPE_LIBS@@ -Cflags: -I${includedir}/pango-1.0 @@FONTCONFIG_CFLAGS@@ @@FREETYPE_CFLAGS@@ +Cflags: -I${includedir}/pango-1.0 -I${includedir} @@FONTCONFIG_CFLAGS@@ @@FREETYPE_CFLAGS@@ d101 3 a103 3 --- pangox.pc.in.orig 2007-07-05 23:30:28 +0200 +++ pangox.pc.in 2007-09-30 11:11:26 +0200 @@@@ -8,5 +8,5 @@@@ d106 1 a106 1 Libs: -L${libdir} -lpangox-@@PANGO_API_VERSION@@ @@PKGCONFIG_X_LIBS@@ a108 1 d110 2 a111 2 --- pangoxft.pc.in.orig 2007-07-05 23:30:28 +0200 +++ pangoxft.pc.in 2007-09-30 11:11:26 +0200 d114 4 a117 4 Requires: pango pangoft2 Libs: -L${libdir} -lpangoxft-@@PANGO_API_VERSION@@ @@PKGCONFIG_XFT_LIBS@@ -Cflags: -I${includedir}/pango-1.0 @@XFT_CFLAGS@@ +Cflags: -I${includedir}/pango-1.0 -I${includedir} @@XFT_CFLAGS@@ @ 1.15 log @upgrading package: pango 1.14.10 -> 1.16.0 @ text @d2 3 a4 5 --- Makefile.in.orig 2007-02-26 20:13:26 +0100 +++ Makefile.in 2007-02-28 10:45:20 +0100 @@@@ -365,7 +365,7 @@@@ sharedstatedir = @@sharedstatedir@@ sysconfdir = @@sysconfdir@@ d6 2 d14 2 a15 2 --- pango.pc.in.orig 2007-01-03 09:15:05 +0100 +++ pango.pc.in 2007-02-28 10:42:40 +0100 d24 3 a26 3 --- pango/Makefile.in.orig 2007-02-26 20:13:25 +0100 +++ pango/Makefile.in 2007-02-28 10:44:54 +0100 @@@@ -523,7 +523,7 @@@@ d35 1 a35 1 @@@@ -601,10 +601,7 @@@@ d47 1 a47 1 @@@@ -623,10 +620,7 @@@@ d59 1 a59 1 @@@@ -651,11 +645,7 @@@@ d72 1 a72 1 @@@@ -670,7 +660,7 @@@@ d74 1 a74 1 $(am__append_13) $(am__append_22) d82 2 a83 2 --- pango/querymodules.c.orig 2007-01-23 00:41:43 +0100 +++ pango/querymodules.c 2007-02-28 10:42:40 +0100 d93 2 a94 2 --- pangoft2.pc.in.orig 2007-01-03 09:15:05 +0100 +++ pangoft2.pc.in 2007-02-28 10:42:40 +0100 d103 2 a104 2 --- pangox.pc.in.orig 2007-01-03 09:15:05 +0100 +++ pangox.pc.in 2007-02-28 10:42:40 +0100 d113 2 a114 2 --- pangoxft.pc.in.orig 2007-01-03 09:15:05 +0100 +++ pangoxft.pc.in 2007-02-28 10:42:40 +0100 @ 1.14 log @upgrading package: pango 1.12.3 -> 1.14.7 @ text @d2 3 a4 3 --- Makefile.in.orig 2006-10-13 19:51:14 +0200 +++ Makefile.in 2006-10-17 10:46:09 +0200 @@@@ -356,7 +356,7 @@@@ d8 2 a9 2 -SUBDIRS = pango modules examples docs tools tests +SUBDIRS = pango modules docs tools tests d14 2 a15 2 --- pango.pc.in.orig 2005-01-09 01:30:45 +0100 +++ pango.pc.in 2006-10-17 10:46:09 +0200 d24 3 a26 3 --- pango/Makefile.in.orig 2006-10-13 19:51:13 +0200 +++ pango/Makefile.in 2006-10-17 10:46:09 +0200 @@@@ -516,7 +516,7 @@@@ d29 1 a29 1 BUILT_SOURCES = pango-enum-types.h pango-enum-types.c d31 1 a31 1 +pangoincludedir = $(includedir)/pango-1.0 d35 1 a35 1 @@@@ -593,10 +593,7 @@@@ d47 1 a47 1 @@@@ -615,10 +612,7 @@@@ d59 1 a59 1 @@@@ -643,10 +637,7 @@@@ d65 1 d72 1 a72 1 @@@@ -661,7 +652,7 @@@@ d74 1 a74 1 $(am__append_13) $(am__append_21) d77 2 a78 2 + $(libm) $(am__append_15) \ $(am__append_17) d80 1 a80 1 $(am__append_14) $(am__append_18) d82 2 a83 2 --- pango/querymodules.c.orig 2006-04-05 00:53:04 +0200 +++ pango/querymodules.c 2006-10-17 10:46:09 +0200 d93 2 a94 2 --- pangoft2.pc.in.orig 2002-06-06 21:28:19 +0200 +++ pangoft2.pc.in 2006-10-17 10:46:09 +0200 d103 2 a104 2 --- pangox.pc.in.orig 2002-03-05 18:20:57 +0100 +++ pangox.pc.in 2006-10-17 10:46:09 +0200 d113 2 a114 2 --- pangoxft.pc.in.orig 2005-06-15 00:32:46 +0200 +++ pangoxft.pc.in 2006-10-17 10:46:09 +0200 @ 1.13 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 @ text @d2 4 a5 3 --- Makefile.in.orig 2006-05-27 00:43:15 +0200 +++ Makefile.in 2006-06-19 10:02:23 +0200 @@@@ -286,7 +286,7 @@@@ a7 1 a9 1 d12 1 d15 1 a15 1 +++ pango.pc.in 2006-06-19 10:02:23 +0200 d24 4 a27 3 --- 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 @@@@ a29 1 a31 1 d34 2 a35 1 @@@@ -437,10 +437,7 @@@@ d47 1 a47 1 @@@@ -459,10 +456,7 @@@@ d49 1 a49 1 opentype/libmini-harfbuzz.la \ d57 3 a59 3 libpangoft2_1_0_la_DEPENDENCIES = \ opentype/libmini-harfbuzz.la \ @@@@ -490,10 +484,7 @@@@ d71 9 a79 23 @@@@ -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-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) \ $(x_libs) \ - $(GLIB_LIBS) \ -lm d81 2 a82 2 --- pango/querymodules.c.orig 2006-02-15 06:39:20 +0100 +++ pango/querymodules.c 2006-06-19 10:02:23 +0200 d93 1 a93 1 +++ pangoft2.pc.in 2006-06-19 10:02:23 +0200 d103 1 a103 1 +++ pangox.pc.in 2006-06-19 10:02:23 +0200 d113 1 a113 1 +++ pangoxft.pc.in 2006-06-19 10:02:23 +0200 @ 1.13.2.1 log @MFC: latest cleanups @ text @d2 3 a4 4 --- Makefile.in.orig 2006-10-13 19:51:14 +0200 +++ Makefile.in 2006-10-17 10:46:09 +0200 @@@@ -356,7 +356,7 @@@@ sharedstatedir = @@sharedstatedir@@ d7 1 d10 1 a12 1 pango.pc.in \ d15 1 a15 1 +++ pango.pc.in 2006-10-17 10:46:09 +0200 d24 3 a26 4 --- pango/Makefile.in.orig 2006-10-13 19:51:13 +0200 +++ pango/Makefile.in 2006-10-17 10:46:09 +0200 @@@@ -516,7 +516,7 @@@@ $(X_CFLAGS) d29 1 d32 1 d35 1 a35 2 # ------------------- libpango ------------------- @@@@ -593,10 +593,7 @@@@ d47 1 a47 1 @@@@ -615,10 +612,7 @@@@ d49 1 a49 1 opentype/libharfbuzz-1.la \ d57 3 a59 3 libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \ libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \ @@@@ -643,10 +637,7 @@@@ d71 23 a93 9 @@@@ -661,7 +652,7 @@@@ libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \ $(am__append_13) $(am__append_21) libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \ - $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_15) \ + $(libm) $(am__append_15) \ $(am__append_17) libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \ $(am__append_14) $(am__append_18) d95 2 a96 2 --- pango/querymodules.c.orig 2006-04-05 00:53:04 +0200 +++ pango/querymodules.c 2006-10-17 10:46:09 +0200 d107 1 a107 1 +++ pangoft2.pc.in 2006-10-17 10:46:09 +0200 d117 1 a117 1 +++ pangox.pc.in 2006-10-17 10:46:09 +0200 d127 1 a127 1 +++ pangoxft.pc.in 2006-10-17 10:46:09 +0200 @ 1.12 log @upgrading package: pango 1.10.4 -> 1.12.2 @ text @d2 2 a3 2 --- Makefile.in.orig 2006-04-27 06:05:33 +0200 +++ Makefile.in 2006-05-22 10:58:59 +0200 d15 1 a15 1 +++ pango.pc.in 2006-05-22 10:58:59 +0200 d24 2 a25 2 --- pango/Makefile.in.orig 2006-04-27 06:05:59 +0200 +++ pango/Makefile.in 2006-05-22 10:58:59 +0200 d35 48 d84 2 a85 2 --- pango/opentype/Makefile.in.orig 2006-04-27 06:06:06 +0200 +++ pango/opentype/Makefile.in 2006-05-22 10:58:59 +0200 d96 1 a96 1 +++ pango/querymodules.c 2006-05-22 10:58:59 +0200 d107 1 a107 1 +++ pangoft2.pc.in 2006-05-22 10:58:59 +0200 d117 1 a117 1 +++ pangox.pc.in 2006-05-22 10:58:59 +0200 d127 1 a127 1 +++ pangoxft.pc.in 2006-05-22 10:58:59 +0200 @ 1.11 log @- removed MODULE_VERSION from path in querymodules.c - removed dependencies to shared pango libs from modules - supplied pango.modules @ text @d1 6 a6 30 Index: pango/mini-fribidi/fribidi.c --- pango/mini-fribidi/fribidi.c.orig 2004-03-02 01:59:01 +0100 +++ pango/mini-fribidi/fribidi.c 2004-12-17 09:08:59 +0100 @@@@ -455,7 +455,7 @@@@ while (pp) { fprintf (stderr, "%d:l%d(%s)[%d] ", - pp->pos, pp->len, fribidi_type_name (pp->type), pp->level); + pp->pos, pp->len, _pango_fribidi_type_name (pp->type), pp->level); pp = pp->next; } fprintf (stderr, "\n"); Index: pango/mini-fribidi/fribidi_types.c --- pango/mini-fribidi/fribidi_types.c.orig 2004-06-21 20:25:26 +0200 +++ pango/mini-fribidi/fribidi_types.c 2004-12-17 09:08:59 +0100 @@@@ -77,7 +77,7 @@@@ }; char * -fribidi_type_name (FriBidiCharType c) +_pango_fribidi_type_name (FriBidiCharType c) { #define _FRIBIDI_CASE(type) case FRIBIDI_TYPE_##type: return #type switch (c) Index: pango/mini-fribidi/fribidi_types.h --- pango/mini-fribidi/fribidi_types.h.orig 2003-11-20 06:34:45 +0100 +++ pango/mini-fribidi/fribidi_types.h 2004-12-17 09:08:59 +0100 @@@@ -31,7 +31,7 @@@@ typedef gint32 FriBidiMaskType; typedef FriBidiMaskType FriBidiCharType; d8 14 a21 2 - gchar *fribidi_type_name (FriBidiCharType c); + gchar *_pango_fribidi_type_name (FriBidiCharType c); a22 2 /* The following type is used by fribidi_utils */ typedef struct d24 3 a26 3 --- pango/Makefile.in.orig 2004-12-16 17:44:43 +0100 +++ pango/Makefile.in 2004-12-17 09:08:59 +0100 @@@@ -281,7 +281,7 @@@@ d33 1 a33 1 @@PLATFORM_WIN32_TRUE@@no_undefined = -no-undefined d35 9 a43 10 Index: examples/Makefile.in --- examples/Makefile.in.orig 2004-12-16 17:44:40 +0100 +++ examples/Makefile.in 2004-12-17 09:08:59 +0100 @@@@ -263,6 +263,7 @@@@ pangoft2topgm_LDADD = \ ../pango/libpango-$(PANGO_API_VERSION).la \ + ../pango/libpangox-$(PANGO_API_VERSION).la \ ../pango/libpangoft2-$(PANGO_API_VERSION).la \ $(FREETYPE_LIBS) d45 11 a55 9 Index: pango.pc.in --- pango.pc.in.orig 2004-06-21 18:10:31 +0200 +++ pango.pc.in 2004-12-17 09:09:29 +0100 @@@@ -10,5 +10,5 @@@@ Version: @@VERSION@@ Requires: glib-2.0,gobject-2.0,gmodule-2.0 Libs: -L${libdir} -lpango-@@PANGO_API_VERSION@@ @@PKGCONFIG_MATH_LIBS@@ -Cflags: -I${includedir}/pango-1.0 +Cflags: -I${includedir}/pango-1.0 -I${includedir} d59 1 a59 1 +++ pangoft2.pc.in 2004-12-17 09:08:59 +0100 d69 1 a69 1 +++ pangox.pc.in 2004-12-17 09:08:59 +0100 d78 3 a80 3 --- pangoxft.pc.in.orig 2002-06-04 18:14:16 +0200 +++ pangoxft.pc.in 2004-12-17 09:08:59 +0100 @@@@ -8,4 +6,4 @@@@ a85 34 Index: pango/opentype/Makefile.in --- pango/opentype/Makefile.in.orig 2005-08-20 13:19:38 +0200 +++ pango/opentype/Makefile.in 2005-08-20 13:21:47 +0200 @@@@ -283,7 +283,6 @@@@ libpango_ot_la_LIBADD = \ $(x_ldflags) \ $(x_libs) \ - $(GLIB_LIBS) \ -lm Index: Makefile.in --- Makefile.in.orig 2005-08-20 16:09:38 +0200 +++ Makefile.in 2005-08-20 16:13:38 +0200 @@@@ -252,7 +252,7 @@@@ AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = pango modules examples docs tools tests +SUBDIRS = pango modules docs tools tests EXTRA_DIST = \ pango.pc.in \ Index: querymodules.c --- pango/querymodules.c.orig 2004-09-15 21:25:37.000000000 +0200 +++ pango/querymodules.c 2005-08-31 07:18:58.511568000 +0200 @@@@ -214,7 +214,6 @@@@ path = pango_config_key_get ("Pango/ModulesPath"); if (!path) path = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, "modules", NULL); @ 1.10 log @Perform the upgrade to Gtk 2.8 together with the upgrade of all its direct dependency libraries. Gtk 2.8 is considered API compatible with Gtk 2.6 but nevertheless this upgrade at least required lots of small changes to mostly all involved packages. The most notable change is that Gtk 2.8 is now based on Cairo. @ text @d122 11 @ 1.9 log @upgrading package: pango 1.8.1 -> 1.8.2 @ text @d99 23 @ 1.8 log @upgrading package: pango 1.8.0 -> 1.8.1 @ text @d93 1 a93 3 @@@@ -6,6 +6,6 @@@@ Name: Pango Xft Description: Xft font support for Pango d95 1 a95 2 -Requires: pango +Requires: pango,pangoft2 @ 1.7 log @upgrading package: pango 1.4.1 -> 1.8.0 @ text @a101 15 Index: configure --- configure.orig 2004-12-16 17:44:47 +0100 +++ configure 2004-12-24 19:26:00 +0100 @@@@ -21926,9 +21926,9 @@@@ indic_modules="indic-fc" syriac_modules="syriac-fc" thai_modules="thai-fc" -tibetan_modules="tibetan_fc" +tibetan_modules="tibetan-fc" -all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$syriac_modules,$thai_modules,tibetan_modules" +all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$syriac_modules,$thai_modules,$tibetan_modules" included_modules="" if test "x$with_included_modules" != xno || test "x$with_included_modules" = x ; then @ 1.6 log @ops, my fault: the patch was (for unknown reasons) not committed to CVS @ text @d1 48 d50 3 a52 3 --- examples/Makefile.in.orig 2003-10-24 05:43:19.000000000 +0200 +++ examples/Makefile.in 2003-11-16 12:23:42.000000000 +0100 @@@@ -254,6 +254,7 @@@@ d61 2 a62 2 --- pango.pc.in.orig 2003-07-24 21:36:50.000000000 +0200 +++ pango.pc.in 2003-11-16 12:24:12.000000000 +0100 d66 1 a66 1 Libs: -L${libdir} -lpango-@@PANGO_API_VERSION@@ d71 2 a72 2 --- pangoft2.pc.in.orig 2002-06-06 21:28:19.000000000 +0200 +++ pangoft2.pc.in 2003-11-16 12:24:19.000000000 +0100 d81 2 a82 2 --- pangox.pc.in.orig 2002-03-05 18:20:57.000000000 +0100 +++ pangox.pc.in 2003-11-16 12:24:29.000000000 +0100 d91 2 a92 2 --- pangoxft.pc.in.orig 2002-06-04 18:14:16.000000000 +0200 +++ pangoxft.pc.in 2004-04-06 08:48:29.000000000 +0200 d102 9 a110 42 Index: pango/Makefile.in --- pango/Makefile.in.orig 2003-10-24 05:56:54.000000000 +0200 +++ pango/Makefile.in 2003-11-16 12:28:00.000000000 +0100 @@@@ -274,7 +274,7 @@@@ BUILT_SOURCES = pango-enum-types.h pango-enum-types.c -pangoincludedir = $(includedir)/pango-1.0/pango +pangoincludedir = $(includedir)/pango-1.0 @@PLATFORM_WIN32_TRUE@@no_undefined = -no-undefined Index: pango/mini-fribidi/fribidi.c --- pango/mini-fribidi/fribidi.c.orig 2004-03-02 01:37:16.000000000 +0100 +++ pango/mini-fribidi/fribidi.c 2004-04-06 09:14:39.000000000 +0200 @@@@ -455,7 +455,7 @@@@ while (pp) { fprintf (stderr, "%d:l%d(%s)[%d] ", - pp->pos, pp->len, fribidi_type_name (pp->type), pp->level); + pp->pos, pp->len, _pango_fribidi_type_name (pp->type), pp->level); pp = pp->next; } fprintf (stderr, "\n"); Index: pango/mini-fribidi/fribidi_types.c --- pango/mini-fribidi/fribidi_types.c.orig 2003-11-20 06:34:45.000000000 +0100 +++ pango/mini-fribidi/fribidi_types.c 2004-04-06 09:15:15.000000000 +0200 @@@@ -79,7 +79,7 @@@@ #endif char * -fribidi_type_name (FriBidiCharType c) +_pango_fribidi_type_name (FriBidiCharType c) { #define _FRIBIDI_CASE(type) case FRIBIDI_TYPE_##type: return #type switch (c) Index: pango/mini-fribidi/fribidi_types.h --- pango/mini-fribidi/fribidi_types.h.orig 2003-11-20 06:34:45.000000000 +0100 +++ pango/mini-fribidi/fribidi_types.h 2004-04-06 09:14:58.000000000 +0200 @@@@ -31,7 +31,7 @@@@ typedef gint32 FriBidiMaskType; typedef FriBidiMaskType FriBidiCharType; d112 2 a113 2 - gchar *fribidi_type_name (FriBidiCharType c); + gchar *_pango_fribidi_type_name (FriBidiCharType c); d115 2 a116 2 /* The following type is used by fribidi_utils */ typedef struct @ 1.5 log @fix interdependency betwen pangoxft and pangoft2 @ text @d66 36 @ 1.4 log @upgrading package: pango 1.2.5 -> 1.4.0 @ text @d44 4 a47 2 +++ pangoxft.pc.in 2003-11-16 12:24:34.000000000 +0100 @@@@ -8,4 +8,4 @@@@ d49 2 a50 1 Requires: pango @ 1.3 log @cleanup packaging; add Xft 2.x support. @ text @a0 51 Index: pango/opentype/pango-ot-private.h --- pango/opentype/pango-ot-private.h.orig 2000-12-20 05:41:36.000000000 +0100 +++ pango/opentype/pango-ot-private.h 2003-11-16 12:23:42.000000000 +0100 @@@@ -22,7 +22,8 @@@@ #ifndef __PANGO_OT_PRIVATE_H__ #define __PANGO_OT_PRIVATE_H__ -#include +#include +#include FT_FREETYPE_H #include Index: pango/opentype/pango-ot-info.c --- pango/opentype/pango-ot-info.c.orig 2003-09-15 23:06:04.000000000 +0200 +++ pango/opentype/pango-ot-info.c 2003-11-16 12:23:42.000000000 +0100 @@@@ -22,7 +22,7 @@@@ #include "pango-ot-private.h" #include "fterrcompat.h" #include -#include +#include static void pango_ot_info_class_init (GObjectClass *object_class); static void pango_ot_info_finalize (GObject *object); Index: pango/pango-ot.h --- pango/pango-ot.h.orig 2003-08-25 16:10:25.000000000 +0200 +++ pango/pango-ot.h 2003-11-16 12:23:42.000000000 +0100 @@@@ -22,7 +22,8 @@@@ #ifndef __PANGO_OT_H__ #define __PANGO_OT_H__ -#include +#include +#include FT_FREETYPE_H #include G_BEGIN_DECLS Index: pango/pangoft2.c --- pango/pangoft2.c.orig 2003-08-08 19:02:22.000000000 +0200 +++ pango/pangoft2.c 2003-11-16 12:23:42.000000000 +0100 @@@@ -28,7 +28,8 @@@@ #include #include -#include +#include +#include FT_FREETYPE_H #include "pangoft2.h" #include "pangoft2-private.h" @ 1.2 log @upgrading package: pango 1.2.1 -> 1.2.2 @ text @d1 3 a3 2 --- pango/opentype/pango-ot-private.h.dist Fri May 9 15:17:31 2003 +++ pango/opentype/pango-ot-private.h Fri May 9 15:17:09 2003 d14 15 a28 2 --- pango/pango-ot.h.dist Fri May 9 15:14:36 2003 +++ pango/pango-ot.h Fri May 9 15:15:45 2003 d39 3 a41 2 --- pango/pangoft2.c.dist Fri May 9 15:14:42 2003 +++ pango/pangoft2.c Fri May 9 15:15:58 2003 a49 1 #include "pango-utils.h" d51 5 a55 5 --- pango/pangoft2.h.dist Fri May 9 15:14:47 2003 +++ pango/pangoft2.h Fri May 9 15:16:34 2003 @@@@ -23,7 +23,8 @@@@ #ifndef __PANGOFT2_H__ #define __PANGOFT2_H__ a56 10 -#include +#include +#include FT_FREETYPE_H #include --- examples/Makefile.in.orig Sat May 31 12:33:38 2003 +++ examples/Makefile.in Sat May 31 12:34:36 2003 @@@@ -166,6 +166,7 @@@@ pangoft2topgm_SOURCES = pangoft2topgm.c d62 51 @ 1.2.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @@ 1.1 log @remove version from paths, patch for freetype2.1 API idiosyncrasy, make modules shared objects, polishing @ text @d49 10 @