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: 10-Sep-2009 20:42:03
Branch: HEAD Handle: 2009091019420300
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.24.5 -> 1.25.6
Summary:
Revision Changes Path
1.22 +29 -29 openpkg-src/pango/pango.patch
1.99 +3 -3 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.21 -r1.22 pango.patch
--- openpkg-src/pango/pango.patch 18 Mar 2009 17:38:23 -0000 1.21
+++ openpkg-src/pango/pango.patch 10 Sep 2009 18:42:03 -0000 1.22
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2009-03-16 23:35:05 +0100
-+++ Makefile.in 2009-03-18 18:31:21 +0100
-@@ -272,7 +272,7 @@
+--- 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@
@@ -12,7 +12,7 @@
pango.pc.in \
Index: pango.pc.in
--- pango.pc.in.orig 2009-02-07 00:49:34 +0100
-+++ pango.pc.in 2009-03-18 18:31:21 +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
@@ -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 2009-03-16 23:35:04 +0100
-+++ pango/Makefile.in 2009-03-18 18:33:29 +0100
-@@ -461,7 +461,7 @@
+--- 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
@@ -31,8 +31,8 @@
@os_win32_fa...@libm = -lm
# ------------------- libpango -------------------
-@@ -544,10 +544,7 @@
- libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
+@@ -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) \
@@ -41,11 +41,11 @@
- $(X_EXTRA_LIBS)
+ $(INCLUDED_X_MODULES)
- libpangox_1_0_la_DEPENDENCIES = \
- libpango-$(PANGO_API_VERSION).la \
-@@ -579,10 +576,7 @@
+ 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-1.la \
+ opentype/libharfbuzz.la \
libpango-$(PANGO_API_VERSION).la \
- $(INCLUDED_FC_MODULES) \
- $(GLIB_LIBS) \
@@ -53,10 +53,10 @@
- $(libm)
+ $(INCLUDED_FC_MODULES)
- libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \
+ libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz.la \
libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \
-@@ -606,12 +600,7 @@
- libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
+@@ -680,12 +674,7 @@
+ $(am__append_15)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
- libpango-$(PANGO_API_VERSION).la \
@@ -67,20 +67,20 @@
- $(libm)
+ libpango-$(PANGO_API_VERSION).la
- libpangoxft_1_0_la_DEPENDENCIES = \
- libpangoft2-$(PANGO_API_VERSION).la \
-@@ -627,7 +616,7 @@
+ 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_17) $(am__append_27)
+ $(am__append_20) $(am__append_30)
libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \
-- $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_19) \
-+ $(CAIRO_LIBS) $(libm) $(am__append_19) \
- $(am__append_22) $(am__append_28)
+- $(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_18) $(am__append_20) $(am__append_23)
+ $(am__append_21) $(am__append_23) $(am__append_26)
Index: pango/querymodules.c
---- pango/querymodules.c.orig 2009-02-07 00:49:34 +0100
-+++ pango/querymodules.c 2009-03-18 18:31:21 +0100
+--- 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)
@@ -91,7 +91,7 @@
Index: pangoft2.pc.in
--- pangoft2.pc.in.orig 2009-02-07 00:49:34 +0100
-+++ pangoft2.pc.in 2009-03-18 18:31:21 +0100
++++ pangoft2.pc.in 2009-09-10 20:35:07 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango freetype2 fontconfig
@@ -100,7 +100,7 @@
+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-03-18 18:31:21 +0100
++++ pangox.pc.in 2009-09-10 20:35:07 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango
@@ -109,7 +109,7 @@
+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-03-18 18:31:21 +0100
++++ pangoxft.pc.in 2009-09-10 20:35:07 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2 xft
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.98 -r1.99 pango.spec
--- openpkg-src/pango/pango.spec 25 Jul 2009 21:07:57 -0000 1.98
+++ openpkg-src/pango/pango.spec 10 Sep 2009 18:42:03 -0000 1.99
@@ -23,8 +23,8 @@
# package version
%define V_glib_major 2.21
-%define V_pango_major 1.24
-%define V_pango_minor 5
+%define V_pango_major 1.25
+%define V_pango_minor 6
# package information
Name: pango
@@ -37,7 +37,7 @@
Group: XWindow
License: GPL
Version: %{V_pango_major}.%{V_pango_minor}
-Release: 20090725
+Release: 20090910
# package options
%option with_x11 no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
