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: 22-May-2006 11:07:35
Branch: HEAD Handle: 2006052210073400
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.10.4 -> 1.12.2
Summary:
Revision Changes Path
1.12 +49 -96 openpkg-src/pango/pango.patch
1.54 +5 -5 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 pango.patch
--- openpkg-src/pango/pango.patch 3 Sep 2005 09:40:16 -0000 1.11
+++ openpkg-src/pango/pango.patch 22 May 2006 09:07:34 -0000 1.12
@@ -1,75 +1,62 @@
-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;
+Index: Makefile.in
+--- Makefile.in.orig 2006-04-27 06:05:33 +0200
++++ Makefile.in 2006-05-22 10:58:59 +0200
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-- gchar *fribidi_type_name (FriBidiCharType c);
-+ gchar *_pango_fribidi_type_name (FriBidiCharType c);
+-SUBDIRS = pango modules examples docs tools tests
++SUBDIRS = pango modules docs tools tests
+
+ EXTRA_DIST = \
+ 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
+@@ -10,5 +10,5 @@
+ Version: @VERSION@
+ Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
+ Libs: -L${libdir} [EMAIL PROTECTED]@ @PKGCONFIG_MATH_LIBS@
+-Cflags: -I${includedir}/pango-1.0
++Cflags: -I${includedir}/pango-1.0 -I${includedir}
- /* The following type is used by fribidi_utils */
- typedef struct
Index: pango/Makefile.in
---- 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 @@
+--- pango/Makefile.in.orig 2006-04-27 06:05:59 +0200
++++ pango/Makefile.in 2006-05-22 10:58:59 +0200
+@@ -356,7 +356,7 @@
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
-pangoincludedir = $(includedir)/pango-1.0/pango
+pangoincludedir = $(includedir)/pango-1.0
- @[EMAIL PROTECTED] = -no-undefined
+ @[EMAIL PROTECTED] = -lm
-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)
+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
+@@ -311,7 +311,6 @@
+ libmini_harfbuzz_la_LIBADD = \
+ $(x_ldflags) \
+ $(x_libs) \
+- $(GLIB_LIBS) \
+ -lm
-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} [EMAIL PROTECTED]@ @PKGCONFIG_MATH_LIBS@
--Cflags: -I${includedir}/pango-1.0
-+Cflags: -I${includedir}/pango-1.0 -I${includedir}
+
+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
+@@ -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 2002-06-06 21:28:19 +0200
-+++ pangoft2.pc.in 2004-12-17 09:08:59 +0100
++++ pangoft2.pc.in 2006-05-22 10:58:59 +0200
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -79,7 +66,7 @@
Index: pangox.pc.in
--- pangox.pc.in.orig 2002-03-05 18:20:57 +0100
-+++ pangox.pc.in 2004-12-17 09:08:59 +0100
++++ pangox.pc.in 2006-05-22 10:58:59 +0200
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -88,45 +75,11 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @X_CFLAGS@
Index: pangoxft.pc.in
---- 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 @@
+--- pangoxft.pc.in.orig 2005-06-15 00:32:46 +0200
++++ pangoxft.pc.in 2006-05-22 10:58:59 +0200
+@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2
Libs: -L${libdir} [EMAIL PROTECTED]@ @PKGCONFIG_XFT_LIBS@
-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @XFT_CFLAGS@
-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);
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 pango.spec
--- openpkg-src/pango/pango.spec 27 Feb 2006 07:24:30 -0000 1.53
+++ openpkg-src/pango/pango.spec 22 May 2006 09:07:34 -0000 1.54
@@ -23,9 +23,9 @@
##
# package version
-%define V_pango 1.10.4
-%define V_glib_major 2.8
-%define V_gtk_major 2.8
+%define V_pango 1.12.2
+%define V_glib_major 2.10
+%define V_gtk_major 2.10
# package information
Name: pango
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: %{V_pango}
-Release: 20060227
+Release: 20060522
# list of sources
Source0:
ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -67,7 +67,7 @@
prog pango = {
version = %{version}
url = ftp://ftp.gtk.org/pub/gtk/
- regex = (v2\.[24678])
+ regex = (v2\.1?[024678])
url = ftp://ftp.gtk.org/pub/gtk/__NEWVER__/
regex = pango-(__VER__)\.tar\.(gz|bz2)
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
