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: 24-Apr-2008 08:21:41
Branch: HEAD Handle: 2008042407214000
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.18.4 -> 1.20.2
Summary:
Revision Changes Path
1.17 +33 -36 openpkg-src/pango/pango.patch
1.74 +3 -3 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 pango.patch
--- openpkg-src/pango/pango.patch 30 Sep 2007 09:14:50 -0000 1.16
+++ openpkg-src/pango/pango.patch 24 Apr 2008 06:21:40 -0000 1.17
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2007-08-21 05:06:04 +0200
-+++ Makefile.in 2007-09-30 11:11:50 +0200
-@@ -260,7 +260,7 @@
+--- 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@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -11,19 +11,18 @@
autogen.sh \
pango.pc.in \
Index: pango.pc.in
---- 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 @@
+--- pango.pc.in.orig 2008-01-29 23:26:57 +0100
++++ pango.pc.in 2008-04-24 08:17:21 +0200
+@@ -10,4 +10,4 @@
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}
-
Index: pango/Makefile.in
---- 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 @@
+--- 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 @@
$(X_CFLAGS)
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
@@ -32,7 +31,7 @@
@[EMAIL PROTECTED] = -lm
# ------------------- libpango -------------------
-@@ -513,10 +513,7 @@
+@@ -511,10 +511,7 @@
libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangox_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
@@ -44,7 +43,7 @@
libpangox_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la \
-@@ -535,10 +532,7 @@
+@@ -533,10 +530,7 @@
libpangoft2_1_0_la_LIBADD = \
opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la \
@@ -56,7 +55,7 @@
libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \
-@@ -564,11 +558,7 @@
+@@ -562,11 +556,7 @@
libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
@@ -69,18 +68,18 @@
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \
-@@ -583,7 +573,7 @@
+@@ -581,7 +571,7 @@
libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \
$(am__append_13) $(am__append_23)
libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \
- $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_15) \
-+ $(libm) $(CAIRO_LIBS) $(libm) $(am__append_15) \
- $(am__append_18)
++ $(CAIRO_LIBS) $(libm) $(am__append_15) \
+ $(am__append_18) $(am__append_24)
libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \
$(am__append_14) $(am__append_16) $(am__append_19)
Index: pango/querymodules.c
--- pango/querymodules.c.orig 2007-07-05 23:30:24 +0200
-+++ pango/querymodules.c 2007-09-30 11:11:26 +0200
++++ pango/querymodules.c 2008-04-24 08:01:58 +0200
@@ -240,7 +240,6 @@
path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
@@ -90,31 +89,29 @@
NULL);
Index: pangoft2.pc.in
---- 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 @@
+--- pangoft2.pc.in.orig 2008-01-29 23:26:29 +0100
++++ pangoft2.pc.in 2008-04-24 08:17:51 +0200
+@@ -8,4 +8,4 @@
Version: @VERSION@
- Requires: pango
- Libs: -L${libdir} [EMAIL PROTECTED]@ @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@
-
+ Requires: pango freetype2 fontconfig
+ Libs: -L${libdir} [EMAIL PROTECTED]@
+-Cflags: -I${includedir}/pango-1.0
++Cflags: -I${includedir}/pango-1.0 -I${includedir}
Index: pangox.pc.in
---- 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 @@
+--- pangox.pc.in.orig 2008-01-29 23:34:09 +0100
++++ pangox.pc.in 2008-04-24 08:18:08 +0200
+@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango
- Libs: -L${libdir} [EMAIL PROTECTED]@ @PKGCONFIG_X_LIBS@
+ Libs: -L${libdir} [EMAIL PROTECTED]@ @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 2007-07-05 23:30:28 +0200
-+++ pangoxft.pc.in 2007-09-30 11:11:26 +0200
+--- pangoxft.pc.in.orig 2008-01-29 23:00:57 +0100
++++ pangoxft.pc.in 2008-04-24 08:18:23 +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@
+ Requires: pango pangoft2 xft
+ Libs: -L${libdir} [EMAIL PROTECTED]@
+-Cflags: -I${includedir}/pango-1.0
++Cflags: -I${includedir}/pango-1.0 -I${includedir}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.73 -r1.74 pango.spec
--- openpkg-src/pango/pango.spec 8 Jan 2008 19:14:37 -0000 1.73
+++ openpkg-src/pango/pango.spec 24 Apr 2008 06:21:40 -0000 1.74
@@ -23,8 +23,8 @@
# package version
%define V_glib_major 2.14
-%define V_pango_major 1.18
-%define V_pango_minor 4
+%define V_pango_major 1.20
+%define V_pango_minor 2
# package information
Name: pango
@@ -37,7 +37,7 @@
Group: XWindow
License: GPL
Version: %{V_pango_major}.%{V_pango_minor}
-Release: 20080108
+Release: 20080424
# list of sources
Source0:
http://ftp.gnome.org/pub/GNOME/sources/pango/%{V_pango_major}/pango-%{version}.tar.bz2
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
