[prev in list] [next in list] [prev in thread] [next in thread]
List: openpkg-cvs
Subject: [CVS] OpenPKG: openpkg-src/pango/ pango.patch pango.spec
From: "Ralf S. Engelschall" <rse () openpkg ! org>
Date: 2007-02-28 9:59:59
Message-ID: 20070228100026.E3E9C1B504F () master ! openpkg ! org
[Download RAW message or body]
OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: rse@openpkg.org
Module: openpkg-src Date: 28-Feb-2007 11:00:26
Branch: HEAD Handle: 2007022810002500
Modified files:
openpkg-src/pango pango.patch pango.spec
Log:
upgrading package: pango 1.14.10 -> 1.16.0
Summary:
Revision Changes Path
1.15 +29 -28 openpkg-src/pango/pango.patch
1.64 +4 -3 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 pango.patch
--- openpkg-src/pango/pango.patch 17 Oct 2006 08:47:24 -0000 1.14
+++ openpkg-src/pango/pango.patch 28 Feb 2007 10:00:25 -0000 1.15
@@ -1,18 +1,18 @@
Index: Makefile.in
---- Makefile.in.orig 2006-10-13 19:51:14 +0200
-+++ Makefile.in 2006-10-17 10:46:09 +0200
-@@ -356,7 +356,7 @@
+--- 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@
target_alias = @target_alias@
--SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools tests
+-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 2005-01-09 01:30:45 +0100
-+++ pango.pc.in 2006-10-17 10:46:09 +0200
+--- pango.pc.in.orig 2007-01-03 09:15:05 +0100
++++ pango.pc.in 2007-02-28 10:42:40 +0100
@@ -10,5 +10,5 @@
Version: @VERSION@
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
@@ -21,18 +21,18 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
Index: pango/Makefile.in
---- pango/Makefile.in.orig 2006-10-13 19:51:13 +0200
-+++ pango/Makefile.in 2006-10-17 10:46:09 +0200
-@@ -516,7 +516,7 @@
+--- 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 @@
$(X_CFLAGS)
- BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
+ BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
-pangoincludedir = $(includedir)/pango-1.0/pango
-+pangoincludedir = $(includedir)/pango-1.0
++pangoincludedir = $(includedir)/pango
@OS_WIN32_FALSE@libm = -lm
# ------------------- libpango -------------------
-@@ -593,10 +593,7 @@
+@@ -601,10 +601,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 \
-@@ -615,10 +612,7 @@
+@@ -623,10 +620,7 @@
libpangoft2_1_0_la_LIBADD = \
opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la \
@@ -56,30 +56,31 @@
libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \
-@@ -643,10 +637,7 @@
+@@ -651,11 +645,7 @@
libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
- libpango-$(PANGO_API_VERSION).la \
- $(GLIB_LIBS) \
+- $(X_LIBS) \
- $(XFT_LIBS) \
- $(libm)
+ libpango-$(PANGO_API_VERSION).la
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \
-@@ -661,7 +652,7 @@
+@@ -670,7 +660,7 @@
libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \
- $(am__append_13) $(am__append_21)
+ $(am__append_13) $(am__append_22)
libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \
- $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_15) \
-+ $(libm) $(am__append_15) \
- $(am__append_17)
++ $(libm) $(CAIRO_LIBS) $(libm) $(am__append_15) \
+ $(am__append_18)
libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \
- $(am__append_14) $(am__append_18)
+ $(am__append_14) $(am__append_16) $(am__append_19)
Index: pango/querymodules.c
---- pango/querymodules.c.orig 2006-04-05 00:53:04 +0200
-+++ pango/querymodules.c 2006-10-17 10:46:09 +0200
+--- pango/querymodules.c.orig 2007-01-23 00:41:43 +0100
++++ pango/querymodules.c 2007-02-28 10:42:40 +0100
@@ -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 2002-06-06 21:28:19 +0200
-+++ pangoft2.pc.in 2006-10-17 10:46:09 +0200
+--- pangoft2.pc.in.orig 2007-01-03 09:15:05 +0100
++++ pangoft2.pc.in 2007-02-28 10:42:40 +0100
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -99,8 +100,8 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
Index: pangox.pc.in
---- pangox.pc.in.orig 2002-03-05 18:20:57 +0100
-+++ pangox.pc.in 2006-10-17 10:46:09 +0200
+--- pangox.pc.in.orig 2007-01-03 09:15:05 +0100
++++ pangox.pc.in 2007-02-28 10:42:40 +0100
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -109,8 +110,8 @@
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @X_CFLAGS@
Index: pangoxft.pc.in
---- pangoxft.pc.in.orig 2005-06-15 00:32:46 +0200
-+++ pangoxft.pc.in 2006-10-17 10:46:09 +0200
+--- pangoxft.pc.in.orig 2007-01-03 09:15:05 +0100
++++ pangoxft.pc.in 2007-02-28 10:42:40 +0100
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.63 -r1.64 pango.spec
--- openpkg-src/pango/pango.spec 30 Jan 2007 08:34:25 -0000 1.63
+++ openpkg-src/pango/pango.spec 28 Feb 2007 10:00:25 -0000 1.64
@@ -24,8 +24,8 @@
# package version
%define V_glib_major 2.12
-%define V_pango_major 1.14
-%define V_pango_minor 10
+%define V_pango_major 1.16
+%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: 20070130
+Release: 20070228
# list of sources
Source0: ftp://ftp.gtk.org/pub/pango/%{V_pango_major}/pango-%{version}.tar.bz2
@@ -121,6 +121,7 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.la
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.a
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/pango/doc
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/share/pango >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/pango/*' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic