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: 07-Sep-2008 19:41:30
Branch: HEAD Handle: 2008090718413000
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.20.5 -> 1.21.5
Summary:
Revision Changes Path
1.18 +22 -21 openpkg-src/pango/pango.patch
1.78 +2 -2 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 pango.patch
--- openpkg-src/pango/pango.patch 24 Apr 2008 06:21:40 -0000 1.17
+++ openpkg-src/pango/pango.patch 7 Sep 2008 17:41:30 -0000 1.18
@@ -1,8 +1,8 @@
Index: Makefile.in
---- 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@
+--- Makefile.in.orig 2008-08-26 20:28:50 +0200
++++ Makefile.in 2008-09-07 19:37:53 +0200
+@@ -260,7 +260,7 @@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = pango modules pango-view examples docs tools tests
@@ -11,8 +11,8 @@
autogen.sh \
pango.pc.in \
Index: pango.pc.in
---- pango.pc.in.orig 2008-01-29 23:26:57 +0100
-+++ pango.pc.in 2008-04-24 08:17:21 +0200
+--- pango.pc.in.orig 2008-07-05 20:34:52 +0200
++++ pango.pc.in 2008-09-07 19:37:53 +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 2008-04-09 21:04:19 +0200
-+++ pango/Makefile.in 2008-04-24 08:19:15 +0200
-@@ -432,7 +432,7 @@
+--- 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 @@
$(X_CFLAGS)
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
@@ -31,7 +31,7 @@
@[EMAIL PROTECTED] = -lm
# ------------------- libpango -------------------
-@@ -511,10 +511,7 @@
+@@ -518,10 +518,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 \
-@@ -533,10 +530,7 @@
+@@ -540,10 +537,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) \
-@@ -562,11 +556,7 @@
+@@ -569,12 +563,7 @@
libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
@@ -63,12 +63,13 @@
- $(GLIB_LIBS) \
- $(X_LIBS) \
- $(XFT_LIBS) \
+- $(FREETYPE_LIBS) \
- $(libm)
+ libpango-$(PANGO_API_VERSION).la
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \
-@@ -581,7 +571,7 @@
+@@ -589,7 +578,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 \
@@ -78,8 +79,8 @@
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 2008-04-24 08:01:58 +0200
+--- pango/querymodules.c.orig 2008-07-05 20:34:52 +0200
++++ pango/querymodules.c 2008-09-07 19:37:53 +0200
@@ -240,7 +240,6 @@
path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
@@ -89,8 +90,8 @@
NULL);
Index: pangoft2.pc.in
---- pangoft2.pc.in.orig 2008-01-29 23:26:29 +0100
-+++ pangoft2.pc.in 2008-04-24 08:17:51 +0200
+--- pangoft2.pc.in.orig 2008-07-05 20:34:52 +0200
++++ pangoft2.pc.in 2008-09-07 19:37:53 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango freetype2 fontconfig
@@ -98,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-01-29 23:34:09 +0100
-+++ pangox.pc.in 2008-04-24 08:18:08 +0200
+--- pangox.pc.in.orig 2008-07-05 20:34:52 +0200
++++ pangox.pc.in 2008-09-07 19:37:53 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango
@@ -107,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-01-29 23:00:57 +0100
-+++ pangoxft.pc.in 2008-04-24 08:18:23 +0200
+--- pangoxft.pc.in.orig 2008-07-05 20:34:52 +0200
++++ pangoxft.pc.in 2008-09-07 19:37:53 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2 xft
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.77 -r1.78 pango.spec
--- openpkg-src/pango/pango.spec 4 Jul 2008 09:22:36 -0000 1.77
+++ openpkg-src/pango/pango.spec 7 Sep 2008 17:41:30 -0000 1.78
@@ -23,7 +23,7 @@
# package version
%define V_glib_major 2.14
-%define V_pango_major 1.20
+%define V_pango_major 1.21
%define V_pango_minor 5
# package information
@@ -37,7 +37,7 @@
Group: XWindow
License: GPL
Version: %{V_pango_major}.%{V_pango_minor}
-Release: 20080704
+Release: 20080907
# 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]
