Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17464
Modified Files:
pango1-xft2-ft219.info pango1-xft2.info
pango1-xft2-ft219.patch pango1-xft2.patch
Log Message:
Enable tests, fix deps and shlibs, minimize differences between -ft219 variants.
Index: pango1-xft2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pango1-xft2.patch 7 Mar 2005 00:28:55 -0000 1.7
+++ pango1-xft2.patch 5 Jun 2005 07:14:09 -0000 1.8
@@ -6,7 +6,7 @@
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools
++SUBDIRS = pango modules docs tools tests
EXTRA_DIST = \
pango.pc.in \
Index: pango1-xft2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pango1-xft2.info 19 Mar 2005 14:52:21 -0000 1.12
+++ pango1-xft2.info 5 Jun 2005 07:14:09 -0000 1.13
@@ -1,27 +1,42 @@
Package: pango1-xft2
Version: 1.6.0
-Revision: 1
+Revision: 2
Depends: %N-shlibs (=%v-%r), gettext, glib2 (>= 2.4.0-1), libiconv
Provides: pango1
Replaces: pango1
Conflicts: pango1-xft1
-BuildDepends: glib2-dev (>= 2.4.0-1), pkgconfig (>= 0.15.0-2), gtk-doc (>=
1.2-1), x11-dev, xft2-dev, x11-dev, gettext-dev, libiconv-dev, gcc3.3
+BuildDepends: <<
+ glib2-dev (>= 2.4.0-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
+ x11-dev, xft2-dev, gettext-dev, libiconv-dev, gcc3.3
+<<
Source: mirror:gnome:sources/pango/1.6/pango-%v.tar.bz2
Source-MD5: 6c732bbc5fba5a0f1f8086e8aa4f490d
-PatchScript: sed 's|@PREFIX@|%p|' <%a/%n.patch | patch -p1
+PatchScript: <<
+ #!/bin/bash -ev
+ sed 's|@PREFIX@|%p|' <%a/%n.patch | patch -p1
+<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
SetLDFLAGS: -no-undefined -L/usr/X11R6/lib
-ConfigureParams: --mandir=%p/share/man
-CompileScript: LD_TWOLEVEL_NAMESPACE=1
FREETYPE_CONFIG=/usr/X11R6/bin/freetype-config ./configure %c; make -j2
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
+CompileScript: <<
+ #!/bin/bash -ev
+ export LD_TWOLEVEL_NAMESPACE=1
+ export FREETYPE_CONFIG=/usr/X11R6/bin/freetype-config
+ ./configure %c
+ make -j2
+ make check
+<<
InstallScript: <<
- make install DESTDIR=%d
- install -d -m 755 %i/sbin
- install -c -m 755 update-pango-modules %i/sbin/
- install -d -m 755 %i/etc/pango
- install -c -m 644 examples/pangox.aliases %i/etc/pango/
+ #!/bin/bash -ev
+ make install DESTDIR=%d
+ install -d -m 755 %i/sbin
+ SYSCONFDIR=%i/etc
+ install -c -m 755 update-pango-modules %i/sbin
+ install -d -m 755 $SYSCONFDIR/pango
+ install -c -m 644 examples/pangox.aliases $SYSCONFDIR/pango
<<
PostInstScript: <<
if [ configure = "$1" ]; then
@@ -31,8 +46,9 @@
PostRmScript: <<
case "$1" in
purge)
- rm -f %p/etc/pango/pango.modules
- rmdir %p/etc/pango || true
+ SYSCONFDIR=%p/etc
+ rm -f $SYSCONFDIR/pango/pango.modules
+ rmdir $SYSCONFDIR/pango || true
;;
esac
<<
@@ -42,12 +58,15 @@
Provides: pango1-shlibs
Replaces: pango1-shlibs
Conflicts: pango1-xft1-shlibs
- Files: lib/lib*-1.0.*.dylib lib/pango
+ Files: <<
+ lib/lib*-1.0.*.dylib
+ lib/pango
+ <<
Shlibs: <<
- %p/lib/libpango-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
- %p/lib/libpangoft2-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
- %p/lib/libpangox-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
- %p/lib/libpangoxft-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
+ %p/lib/libpango-1.0.0.dylib 601.0.0 %n (>= 1.6.0-2)
+ %p/lib/libpangoft2-1.0.0.dylib 601.0.0 %n (>= 1.6.0-2)
+ %p/lib/libpangox-1.0.0.dylib 601.0.0 %n (>= 1.6.0-2)
+ %p/lib/libpangoxft-1.0.0.dylib 601.0.0 %n (>= 1.6.0-2)
<<
Description: GTK+ - i18n text shared libraries: for XFree86 (>= 4.3)
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
@@ -59,17 +78,23 @@
Replaces: pango1-dev
Conflicts: pango1-xft1-dev
BuildDependsOnly: True
- Files: include lib/lib*-1.0.* lib/pkgconfig share/gtk-doc
+ Files: <<
+ include
+ lib
+ share/gtk-doc
+ <<
Description: GTK+ - i18n text development headers and libraries: for XFree86
(>= 4.3)
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
ConfFiles: %p/etc/pango/pangox.aliases
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
Description: GTK+ - i18n libraries: for XFree86 (>= 4.3)
-DescDetail: System for layout and rendering of internationalized text.
+DescDetail: <<
+System for layout and rendering of internationalized text.
+<<
DescPackaging: <<
-Package which install pango module(s) should call update-pango-modules in it's
-PostInst/PostRm script to update pango.modules file.
+Package which install pango module(s) should call update-pango-modules
+in its PostInst/PostRm script to update pango.modules file.
Currently, uses example pangox.aliases without modification. For future, it
should be managed by font managing system like defoma (Debian font manager).
Index: pango1-xft2-ft219.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2-ft219.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pango1-xft2-ft219.patch 7 Mar 2005 00:33:27 -0000 1.1
+++ pango1-xft2-ft219.patch 5 Jun 2005 07:14:09 -0000 1.2
@@ -6,7 +6,7 @@
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules docs tools
++SUBDIRS = pango modules docs tools tests
EXTRA_DIST = \
pango.pc.in \
Index: pango1-xft2-ft219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pango1-xft2-ft219.info 19 Mar 2005 14:52:21 -0000 1.3
+++ pango1-xft2-ft219.info 5 Jun 2005 07:14:09 -0000 1.4
@@ -1,47 +1,50 @@
Package: pango1-xft2-ft219
Version: 1.6.0
-Revision: 2
+Revision: 3
Depends: %N-shlibs (=%v-%r), gettext, glib2 (>= 2.4.0-1), libiconv,
expat-shlibs
BuildDepends: <<
-glib2-dev (>= 2.4.0-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
-x11-dev, xft2-dev, gettext-dev, libiconv-dev, gcc3.3,
-freetype219, fontconfig2-dev
+ glib2-dev (>= 2.4.0-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
+ x11-dev, xft2-dev, gettext-dev, libiconv-dev, gcc3.3,
+ freetype219, fontconfig2-dev, expat
<<
Source: mirror:gnome:sources/pango/1.6/pango-%v.tar.bz2
Source-MD5: 6c732bbc5fba5a0f1f8086e8aa4f490d
PatchScript: <<
-#!/bin/bash -ev
-sed 's|@PREFIX@|%p|' <%a/%n.patch | patch -p1
+ #!/bin/bash -ev
+ sed 's|@PREFIX@|%p|' <%a/%n.patch | patch -p1
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
SetLDFLAGS: -no-undefined -L%p/lib/freetype219/lib -L/usr/X11R6/lib -lexpat
-ConfigureParams: --mandir=%p/share/man --includedir=%p/lib/pango-ft219/include
--libdir=%p/lib/pango-ft219/lib --sysconfdir=%p/lib/pango-ft219/etc
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--includedir=%p/lib/pango-ft219/include --libdir=%p/lib/pango-ft219/lib
--sysconfdir=%p/lib/pango-ft219/etc
CompileScript: <<
-#!/bin/bash -ev
-export LD_TWOLEVEL_NAMESPACE=1
-export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
-export
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig
-./configure %c
-make -j2
+ #!/bin/bash -ev
+ export LD_TWOLEVEL_NAMESPACE=1
+ export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ export
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig
+ ./configure %c
+ make -j2
+ make check
<<
InstallScript: <<
-#!/bin/bash -ev
- make install DESTDIR=%d
- rm -rf %i/share/gtk-doc
- mv %i/bin/pango-querymodules %i/bin/pango-ft219-querymodules
- mv %i/share/man/man1/pango-querymodules.1
%i/share/man/man1/pango-ft219-querymodules.1
- install -d -m 755 %i/sbin
- SYSCONFDIR=%i/lib/pango-ft219/etc
- sed -e 's|%p/etc|%p/lib/pango-ft219/etc|' -e 's|query|ft219-query|'
update-pango-modules > update-pango-ft219-modules
- install -c -m 755 update-pango-ft219-modules %i/sbin
- install -d -m 755 $SYSCONFDIR/pango
- install -c -m 644 examples/pangox.aliases $SYSCONFDIR/pango
+ #!/bin/bash -ev
+ make install DESTDIR=%d
+ rm -rf %i/share/gtk-doc
+ mv %i/bin/pango-querymodules %i/bin/pango-ft219-querymodules
+ mv %i/share/man/man1/pango-querymodules.1
%i/share/man/man1/pango-ft219-querymodules.1
+ install -d -m 755 %i/sbin
+ SYSCONFDIR=%i/lib/pango-ft219/etc
+ sed -e 's|%p/etc|%p/lib/pango-ft219/etc|' -e 's|query|ft219-query|'
update-pango-modules > update-pango-ft219-modules
+ install -c -m 755 update-pango-ft219-modules %i/sbin
+ install -d -m 755 $SYSCONFDIR/pango
+ install -c -m 644 examples/pangox.aliases $SYSCONFDIR/pango
<<
PostInstScript: <<
- update-pango-ft219-modules
+ if [ configure = "$1" ]; then
+ update-pango-modules
+ fi
<<
PostRmScript: <<
case "$1" in
@@ -54,18 +57,18 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: gettext, glib2-shlibs (>= 2.4.0-1), libiconv, x11-shlibs,
xft2-shlibs
+ Depends: gettext, glib2-shlibs (>= 2.4.0-1), libiconv, x11-shlibs,
xft2-shlibs, expat-shlibs
Files: <<
- lib/pango-ft219/lib/lib*-1.0.*.dylib
+ lib/pango-ft219/lib/lib*-1.0.*.dylib
lib/pango-ft219/lib/pango
<<
Shlibs: <<
- %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
- %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
- %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
- %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 201.0.0 %n (>= 1.3.2-1)
+ %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 601.0.0 %n (>= 1.6.0-3)
+ %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 601.0.0 %n (>= 1.6.0-3)
+ %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 601.0.0 %n (>= 1.6.0-3)
+ %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 601.0.0 %n (>= 1.6.0-3)
<<
- Description: GTK+ - i18n text shared libraries: for XFree86 (>= 4.3)
+ Description: GTK+ - i18n text shared libraries: for freetype >= 2.1.9
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
SplitOff2: <<
@@ -73,11 +76,10 @@
Depends: %N-shlibs (=%v-%r)
BuildDependsOnly: True
Files: <<
- lib/pango-ft219/include
- lib/pango-ft219/lib/lib*-1.0.*
- lib/pango-ft219/lib/pkgconfig
+ lib/pango-ft219/include
+ lib/pango-ft219/lib
<<
- Description: GTK+ - i18n text development headers and libraries: for XFree86
(>= 4.3)
+ Description: GTK+ - i18n text development headers and libraries: for
freetype >= 2.1.9
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
ConfFiles: %p/lib/pango-ft219/etc/pango/pangox.aliases
@@ -86,11 +88,14 @@
DescDetail: <<
These packages link against freetype219 instead of the built-in freetype.
+The gtk-doc docs are not installed. To get them, install the non-ft219
+packages, which can peacefully coexist with the -xf219 packages.
+
System for layout and rendering of internationalized text.
<<
DescPackaging: <<
Package which install pango module(s) should call update-pango-ft219-modules
-in it's PostInst/PostRm script to update pango.modules file.
+in its PostInst/PostRm script to update pango.modules file.
Currently, uses example pangox.aliases without modification. For future, it
should be managed by font managing system like defoma (Debian font manager).
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
