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: 17-Oct-2006 11:25:04
Branch: OPENPKG_2_STABLE Handle: 2006101710250400
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/pango pango.patch pango.spec
Log:
MFC: latest cleanups
Summary:
Revision Changes Path
1.13.2.1 +31 -45 openpkg-src/pango/pango.patch
1.56.2.3 +6 -15 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.13 -r1.13.2.1 pango.patch
--- openpkg-src/pango/pango.patch 19 Jun 2006 12:34:20 -0000 1.13
+++ openpkg-src/pango/pango.patch 17 Oct 2006 09:25:04 -0000 1.13.2.1
@@ -1,18 +1,18 @@
Index: Makefile.in
---- Makefile.in.orig 2006-05-27 00:43:15 +0200
-+++ Makefile.in 2006-06-19 10:02:23 +0200
-@@ -286,7 +286,7 @@
+--- Makefile.in.orig 2006-10-13 19:51:14 +0200
++++ Makefile.in 2006-10-17 10:46:09 +0200
+@@ -356,7 +356,7 @@
+ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
-SUBDIRS = pango modules examples docs tools tests
+SUBDIRS = pango modules 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-06-19 10:02:23 +0200
++++ pango.pc.in 2006-10-17 10:46:09 +0200
@@ -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-05-27 00:43:44 +0200
-+++ pango/Makefile.in 2006-06-19 10:03:38 +0200
-@@ -356,7 +356,7 @@
+--- 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 @@
+ $(X_CFLAGS)
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
-
-pangoincludedir = $(includedir)/pango-1.0/pango
+pangoincludedir = $(includedir)/pango-1.0
-
@[EMAIL PROTECTED] = -lm
-@@ -437,10 +437,7 @@
+ # ------------------- libpango -------------------
+@@ -593,10 +593,7 @@
libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangox_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
@@ -44,9 +44,9 @@
libpangox_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la \
-@@ -459,10 +456,7 @@
+@@ -615,10 +612,7 @@
libpangoft2_1_0_la_LIBADD = \
- opentype/libmini-harfbuzz.la \
+ opentype/libharfbuzz-1.la \
libpango-$(PANGO_API_VERSION).la \
- $(INCLUDED_FC_MODULES) \
- $(GLIB_LIBS) \
@@ -54,9 +54,9 @@
- $(libm)
+ $(INCLUDED_FC_MODULES)
- libpangoft2_1_0_la_DEPENDENCIES = \
- opentype/libmini-harfbuzz.la \
-@@ -490,10 +484,7 @@
+ libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz-1.la \
+ libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \
+@@ -643,10 +637,7 @@
libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
@@ -68,32 +68,18 @@
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \
-@@ -508,10 +499,7 @@
-
- libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_13)
- libpangocairo_1_0_la_LIBADD = \
-- libpango-$(PANGO_API_VERSION).la \
-- $(GLIB_LIBS) \
-- $(CAIRO_LIBS) \
-- $(libm)\
-+ libpango-$(PANGO_API_VERSION).la \
- $(am__append_15) $(am__append_17)
- libpangocairo_1_0_la_DEPENDENCIES = \
- libpango-$(PANGO_API_VERSION).la\
-Index: pango/opentype/Makefile.in
---- pango/opentype/Makefile.in.orig 2006-05-27 00:43:46 +0200
-+++ pango/opentype/Makefile.in 2006-06-19 10:02:23 +0200
-@@ -311,7 +311,6 @@
- libmini_harfbuzz_la_LIBADD = \
- $(x_ldflags) \
- $(x_libs) \
-- $(GLIB_LIBS) \
- -lm
-
-
+@@ -661,7 +652,7 @@
+ libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \
+ $(am__append_13) $(am__append_21)
+ 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)
+ libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \
+ $(am__append_14) $(am__append_18)
Index: pango/querymodules.c
---- pango/querymodules.c.orig 2006-02-15 06:39:20 +0100
-+++ pango/querymodules.c 2006-06-19 10:02:23 +0200
+--- pango/querymodules.c.orig 2006-04-05 00:53:04 +0200
++++ pango/querymodules.c 2006-10-17 10:46:09 +0200
@@ -240,7 +240,6 @@
path = pango_config_key_get ("Pango/ModulesPath");
if (!path)
@@ -104,7 +90,7 @@
Index: pangoft2.pc.in
--- pangoft2.pc.in.orig 2002-06-06 21:28:19 +0200
-+++ pangoft2.pc.in 2006-06-19 10:02:23 +0200
++++ pangoft2.pc.in 2006-10-17 10:46:09 +0200
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -114,7 +100,7 @@
Index: pangox.pc.in
--- pangox.pc.in.orig 2002-03-05 18:20:57 +0100
-+++ pangox.pc.in 2006-06-19 10:02:23 +0200
++++ pangox.pc.in 2006-10-17 10:46:09 +0200
@@ -8,5 +8,5 @@
Version: @VERSION@
Requires: pango
@@ -124,7 +110,7 @@
Index: pangoxft.pc.in
--- pangoxft.pc.in.orig 2005-06-15 00:32:46 +0200
-+++ pangoxft.pc.in 2006-06-19 10:02:23 +0200
++++ pangoxft.pc.in 2006-10-17 10:46:09 +0200
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: pango pangoft2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.56.2.2 -r1.56.2.3 pango.spec
--- openpkg-src/pango/pango.spec 16 Oct 2006 14:53:55 -0000 1.56.2.2
+++ openpkg-src/pango/pango.spec 17 Oct 2006 09:25:04 -0000 1.56.2.3
@@ -23,9 +23,9 @@
##
# package version
-%define V_pango 1.12.3
-%define V_glib_major 2.10
-%define V_gtk_major 2.10
+%define V_glib_major 2.12
+%define V_pango_major 1.14
+%define V_pango_minor 7
# package information
Name: pango
@@ -37,11 +37,11 @@
Class: EVAL
Group: XWindow
License: GPL
-Version: %{V_pango}
+Version: %{V_pango_major}.%{V_pango_minor}
Release: 2.20061018
# list of sources
-Source0:
ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
+Source0:
ftp://ftp.gtk.org/pub/pango/%{V_pango_major}/pango-%{version}.tar.bz2
Patch0: pango.patch
# build information
@@ -66,7 +66,7 @@
%track
prog pango = {
version = %{version}
- url = ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/
+ url = ftp://ftp.gtk.org/pub/pango/%{V_pango_major}/
regex = pango-(__VER__)\.tar\.(gz|bz2)
}
@@ -81,12 +81,6 @@
-e '/moduledir =/s;/\$(PANGO_MODULE_VERSION);;g' \
Makefile.in */Makefile.in */*/Makefile.in \
pango\*.pc.in
- %{l_shtool} subst \
- -e 's;ftglue_;pango_ftglue_;g' \
- pango/opentype/ftglue.[ch] \
- pango/opentype/ftxgdef.c \
- pango/opentype/ftxgpos.c \
- pango/opentype/ftxgsub.c
%build
( echo "ac_cv_lib_cairo_cairo_ft_scaled_font_lock_face=yes"
@@ -116,13 +110,10 @@
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/pango
-
- # supply pango.modules
$RPM_BUILD_ROOT%{l_prefix}/bin/pango-querymodules \
$RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.so \
| sed "s,$RPM_BUILD_ROOT,," \
>$RPM_BUILD_ROOT%{l_prefix}/etc/pango/pango.modules
-
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.s[ol]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
