OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 16-Nov-2003 13:08:00
Branch: HEAD Handle: 2003111612075703
Modified files:
openpkg-re/vcheck vc.pango
openpkg-src/pango pango.patch pango.spec
openpkg-web news.txt
Log:
cleanup packaging; add Xft 2.x support.
Summary:
Revision Changes Path
1.9 +3 -1 openpkg-re/vcheck/vc.pango
1.3 +77 -22 openpkg-src/pango/pango.patch
1.24 +7 -10 openpkg-src/pango/pango.spec
1.7425 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.pango
============================================================================
$ cvs diff -u -r1.8 -r1.9 vc.pango
--- openpkg-re/vcheck/vc.pango 27 Aug 2003 20:23:25 -0000 1.8
+++ openpkg-re/vcheck/vc.pango 16 Nov 2003 12:07:57 -0000 1.9
@@ -3,7 +3,9 @@
prog pango = {
version = 1.2.5
- url = ftp://ftp.gtk.org/pub/gtk/v2.2/
+ url = ftp://ftp.gtk.org/pub/gtk/
+ regex = (v2\.[246])
+ url = ftp://ftp.gtk.org/pub/gtk/__NEWVER__/
regex = pango-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 pango.patch
--- openpkg-src/pango/pango.patch 31 May 2003 10:38:50 -0000 1.2
+++ openpkg-src/pango/pango.patch 16 Nov 2003 12:08:00 -0000 1.3
@@ -1,5 +1,6 @@
---- pango/opentype/pango-ot-private.h.dist Fri May 9 15:17:31 2003
-+++ pango/opentype/pango-ot-private.h Fri May 9 15:17:09 2003
+Index: pango/opentype/pango-ot-private.h
+--- pango/opentype/pango-ot-private.h.orig 2000-12-20 05:41:36.000000000 +0100
++++ pango/opentype/pango-ot-private.h 2003-11-16 12:23:42.000000000 +0100
@@ -22,7 +22,8 @@
#ifndef __PANGO_OT_PRIVATE_H__
#define __PANGO_OT_PRIVATE_H__
@@ -10,8 +11,21 @@
#include <glib-object.h>
---- pango/pango-ot.h.dist Fri May 9 15:14:36 2003
-+++ pango/pango-ot.h Fri May 9 15:15:45 2003
+Index: pango/opentype/pango-ot-info.c
+--- pango/opentype/pango-ot-info.c.orig 2003-09-15 23:06:04.000000000 +0200
++++ pango/opentype/pango-ot-info.c 2003-11-16 12:23:42.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include "pango-ot-private.h"
+ #include "fterrcompat.h"
+ #include <freetype/internal/ftobjs.h>
+-#include <freetype/ftmodule.h>
++#include <freetype/ftmodapi.h>
+
+ static void pango_ot_info_class_init (GObjectClass *object_class);
+ static void pango_ot_info_finalize (GObject *object);
+Index: pango/pango-ot.h
+--- pango/pango-ot.h.orig 2003-08-25 16:10:25.000000000 +0200
++++ pango/pango-ot.h 2003-11-16 12:23:42.000000000 +0100
@@ -22,7 +22,8 @@
#ifndef __PANGO_OT_H__
#define __PANGO_OT_H__
@@ -22,8 +36,9 @@
#include <pango/pango-glyph.h>
G_BEGIN_DECLS
---- pango/pangoft2.c.dist Fri May 9 15:14:42 2003
-+++ pango/pangoft2.c Fri May 9 15:15:58 2003
+Index: pango/pangoft2.c
+--- pango/pangoft2.c.orig 2003-08-08 19:02:22.000000000 +0200
++++ pango/pangoft2.c 2003-11-16 12:23:42.000000000 +0100
@@ -28,7 +28,8 @@
#include <glib.h>
#include <glib/gprintf.h>
@@ -32,27 +47,67 @@
+#include <ft2build.h>
+#include FT_FREETYPE_H
- #include "pango-utils.h"
#include "pangoft2.h"
---- pango/pangoft2.h.dist Fri May 9 15:14:47 2003
-+++ pango/pangoft2.h Fri May 9 15:16:34 2003
-@@ -23,7 +23,8 @@
- #ifndef __PANGOFT2_H__
- #define __PANGOFT2_H__
+ #include "pangoft2-private.h"
+Index: examples/Makefile.in
+--- examples/Makefile.in.orig 2003-10-24 05:43:19.000000000 +0200
++++ examples/Makefile.in 2003-11-16 12:23:42.000000000 +0100
+@@ -254,6 +254,7 @@
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #include <fontconfig/fontconfig.h>
-
---- examples/Makefile.in.orig Sat May 31 12:33:38 2003
-+++ examples/Makefile.in Sat May 31 12:34:36 2003
-@@ -166,6 +166,7 @@
- pangoft2topgm_SOURCES = pangoft2topgm.c
pangoft2topgm_LDADD = \
../pango/libpango-$(PANGO_API_VERSION).la \
+ ../pango/libpangox-$(PANGO_API_VERSION).la \
../pango/libpangoft2-$(PANGO_API_VERSION).la \
$(FREETYPE_LIBS)
+
+Index: pango.pc.in
+--- pango.pc.in.orig 2003-07-24 21:36:50.000000000 +0200
++++ pango.pc.in 2003-11-16 12:24:12.000000000 +0100
+@@ -10,5 +10,5 @@
+ Version: @VERSION@
+ Requires: glib-2.0,gobject-2.0,gmodule-2.0
+ Libs: -L${libdir} [EMAIL PROTECTED]@
+-Cflags: -I${includedir}/pango-1.0
++Cflags: -I${includedir}/pango-1.0 -I${includedir}
+
+Index: pangoft2.pc.in
+--- pangoft2.pc.in.orig 2002-06-06 21:28:19.000000000 +0200
++++ pangoft2.pc.in 2003-11-16 12:24:19.000000000 +0100
+@@ -8,5 +8,5 @@
+ 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@
+
+Index: pangox.pc.in
+--- pangox.pc.in.orig 2002-03-05 18:20:57.000000000 +0100
++++ pangox.pc.in 2003-11-16 12:24:29.000000000 +0100
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Requires: pango
+ Libs: -L${libdir} [EMAIL PROTECTED]@ @PKGCONFIG_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 2002-06-04 18:14:16.000000000 +0200
++++ pangoxft.pc.in 2003-11-16 12:24:34.000000000 +0100
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: pango
+ 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@
+Index: pango/Makefile.in
+--- pango/Makefile.in.orig 2003-10-24 05:56:54.000000000 +0200
++++ pango/Makefile.in 2003-11-16 12:28:00.000000000 +0100
+@@ -274,7 +274,7 @@
+
+ BUILT_SOURCES = pango-enum-types.h pango-enum-types.c
+
+-pangoincludedir = $(includedir)/pango-1.0/pango
++pangoincludedir = $(includedir)/pango-1.0
+
+ @[EMAIL PROTECTED] = -no-undefined
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 pango.spec
--- openpkg-src/pango/pango.spec 27 Aug 2003 20:23:27 -0000 1.23
+++ openpkg-src/pango/pango.spec 16 Nov 2003 12:08:00 -0000 1.24
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: %{V_pango}
-Release: 20030827
+Release: 20031116
# list of sources
Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.gz
@@ -48,9 +48,9 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20021218, X11, make, gcc
-BuildPreReq: glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig
+BuildPreReq: glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft
PreReq: OpenPKG, openpkg >= 20021218, X11
-PreReq: glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig
+PreReq: glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft
AutoReq: no
AutoReqProv: no
@@ -74,11 +74,6 @@
Makefile.in */Makefile.in */*/Makefile.in \
pango\*.pc.in
- # hangul requires Xft2
- %{l_shtool} subst \
- -e 's;\$hangul_modules,;;' \
- configure
-
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -89,10 +84,10 @@
--with-x \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
- --with-html-dir="%{l_prefix}/share/pango" \
+ --with-html-dir="%{l_prefix}/share" \
--disable-nls \
--with-native-locale=no \
- --with-included-modules=yes \
+ --with-included-modules=no \
--enable-shm \
--disable-debug \
--disable-rebuilds \
@@ -109,8 +104,10 @@
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/gtk-doc
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/pango
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%config %{l_prefix}/etc/pango/pangox.aliases' \
'%not %dir %{l_prefix}/lib/pkgconfig'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7424 -r1.7425 news.txt
--- openpkg-web/news.txt 16 Nov 2003 11:54:25 -0000 1.7424
+++ openpkg-web/news.txt 16 Nov 2003 12:07:58 -0000 1.7425
@@ -1,3 +1,4 @@
+16-Nov-2003: Upgraded package: P<pango-1.2.5-20031116>
16-Nov-2003: New package: P<xft-2.1.2-20031116>
16-Nov-2003: Upgraded package: P<fontconfig-2.2.90-20031116>
16-Nov-2003: Upgraded package: P<glib2-2.2.3-20031116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
