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: 30-Sep-2007 11:14:50
Branch: HEAD Handle: 2007093010145000
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.16.4 -> 1.18.0
Summary:
Revision Changes Path
1.16 +23 -23 openpkg-src/pango/pango.patch
1.69 +5 -4 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 pango.patch
--- openpkg-src/pango/pango.patch 28 Feb 2007 10:00:25 -0000 1.15
+++ openpkg-src/pango/pango.patch 30 Sep 2007 09:14:50 -0000 1.16
@@ -1,18 +1,18 @@
Index: Makefile.in
---- Makefile.in.orig 2007-02-26 20:13:26 +0100
-+++ Makefile.in 2007-02-28 10:45:20 +0100
-@@ -365,7 +365,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- Makefile.in.orig 2007-08-21 05:06:04 +0200
++++ Makefile.in 2007-09-30 11:11:50 +0200
+@@ -260,7 +260,7 @@
target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-SUBDIRS = pango modules pango-view examples docs tools tests
+SUBDIRS = pango modules pango-view docs tools tests
EXTRA_DIST = \
autogen.sh \
pango.pc.in \
Index: pango.pc.in
---- pango.pc.in.orig 2007-01-03 09:15:05 +0100
-+++ pango.pc.in 2007-02-28 10:42:40 +0100
+--- 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 @@
Version: @VERSION@
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
@@ -21,9 +21,9 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
Index: pango/Makefile.in
---- pango/Makefile.in.orig 2007-02-26 20:13:25 +0100
-+++ pango/Makefile.in 2007-02-28 10:44:54 +0100
-@@ -523,7 +523,7 @@
+--- 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 @@
$(X_CFLAGS)
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
@@ -32,7 +32,7 @@
@[EMAIL PROTECTED] = -lm
# ------------------- libpango -------------------
-@@ -601,10 +601,7 @@
+@@ -513,10 +513,7 @@
libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangox_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
@@ -44,7 +44,7 @@
libpangox_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la \
-@@ -623,10 +620,7 @@
+@@ -535,10 +532,7 @@
libpangoft2_1_0_la_LIBADD = \
opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la \
@@ -56,7 +56,7 @@
libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \
-@@ -651,11 +645,7 @@
+@@ -564,11 +558,7 @@
libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
@@ -69,9 +69,9 @@
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \
-@@ -670,7 +660,7 @@
+@@ -583,7 +573,7 @@
libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \
- $(am__append_13) $(am__append_22)
+ $(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) \
@@ -79,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-01-23 00:41:43 +0100
-+++ pango/querymodules.c 2007-02-28 10:42:40 +0100
+--- pango/querymodules.c.orig 2007-07-05 23:30:24 +0200
++++ pango/querymodules.c 2007-09-30 11:11:26 +0200
@@ -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 2007-01-03 09:15:05 +0100
-+++ pangoft2.pc.in 2007-02-28 10:42:40 +0100
+--- 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 @@
Version: @VERSION@
Requires: pango
@@ -100,8 +100,8 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @FONTCONFIG_CFLAGS@
@FREETYPE_CFLAGS@
Index: pangox.pc.in
---- pangox.pc.in.orig 2007-01-03 09:15:05 +0100
-+++ pangox.pc.in 2007-02-28 10:42:40 +0100
+--- 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 @@
Version: @VERSION@
Requires: pango
@@ -110,8 +110,8 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @X_CFLAGS@
Index: pangoxft.pc.in
---- pangoxft.pc.in.orig 2007-01-03 09:15:05 +0100
-+++ pangoxft.pc.in 2007-02-28 10:42:40 +0100
+--- pangoxft.pc.in.orig 2007-07-05 23:30:28 +0200
++++ pangoxft.pc.in 2007-09-30 11:11:26 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 pango.spec
--- openpkg-src/pango/pango.spec 20 Jul 2007 20:17:48 -0000 1.68
+++ openpkg-src/pango/pango.spec 30 Sep 2007 09:14:50 -0000 1.69
@@ -23,9 +23,9 @@
##
# package version
-%define V_glib_major 2.12
-%define V_pango_major 1.16
-%define V_pango_minor 4
+%define V_glib_major 2.14
+%define V_pango_major 1.18
+%define V_pango_minor 0
# package information
Name: pango
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: %{V_pango_major}.%{V_pango_minor}
-Release: 20070720
+Release: 20070930
# list of sources
Source0:
ftp://ftp.gtk.org/pub/pango/%{V_pango_major}/pango-%{version}.tar.bz2
@@ -92,6 +92,7 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-x \
--x-includes=`%{l_rc} --query x11_incdir` \
--x-libraries=`%{l_rc} --query x11_libdir` \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
