OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Mar-2009 18:38:23
Branch: HEAD Handle: 2009031817382300
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.22.4 -> 1.24.0
Summary:
Revision Changes Path
1.21 +25 -25 openpkg-src/pango/pango.patch
1.90 +3 -3 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.20 -r1.21 pango.patch
--- openpkg-src/pango/pango.patch 16 Oct 2008 14:39:55 -0000 1.20
+++ openpkg-src/pango/pango.patch 18 Mar 2009 17:38:23 -0000 1.21
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2008-08-26 20:28:50 +0200
-+++ Makefile.in 2008-09-07 19:37:53 +0200
-@@ -260,7 +260,7 @@
+--- Makefile.in.orig 2009-03-16 23:35:05 +0100
++++ Makefile.in 2009-03-18 18:31:21 +0100
+@@ -272,7 +272,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -11,8 +11,8 @@
autogen.sh \
pango.pc.in \
Index: pango.pc.in
---- pango.pc.in.orig 2008-07-05 20:34:52 +0200
-+++ pango.pc.in 2008-09-07 19:37:53 +0200
+--- pango.pc.in.orig 2009-02-07 00:49:34 +0100
++++ pango.pc.in 2009-03-18 18:31:21 +0100
@@ -10,4 +10,4 @@
Version: @VERSION@
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
@@ -20,9 +20,9 @@
-Cflags: -I${includedir}/pango-1.0
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
Index: pango/Makefile.in
---- 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 @@
+--- 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 @@
$(X_CFLAGS)
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
@@ -31,7 +31,7 @@
@os_win32_fa...@libm = -lm
# ------------------- libpango -------------------
-@@ -518,10 +518,7 @@
+@@ -544,10 +544,7 @@
libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangox_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
@@ -43,7 +43,7 @@
libpangox_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la \
-@@ -540,10 +537,7 @@
+@@ -579,10 +576,7 @@
libpangoft2_1_0_la_LIBADD = \
opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la \
@@ -55,7 +55,7 @@
libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \
-@@ -569,12 +563,7 @@
+@@ -606,12 +600,7 @@
libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
@@ -69,18 +69,18 @@
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \
-@@ -589,7 +578,7 @@
+@@ -627,7 +616,7 @@
libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \
- $(am__append_13) $(am__append_23)
+ $(am__append_17) $(am__append_27)
libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \
-- $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_15) \
-+ $(CAIRO_LIBS) $(libm) $(am__append_15) \
- $(am__append_18) $(am__append_24)
+- $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_19) \
++ $(CAIRO_LIBS) $(libm) $(am__append_19) \
+ $(am__append_22) $(am__append_28)
libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \
- $(am__append_14) $(am__append_16) $(am__append_19)
+ $(am__append_18) $(am__append_20) $(am__append_23)
Index: pango/querymodules.c
---- pango/querymodules.c.orig 2008-07-05 20:34:52 +0200
-+++ pango/querymodules.c 2008-09-07 19:37:53 +0200
+--- pango/querymodules.c.orig 2009-02-07 00:49:34 +0100
++++ pango/querymodules.c 2009-03-18 18:31:21 +0100
@@ -240,7 +240,6 @@
path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
@@ -90,8 +90,8 @@
NULL);
Index: pangoft2.pc.in
---- pangoft2.pc.in.orig 2008-07-05 20:34:52 +0200
-+++ pangoft2.pc.in 2008-09-07 19:37:53 +0200
+--- pangoft2.pc.in.orig 2009-02-07 00:49:34 +0100
++++ pangoft2.pc.in 2009-03-18 18:31:21 +0100
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango freetype2 fontconfig
@@ -99,8 +99,8 @@
-Cflags: -I${includedir}/pango-1.0
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
Index: pangox.pc.in
---- pangox.pc.in.orig 2008-07-05 20:34:52 +0200
-+++ pangox.pc.in 2008-09-07 19:37:53 +0200
+--- pangox.pc.in.orig 2009-02-07 00:49:34 +0100
++++ pangox.pc.in 2009-03-18 18:31:21 +0100
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango
@@ -108,8 +108,8 @@
-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 2008-07-05 20:34:52 +0200
-+++ pangoxft.pc.in 2008-09-07 19:37:53 +0200
+--- pangoxft.pc.in.orig 2009-02-07 00:49:34 +0100
++++ pangoxft.pc.in 2009-03-18 18:31:21 +0100
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2 xft
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.89 -r1.90 pango.spec
--- openpkg-src/pango/pango.spec 16 Dec 2008 15:57:46 -0000 1.89
+++ openpkg-src/pango/pango.spec 18 Mar 2009 17:38:23 -0000 1.90
@@ -23,8 +23,8 @@
# package version
%define V_glib_major 2.14
-%define V_pango_major 1.22
-%define V_pango_minor 4
+%define V_pango_major 1.24
+%define V_pango_minor 0
# package information
Name: pango
@@ -37,7 +37,7 @@
Group: XWindow
License: GPL
Version: %{V_pango_major}.%{V_pango_minor}
-Release: 20081216
+Release: 20090318
# package options
%option with_x11 no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
