Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25785
Modified Files:
pango1-xft2.info pango1-xft2.patch
Log Message:
Versioned depend for gtk+2 update
Index: pango1-xft2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/pango1-xft2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pango1-xft2.patch 20 Jan 2006 20:12:53 -0000 1.1
+++ pango1-xft2.patch 2 Mar 2007 15:33:44 -0000 1.2
@@ -1,19 +1,88 @@
-diff -ruN pango-1.6.0-orig/Makefile.in pango-1.6.0/Makefile.in
---- pango-1.6.0-orig/Makefile.in 2004-12-31 01:47:39.000000000 -0800
-+++ pango-1.6.0/Makefile.in 2004-12-31 01:47:52.000000000 -0800
-@@ -234,7 +234,7 @@
+diff -Nurd -x'*~' pango-1.10.1.orig/Makefile.in pango-1.10.1/Makefile.in
+--- pango-1.10.1.orig/Makefile.in 2005-10-03 09:12:52.000000000 -0400
++++ pango-1.10.1/Makefile.in 2005-11-29 17:46:38.000000000 -0500
+@@ -253,7 +253,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 \
-diff -ruN pango-1.6.0-orig/ltmain.sh pango-1.6.0/ltmain.sh
---- pango-1.6.0-orig/ltmain.sh 2004-12-31 01:47:39.000000000 -0800
-+++ pango-1.6.0/ltmain.sh 2004-12-31 01:47:52.000000000 -0800
-@@ -5266,10 +5266,10 @@
+ pango.pc.in \
+diff -Nurd -x'*~' pango-1.10.1.orig/configure pango-1.10.1/configure
+--- pango-1.10.1.orig/configure 2005-10-03 09:12:55.000000000 -0400
++++ pango-1.10.1/configure 2005-11-29 18:05:22.000000000 -0500
+@@ -22202,51 +22202,8 @@
+
+
+ pkg_failed=no
+-echo "$as_me:$LINENO: checking for CAIRO" >&5
+-echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6
+-
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >=
0.5.2-head\"") >&5
+- ($PKG_CONFIG --exists --print-errors "cairo >= 0.5.2-head") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 0.5.2-head" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >=
0.5.2-head\"") >&5
+- ($PKG_CONFIG --exists --print-errors "cairo >= 0.5.2-head") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 0.5.2-head" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+-else
+- pkg_failed=untried
+-fi
+-
+-if test $pkg_failed = yes; then
+- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo
>= 0.5.2-head"`
+- # Put the nasty error message in config.log where it belongs
+- echo "$CAIRO_PKG_ERRORS" 1>&5
+-
+- :
+-elif test $pkg_failed = untried; then
+- :
+-else
+- CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
+- CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
+- have_cairo=true
+-fi
++echo "$as_me:$LINENO: avoiding CAIRO" >&5
++echo "avoiding cairo" >&6
+
+ if $have_cairo ; then
+ pango_save_ldflags=$LDFLAGS
+diff -Nurd -x'*~' pango-1.10.1.orig/docs/pango-querymodules.1
pango-1.10.1/docs/pango-querymodules.1
+--- pango-1.10.1.orig/docs/pango-querymodules.1 2005-10-03
09:15:30.000000000 -0400
++++ pango-1.10.1/docs/pango-querymodules.1 2005-11-29 17:50:06.000000000
-0500
+@@ -40,7 +40,7 @@
+ .SH "ENVIRONMENT"
+
+ .PP
+-The Pango module path is specified by the key Pango/ModulesPath in the Pango
config database, which is read from \fI\fIsysconfdir\fR/pango/pangorc\fR,
\fI~/\&.pangorc\fR and the file specified in the environment variable
\fBPANGO_RC_FILE\fR\&.
++The Pango module path is specified by the key Pango/ModulesPath in the Pango
config database, which is read from [EMAIL PROTECTED]@/pango/pangorc\fR,
\fI~/\&.pangorc\fR and the file specified in the environment variable
\fBPANGO_RC_FILE\fR\&.
+
+ .SH "BUGS"
+
+diff -Nurd -x'*~' pango-1.10.1.orig/ltmain.sh pango-1.10.1/ltmain.sh
+--- pango-1.10.1.orig/ltmain.sh 2005-09-14 11:00:12.000000000 -0400
++++ pango-1.10.1/ltmain.sh 2005-11-29 17:55:11.000000000 -0500
+@@ -5360,10 +5360,6 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -21,38 +90,34 @@
- $echo >> $output "\
-relink_command=\"$relink_command\""
- fi
-+# if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+# fi
done
fi
-diff -ruN pango-1.6.0-orig/pango/Makefile.in pango-1.6.0/pango/Makefile.in
---- pango-1.6.0-orig/pango/Makefile.in 2004-12-31 01:47:38.000000000 -0800
-+++ pango-1.6.0/pango/Makefile.in 2004-12-31 01:49:35.000000000 -0800
-@@ -381,7 +381,7 @@
+diff -Nurd -x'*~' pango-1.10.1.orig/pango/Makefile.in
pango-1.10.1/pango/Makefile.in
+--- pango-1.10.1.orig/pango/Makefile.in 2005-10-03 09:12:54.000000000
-0400
++++ pango-1.10.1/pango/Makefile.in 2005-11-29 18:59:48.000000000 -0500
+@@ -412,7 +412,7 @@
- libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined)
+ libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la
libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) $(GLIB_LIBS)
+libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la
libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) $(GLIB_LIBS) $(X_LIBS)
libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la
libpango-$(PANGO_API_VERSION).la
libpangoxft_1_0_la_SOURCES = \
-diff -ruN pango-1.6.0-orig/update-pango-modules
pango-1.6.0/update-pango-modules
---- pango-1.6.0-orig/update-pango-modules 1969-12-31 16:00:00.000000000
-0800
-+++ pango-1.6.0/update-pango-modules 2004-12-31 01:47:52.000000000 -0800
+diff -Nurd -x'*~' pango-1.10.1.orig/update-pango-modules
pango-1.10.1/update-pango-modules
+--- pango-1.10.1.orig/update-pango-modules 1969-12-31 19:00:00.000000000
-0500
++++ pango-1.10.1/update-pango-modules 2005-11-29 17:51:24.000000000 -0500
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# update-pango-modules
+#
-+# Package which install pango module(s) should call update-pango-modules in
-+# it's PostInstScript/PostRmScript to update pango.module file.
++# Packages which install pango module(s) should call update-pango-modules
++# in their PostInstScript and PostRmScript to update the pango.module file.
+#
+
[EMAIL PROTECTED]@/etc/pango
[EMAIL PROTECTED]@/pango
+CONFFILE=$CONFDIR/pango.modules
+
+mkdir -p $CONFDIR
Index: pango1-xft2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/pango1-xft2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pango1-xft2.info 14 Jan 2007 15:16:04 -0000 1.4
+++ pango1-xft2.info 2 Mar 2007 15:33:44 -0000 1.5
@@ -1,77 +1,120 @@
Package: pango1-xft2
-Version: 1.6.0
-Revision: 1002
-Depends: %N-shlibs (=%v-%r), gettext, glib2 (>= 2.6.6-1111), libiconv
-Provides: pango1
+Version: 1.10.1
+Revision: 1003
+Depends: %N-shlibs (=%v-%r), glib2-shlibs (>= 2.12.0-1), libgettext3-shlibs,
libiconv
Replaces: pango1
Conflicts: pango1-xft1
-BuildDepends: glib2-dev (>= 2.6.6-1111), pkgconfig (>= 0.15.0-2), gtk-doc (>=
1.2-1), x11-dev, xft2-dev, x11-dev, gettext-dev, libiconv-dev
-Source: mirror:gnome:sources/pango/1.6/pango-%v.tar.bz2
-Source-MD5: 6c732bbc5fba5a0f1f8086e8aa4f490d
-PatchScript: sed 's|@PREFIX@|%p|' <%a/%n.patch | patch -p1
+BuildDepends: <<
+ glib2-dev (>= 2.12.0-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
+ x11-dev, xft2-dev, libgettext3-dev, libiconv-dev
+<<
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: 1ff4c96982f61ea6f390d09a4febdf18
+PatchScript: <<
+ #!/bin/bash -ev
+ SYSCONFDIR=%p/etc
+ perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|$s|' $SYSCONFDIR
<%a/%n.patch | patch -p1
+<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -pipe
+SetCFLAGS: -Os -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
--enable-static
+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
+ SYSCONFDIR=%i/etc
+ install -d -m 755 %i/sbin
+ 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
- update-pango-modules
+ %p/sbin/update-pango-modules
fi
<<
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
<<
SplitOff: <<
Package: %N-shlibs
- Depends: gettext, glib2-shlibs (>= 2.6.6-1111), libiconv, x11-shlibs,
xft2-shlibs
- Provides: pango1-shlibs
+ Depends: <<
+ libgettext3-shlibs, glib2-shlibs (>= 2.12.0-1), libiconv, x11-shlibs,
xft2-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 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)
+ %p/lib/libpango-1.0.0.dylib 1002.0.0 %n (>= 1.10.1-1)
+ %p/lib/libpangoft2-1.0.0.dylib 1002.0.0 %n (>= 1.10.1-1)
+ %p/lib/libpangox-1.0.0.dylib 1002.0.0 %n (>= 1.10.1-1)
+ %p/lib/libpangoxft-1.0.0.dylib 1002.0.0 %n (>= 1.10.1-1)
<<
- Description: GTK+ - i18n text shared libraries: for XFree86 (>= 4.3)
+ Description: GTK+ - i18n text shared libraries (for XFree86 >= 4.3)
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (=%v-%r)
- Provides: pango1-dev
Replaces: pango1-dev
Conflicts: pango1-xft1-dev
BuildDependsOnly: True
- Files: include lib/lib*-1.0.* lib/pkgconfig share/gtk-doc
- Description: GTK+ - i18n text development headers and libraries: for XFree86
(>= 4.3)
+ 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.
+Description: GTK+ - i18n libs (for XFree86 >= 4.3)
+DescDetail: <<
+System for layout and rendering of internationalized text.
+
+These packages link against the freetype that comes as part of x11.
+<<
DescPackaging: <<
-Package which install pango module(s) should call update-pango-modules in it's
-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).
-Currently, uses example pangox.aliases without modification. For future, it
-should be managed by font managing system like defoma (Debian font manager).
+ To prevent a dependency mess, so patch configure to make sure we
+ don't detect cairo. Ideally we'll link it (and add (Build)Depends)
+ then remove all traces of it from the .la and .pc so that we don't
+ have to rev-up and add versioned BuildDepends to all pkgs that
+ use us. If even we *can* use cairo without ft219?
+<<
+DescPort: <<
+ Instead of requiring xslt to build this package, we just manually
+ patch the pregenerated manpage target that is included in the
+ tarball.
+
+ check uses some C++ but it doesn't leak out into the installed
+ package
+<<
+DescUsage: <<
+Packages which install pango module(s) should call update-pango-modules
+in their PostInstScript and PostRmScript to update the pango.modules file.
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
