Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9634/10.3/unstable/main/finkinfo/gnome
Modified Files:
pango1-dev.info pango1-shlibs.info pango1-xft2-ft219.info
pango1-xft2-ft219.patch pango1-xft2.info pango1-xft2.patch
Log Message:
New version (1.10.0). Propagate libjpeg/ImageIO patch to all variants and dists.
No cairo support b/c no cairo package in fink.
Index: pango1-xft2-ft219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pango1-xft2-ft219.info 22 Jun 2005 06:13:55 -0000 1.8
+++ pango1-xft2-ft219.info 16 Aug 2005 04:58:11 -0000 1.9
@@ -1,26 +1,43 @@
+
Package: pango1-xft2-ft219
-Version: 1.8.1
-Revision: 4
+Version: 1.10.0
+
+### This .info has OS-specific features...don't blindly copy 10.3<->10.4!
+Revision: 1
+
Depends: %N-shlibs (=%v-%r), libgettext3-shlibs, glib2 (>= 2.5.7-1), libiconv,
expat-shlibs
BuildDepends: <<
glib2-dev (>= 2.5.7-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
x11-dev, xft2-dev, libgettext3-dev, libiconv-dev, gcc3.3,
freetype219, fontconfig2-dev, expat
<<
-Source: mirror:gnome:sources/pango/1.8/pango-%v.tar.bz2
-Source-MD5: 88aa6bf1876766db6864f3b93577887c
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: c75489ec7f5fe77e31e4cbde71ad0c16
PatchScript: <<
#!/bin/bash -ev
SYSCONFDIR=%p/lib/pango-ft219/etc
perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|%p|; s|[EMAIL
PROTECTED]@|$s|' $SYSCONFDIR <%a/%n.patch | patch -p1
sed -e 's|query|ft219-query|' update-pango-modules >
update-pango-ft219-modules
+
+# Fix jpeg/ImageIO problem
+cat <<PATCHEOF | patch -lu ltmain.sh
+@@ -2400,7 +2400,7 @@
+ if test -n "\$library_names" &&
+ { test "\$prefer_static_libs" = no || test -z "\$old_library"; };
then
+ # We need to hardcode the library path
+- if test -n "\$shlibpath_var"; then
++ if test -n "\$shlibpath_var" && test "\$installed" = no; then
+ # Make sure the rpath contains only unique directories.
+ case "\$temp_rpath " in
+ *" \$dir "*) ;;
+<<PATCHEOF
<<
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 --disable-dependency-tracking
--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 --enable-static
CompileScript: <<
#!/bin/bash -ev
export LD_TWOLEVEL_NAMESPACE=1
@@ -64,10 +81,10 @@
lib/pango-ft219/lib/pango
<<
Shlibs: <<
- %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
- %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
- %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
- %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
+ %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+ %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+ %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+ %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
<<
Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9)
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
@@ -99,6 +116,11 @@
Currently, uses example pangox.aliases without modification. For
future, it should be managed by font managing system like defoma
(Debian font manager).
+
+ Fink has no cairo package yet, so patch configure to make sure we
+ don't accidentally detect some other cairo on the system. When a
+ package for cairo>=0.5.2-head becomes available, remove patch and
+ set (Build)Depends for it.
<<
DescPort: <<
Instead of requiring xslt to build this package, we just manually
@@ -107,6 +129,10 @@
check uses some C++ but it doesn't leak out into the installed
package
+
+ When we get cairo, need to check whether we need to move
+ CAIRO_CFLAGS to appear after FREETYPE_CFLAGS (and maybe after
+ XFT_CFLAGS?) in the various Makefile.in
<<
DescUsage: <<
Packages which install pango module(s) should call update-pango-ft219-modules
Index: pango1-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-shlibs.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pango1-shlibs.info 7 Jun 2005 14:03:54 -0000 1.7
+++ pango1-shlibs.info 16 Aug 2005 04:58:11 -0000 1.8
@@ -1,5 +1,5 @@
Package: pango1-shlibs
-Version: 1.8.1
+Version: 1.10.0
Revision: 1
Type: bundle
Depends: pango1-xft2-shlibs (>= %v-%r)
Index: pango1-xft2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pango1-xft2.info 22 Jun 2005 06:13:55 -0000 1.16
+++ pango1-xft2.info 16 Aug 2005 04:58:11 -0000 1.17
@@ -1,6 +1,6 @@
Package: pango1-xft2
-Version: 1.8.1
-Revision: 3
+Version: 1.10.0
+Revision: 1
Depends: %N-shlibs (=%v-%r), libgettext3-shlibs, glib2 (>= 2.5.7-1), libiconv
Provides: pango1
Replaces: pango1
@@ -9,19 +9,32 @@
glib2-dev (>= 2.5.7-1), pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.2-1),
x11-dev, xft2-dev, libgettext3-dev, libiconv-dev, gcc3.3
<<
-Source: mirror:gnome:sources/pango/1.8/pango-%v.tar.bz2
-Source-MD5: 88aa6bf1876766db6864f3b93577887c
+Source: mirror:gnome:sources/pango/1.10/pango-%v.tar.bz2
+Source-MD5: c75489ec7f5fe77e31e4cbde71ad0c16
PatchScript: <<
#!/bin/bash -ev
SYSCONFDIR=%p/etc
perl -p -e 'BEGIN{$s=shift} s|[EMAIL PROTECTED]@|%p|; s|[EMAIL
PROTECTED]@|$s|' $SYSCONFDIR <%a/%n.patch | patch -p1
+
+# Fix jpeg/ImageIO problem
+cat <<PATCHEOF | patch -lu ltmain.sh
+@@ -2400,7 +2400,7 @@
+ if test -n "\$library_names" &&
+ { test "\$prefer_static_libs" = no || test -z "\$old_library"; };
then
+ # We need to hardcode the library path
+- if test -n "\$shlibpath_var"; then
++ if test -n "\$shlibpath_var" && test "\$installed" = no; then
+ # Make sure the rpath contains only unique directories.
+ case "\$temp_rpath " in
+ *" \$dir "*) ;;
+<<PATCHEOF
<<
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 --disable-dependency-tracking
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--enable-static
CompileScript: <<
#!/bin/bash -ev
export LD_TWOLEVEL_NAMESPACE=1
@@ -64,10 +77,10 @@
lib/pango
<<
Shlibs: <<
- %p/lib/libpango-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
- %p/lib/libpangoft2-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
- %p/lib/libpangox-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
- %p/lib/libpangoxft-1.0.0.dylib 801.0.0 %n (>= 1.8.1-1)
+ %p/lib/libpango-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+ %p/lib/libpangoft2-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+ %p/lib/libpangox-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
+ %p/lib/libpangoxft-1.0.0.dylib 1001.0.0 %n (>= 1.10.0-1)
<<
Description: GTK+ - i18n text shared libraries (for XFree86 >= 4.3)
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
@@ -99,6 +112,11 @@
Currently, uses example pangox.aliases without modification. For
future, it should be managed by font managing system like defoma
(Debian font manager).
+
+ Fink has no cairo package yet, so patch configure to make sure we
+ don't accidentally detect some other cairo on the system. When a
+ package for cairo>=0.5.2-head becomes available, remove patch and
+ set (Build)Depends for it.
<<
DescPort: <<
Instead of requiring xslt to build this package, we just manually
Index: pango1-xft2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pango1-xft2.patch 16 Aug 2005 02:07:35 -0000 1.10
+++ pango1-xft2.patch 16 Aug 2005 04:58:11 -0000 1.11
@@ -1,7 +1,7 @@
-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.0.orig/Makefile.in pango-1.10.0/Makefile.in
+--- pango-1.10.0.orig/Makefile.in 2005-08-15 19:11:32.000000000 -0400
++++ pango-1.10.0/Makefile.in 2005-08-15 22:16:31.000000000 -0400
+@@ -252,7 +252,7 @@
AUTOMAKE_OPTIONS = 1.7
@@ -9,10 +9,120 @@
+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
+ pango.pc.in \
+diff -Nurd -x'*~' pango-1.10.0.orig/configure pango-1.10.0/configure
+--- pango-1.10.0.orig/configure 2005-08-15 19:11:36.000000000 -0400
++++ pango-1.10.0/configure 2005-08-15 22:45:40.000000000 -0400
+@@ -21600,102 +21600,11 @@
+ have_cairo_freetype=false
+ have_cairo_win32=false
+
++echo "$as_me:$LINENO: avoiding cairo" >&5
++echo "avoiding cairo" >&6
+
+- succeeded=no
+-
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name
with args.
+-set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+-if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- fi
+-
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for cairo >= 0.5.2-head" >&5
+-echo $ECHO_N "checking for cairo >= 0.5.2-head... $ECHO_C" >&6
+-
+- if $PKG_CONFIG --exists "cairo >= 0.5.2-head" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- succeeded=yes
+-
+- echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
+-echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
+- CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 0.5.2-head"`
+- echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
+-echo "${ECHO_T}$CAIRO_CFLAGS" >&6
+-
+- echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
+-echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
+- CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 0.5.2-head"`
+- echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
+-echo "${ECHO_T}$CAIRO_LIBS" >&6
+- else
+- CAIRO_CFLAGS=""
+- CAIRO_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"cairo >= 0.5.2-head"`
+-
+- fi
+-
+-
+-
+- else
+- echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig";
+- fi
+- fi
+-
+- if test $succeeded = yes; then
+- have_cairo=true
+- else
+- :
+- fi
+-
++CAIRO_CFLAGS=""
++CAIRO_LIBS=""
+
+ if $have_cairo ; then
+ pango_save_ldflags=$LDFLAGS
+diff -Nurd -x'*~' pango-1.10.0.orig/ltmain.sh pango-1.10.0/ltmain.sh
+--- pango-1.10.0.orig/ltmain.sh 2005-03-15 12:46:09.000000000 -0500
++++ pango-1.10.0/ltmain.sh 2005-08-15 22:16:31.000000000 -0400
@@ -5266,10 +5266,6 @@
# Directory that this library needs to be installed in:
@@ -24,21 +134,21 @@
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.0.orig/pango/Makefile.in
pango-1.10.0/pango/Makefile.in
+--- pango-1.10.0.orig/pango/Makefile.in 2005-08-15 19:11:35.000000000
-0400
++++ pango-1.10.0/pango/Makefile.in 2005-08-15 22:16:31.000000000 -0400
+@@ -410,7 +410,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.0.orig/update-pango-modules
pango-1.10.0/update-pango-modules
+--- pango-1.10.0.orig/update-pango-modules 1969-12-31 19:00:00.000000000
-0500
++++ pango-1.10.0/update-pango-modules 2005-08-15 22:16:31.000000000 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
@@ -60,9 +170,9 @@
+chmod 0644 $CONFFILE
+
+exit 0
-diff -ruN pango-1.8.1-orig/docs/pango-querymodules.1
pango-1.8.1/docs/pango-querymodules.1
---- pango-1.8.1-orig/docs/pango-querymodules.1 2005-03-04 15:09:45.000000000
-0500
-+++ pango-1.8.1/docs/pango-querymodules.1 2005-06-07 08:00:36.000000000
-0400
+diff -Nurd -x'*~' pango-1.10.0.orig/docs/pango-querymodules.1
pango-1.10.0/docs/pango-querymodules.1
+--- pango-1.10.0.orig/docs/pango-querymodules.1 2005-08-15
19:12:40.000000000 -0400
++++ pango-1.10.0/docs/pango-querymodules.1 2005-08-15 22:16:31.000000000
-0400
@@ -40,7 +40,7 @@
.SH "ENVIRONMENT"
Index: pango1-xft2-ft219.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-xft2-ft219.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pango1-xft2-ft219.patch 16 Aug 2005 02:07:35 -0000 1.4
+++ pango1-xft2-ft219.patch 16 Aug 2005 04:58:11 -0000 1.5
@@ -1,7 +1,7 @@
-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.0.orig/Makefile.in pango-1.10.0/Makefile.in
+--- pango-1.10.0.orig/Makefile.in 2005-08-15 19:11:32.000000000 -0400
++++ pango-1.10.0/Makefile.in 2005-08-15 22:16:31.000000000 -0400
+@@ -252,7 +252,7 @@
AUTOMAKE_OPTIONS = 1.7
@@ -9,11 +9,11 @@
+SUBDIRS = pango modules docs tools tests
EXTRA_DIST = \
- pango.pc.in \
-diff -ruN pango-1.6.0-orig/configure pango-1.6.0/configure
---- pango-1.6.0-orig/configure Fri Dec 31 01:47:39 2004
-+++ pango-1.6.0/configure Mon Jan 24 03:49:44 2005
-@@ -21346,8 +21346,8 @@
+ pango.pc.in \
+diff -Nurd -x'*~' pango-1.10.0.orig/configure pango-1.10.0/configure
+--- pango-1.10.0.orig/configure 2005-08-15 19:11:36.000000000 -0400
++++ pango-1.10.0/configure 2005-08-15 22:45:40.000000000 -0400
+@@ -21431,8 +21431,8 @@
LDFLAGS=$pango_save_ldflags
fi
@@ -24,7 +24,7 @@
-@@ -21420,13 +21420,13 @@
+@@ -21505,13 +21505,13 @@
echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5
echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6
@@ -40,12 +40,119 @@
echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
echo "${ECHO_T}$XFT_LIBS" >&6
else
-diff -ruN pango-1.6.0-orig/docs/Makefile.in pango-1.6.0/docs/Makefile.in
---- pango-1.6.0-orig/docs/Makefile.in Fri Dec 31 01:47:38 2004
-+++ pango-1.6.0/docs/Makefile.in Sun Jan 23 01:53:46 2005
-@@ -279,8 +279,8 @@
- -DPANGO_ENABLE_ENGINE \
+@@ -21600,102 +21600,11 @@
+ have_cairo_freetype=false
+ have_cairo_win32=false
+
++echo "$as_me:$LINENO: avoiding cairo" >&5
++echo "avoiding cairo" >&6
+
+- succeeded=no
+-
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name
with args.
+-set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+-if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+- fi
+-
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for cairo >= 0.5.2-head" >&5
+-echo $ECHO_N "checking for cairo >= 0.5.2-head... $ECHO_C" >&6
+-
+- if $PKG_CONFIG --exists "cairo >= 0.5.2-head" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- succeeded=yes
+-
+- echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
+-echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
+- CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 0.5.2-head"`
+- echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
+-echo "${ECHO_T}$CAIRO_CFLAGS" >&6
+-
+- echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
+-echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
+- CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 0.5.2-head"`
+- echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
+-echo "${ECHO_T}$CAIRO_LIBS" >&6
+- else
+- CAIRO_CFLAGS=""
+- CAIRO_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"cairo >= 0.5.2-head"`
+-
+- fi
+-
+-
+-
+- else
+- echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig";
+- fi
+- fi
+-
+- if test $succeeded = yes; then
+- have_cairo=true
+- else
+- :
+- fi
+-
++CAIRO_CFLAGS=""
++CAIRO_LIBS=""
+
+ if $have_cairo ; then
+ pango_save_ldflags=$LDFLAGS
+diff -Nurd -x'*~' pango-1.10.0.orig/docs/Makefile.in
pango-1.10.0/docs/Makefile.in
+--- pango-1.10.0.orig/docs/Makefile.in 2005-08-15 19:11:32.000000000 -0400
++++ pango-1.10.0/docs/Makefile.in 2005-08-15 22:25:48.000000000 -0400
+@@ -302,8 +302,8 @@
-I$(top_srcdir) \
+ $(CAIRO_CFLAGS) \
$(GLIB_CFLAGS) \
- $(XFT_CFLAGS) \
$(FREETYPE_CFLAGS) \
@@ -53,9 +160,9 @@
$(X_CFLAGS)
-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
+diff -Nurd -x'*~' pango-1.10.0.orig/ltmain.sh pango-1.10.0/ltmain.sh
+--- pango-1.10.0.orig/ltmain.sh 2005-03-15 12:46:09.000000000 -0500
++++ pango-1.10.0/ltmain.sh 2005-08-15 22:16:31.000000000 -0400
@@ -5266,10 +5266,6 @@
# Directory that this library needs to be installed in:
@@ -67,44 +174,45 @@
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
-@@ -268,8 +268,8 @@
+diff -Nurd -x'*~' pango-1.10.0.orig/pango/Makefile.in
pango-1.10.0/pango/Makefile.in
+--- pango-1.10.0.orig/pango/Makefile.in 2005-08-15 19:11:35.000000000
-0400
++++ pango-1.10.0/pango/Makefile.in 2005-08-15 22:16:31.000000000 -0400
+@@ -295,9 +295,9 @@
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS) \
$(GLIB_CFLAGS) \
- $(XFT_CFLAGS) \
+ $(CAIRO_CFLAGS) \
$(FREETYPE_CFLAGS) \
+ $(XFT_CFLAGS) \
$(X_CFLAGS) \
-I$(top_srcdir)
-@@ -381,7 +381,7 @@
+@@ -410,7 +410,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/tests/Makefile.in pango-1.6.0/tests/Makefile.in
---- pango-1.6.0-orig/tests/Makefile.in Fri Dec 31 01:47:38 2004
-+++ pango-1.6.0/tests/Makefile.in Sun Jan 23 01:54:15 2005
-@@ -235,8 +235,8 @@
- INCLUDES = \
+diff -Nurd -x'*~' pango-1.10.0.orig/tests/Makefile.in
pango-1.10.0/tests/Makefile.in
+--- pango-1.10.0.orig/tests/Makefile.in 2005-08-15 19:11:35.000000000
-0400
++++ pango-1.10.0/tests/Makefile.in 2005-08-15 22:31:32.000000000 -0400
+@@ -254,8 +254,8 @@
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
+ $(CAIRO_CFLAGS) \
- $(XFT_CFLAGS) \
$(FREETYPE_CFLAGS) \
+ $(XFT_CFLAGS) \
$(X_CFLAGS) \
-DG_DISABLE_DEPRECATED \
$(PANGO_DEBUG_FLAGS)\
-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.0.orig/update-pango-modules
pango-1.10.0/update-pango-modules
+--- pango-1.10.0.orig/update-pango-modules 1969-12-31 19:00:00.000000000
-0500
++++ pango-1.10.0/update-pango-modules 2005-08-15 22:16:31.000000000 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
@@ -126,9 +234,9 @@
+chmod 0644 $CONFFILE
+
+exit 0
-diff -ruN pango-1.8.1-orig/docs/pango-querymodules.1
pango-1.8.1/docs/pango-querymodules.1
---- pango-1.8.1-orig/docs/pango-querymodules.1 2005-03-04 15:09:45.000000000
-0500
-+++ pango-1.8.1/docs/pango-querymodules.1 2005-06-07 08:00:36.000000000
-0400
+diff -Nurd -x'*~' pango-1.10.0.orig/docs/pango-querymodules.1
pango-1.10.0/docs/pango-querymodules.1
+--- pango-1.10.0.orig/docs/pango-querymodules.1 2005-08-15
19:12:40.000000000 -0400
++++ pango-1.10.0/docs/pango-querymodules.1 2005-08-15 22:16:31.000000000
-0400
@@ -40,7 +40,7 @@
.SH "ENVIRONMENT"
Index: pango1-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/pango1-dev.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pango1-dev.info 7 Jun 2005 14:03:53 -0000 1.7
+++ pango1-dev.info 16 Aug 2005 04:58:11 -0000 1.8
@@ -1,5 +1,5 @@
Package: pango1-dev
-Version: 1.8.1
+Version: 1.10.0
Revision: 1
Type: bundle
Depends: pango1-xft2-dev (>= %v-%r)
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
