Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.26
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28885
Modified Files:
pango1-xft2-ft219.info pango1-xft2-ft219.patch
Log Message:
New version
Index: pango1-xft2-ft219.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.26/pango1-xft2-ft219.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pango1-xft2-ft219.patch 22 May 2009 06:54:13 -0000 1.1
+++ pango1-xft2-ft219.patch 5 Jun 2009 19:31:40 -0000 1.2
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' pango-1.22.0.orig/Makefile.in pango-1.22.0/Makefile.in
---- pango-1.22.0.orig/Makefile.in 2008-09-22 18:34:13.000000000 -0400
-+++ pango-1.22.0/Makefile.in 2008-09-27 02:16:57.000000000 -0400
-@@ -260,7 +260,7 @@
+diff -Nurd -x'*~' pango-1.24.2.orig/Makefile.in pango-1.24.2/Makefile.in
+--- pango-1.24.2.orig/Makefile.in 2009-05-04 16:05:21.000000000 -0400
++++ pango-1.24.2/Makefile.in 2009-06-05 01:01:54.000000000 -0400
+@@ -272,7 +272,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -10,10 +10,10 @@
EXTRA_DIST = \
autogen.sh \
pango.pc.in \
-diff -Nurd -x'*~' pango-1.22.0.orig/docs/Makefile.in
pango-1.22.0/docs/Makefile.in
---- pango-1.22.0.orig/docs/Makefile.in 2008-09-22 18:34:08.000000000 -0400
-+++ pango-1.22.0/docs/Makefile.in 2008-09-27 03:32:31.000000000 -0400
-@@ -272,9 +272,9 @@
+diff -Nurd -x'*~' pango-1.24.2.orig/docs/Makefile.in
pango-1.24.2/docs/Makefile.in
+--- pango-1.24.2.orig/docs/Makefile.in 2009-05-04 16:05:17.000000000 -0400
++++ pango-1.24.2/docs/Makefile.in 2009-06-05 01:07:04.000000000 -0400
+@@ -285,9 +285,9 @@
-DPANGO_ENABLE_ENGINE \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
@@ -25,204 +25,34 @@
$(X_CFLAGS)
-diff -Nurd -x'*~'
pango-1.22.0.orig/docs/html/pango-Miscellaneous-Utilities.html
pango-1.22.0/docs/html/pango-Miscellaneous-Utilities.html
---- pango-1.22.0.orig/docs/html/pango-Miscellaneous-Utilities.html
2008-09-22 18:37:13.000000000 -0400
-+++ pango-1.22.0/docs/html/pango-Miscellaneous-Utilities.html 2008-09-27
02:16:57.000000000 -0400
-@@ -411,7 +411,7 @@
- <pre class="programlisting">char* pango_config_key_get
(const char *key);</pre>
+diff -Nurd -x'*~'
pango-1.24.2.orig/docs/html/pango-Miscellaneous-Utilities.html
pango-1.24.2/docs/html/pango-Miscellaneous-Utilities.html
+--- pango-1.24.2.orig/docs/html/pango-Miscellaneous-Utilities.html
2009-05-04 16:14:38.000000000 -0400
++++ pango-1.24.2/docs/html/pango-Miscellaneous-Utilities.html 2009-06-05
01:02:35.000000000 -0400
+@@ -408,7 +408,7 @@
+ <pre class="programlisting">char * pango_config_key_get
(const char *key);</pre>
<p>
Looks up a key in the Pango config database
-(pseudo-win.ini style, read from $sysconfdir/pango/pangorc,
+(pseudo-win.ini style, read from @SYSCONFDIR@/pango/pangorc,
~/.pangorc, and getenv (PANGO_RC_FILE).)</p>
<p>
-
-diff -Nurd -x'*~' pango-1.22.0.orig/docs/pango-querymodules.1
pango-1.22.0/docs/pango-querymodules.1
---- pango-1.22.0.orig/docs/pango-querymodules.1 2008-09-22
18:37:12.000000000 -0400
-+++ pango-1.22.0/docs/pango-querymodules.1 2008-09-27 02:17:34.000000000
-0400
-@@ -188,7 +188,7 @@
+ </p>
+diff -Nurd -x'*~' pango-1.24.2.orig/docs/pango-querymodules.1
pango-1.24.2/docs/pango-querymodules.1
+--- pango-1.24.2.orig/docs/pango-querymodules.1 2009-04-17
21:19:00.000000000 -0400
++++ pango-1.24.2/docs/pango-querymodules.1 2009-06-05 01:03:05.000000000
-0400
+@@ -38,7 +38,7 @@
The Pango module path is specified by the key
- \FCPango/ModulesPath\F[]
+ Pango/ModulesPath
in the Pango config database, which is read from
--\FC\fIsysconfdir\fR/pango/pangorc\F[],
-+\fc...@sysconfdir@\fR/pango/pangorc\F[],
- \FC~/\&.pangorc\F[]
+-\fIsysconfdir\fR/pango/pangorc,
++...@sysconfdir@\fR/pango/pangorc,
+ ~/\&.pangorc
and the file specified in the environment variable
\fBPANGO_RC_FILE\fR\&.
-diff -Nurd -x'*~' pango-1.22.0.orig/ltmain.sh pango-1.22.0/ltmain.sh
---- pango-1.22.0.orig/ltmain.sh 2008-08-29 18:27:25.000000000 -0400
-+++ pango-1.22.0/ltmain.sh 2008-09-27 02:42:52.000000000 -0400
-@@ -2924,100 +2924,72 @@
- fi
- tmp_libs="$tmp_libs $deplib"
- done
--
-- if test "$link_all_deplibs" != no; then
-- # Add the search paths of all dependency libraries
-- for deplib in $dependency_libs; do
-- case $deplib in
-- -L*) path="$deplib" ;;
-- *.la)
-- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-- test "X$dir" = "X$deplib" && dir="."
-- # We need an absolute path.
-- case $dir in
-- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-- *)
-- absdir=`cd "$dir" && pwd`
-- if test -z "$absdir"; then
-- $echo "$modename: warning: cannot determine absolute
directory name of \`$dir'" 1>&2
-- absdir="$dir"
-- fi
-- ;;
-- esac
-- if grep "^installed=no" $deplib > /dev/null; then
-- path="$absdir/$objdir"
-- else
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-- if test -z "$libdir"; then
-- $echo "$modename: \`$deplib' is not a valid libtool
archive" 1>&2
-- exit $EXIT_FAILURE
-- fi
-- if test "$absdir" != "$libdir"; then
-- $echo "$modename: warning: \`$deplib' seems to be moved"
1>&2
-- fi
-- path="$absdir"
-- fi
-- depdepl=
-- case $host in
-- *-*-darwin*)
-- # we do not want to link against static libs,
-- # but need to link against shared
-- eval deplibrary_names=`${SED} -n -e
's/^library_names=\(.*\)$/\1/p' $deplib`
-- eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-- if test -n "$deplibrary_names" ; then
-- for tmp in $deplibrary_names ; do
-- depdepl=$tmp
-- done
-- if test -f "$deplibdir/$depdepl" ; then
-- depdepl="$deplibdir/$depdepl"
-- elif test -f "$path/$depdepl" ; then
-- depdepl="$path/$depdepl"
-- else
-- # Can't find it, oh well...
-- depdepl=
-- fi
-- # do not add paths which are already there
-- case " $newlib_search_path " in
-- *" $path "*) ;;
-- *) newlib_search_path="$newlib_search_path $path";;
-- esac
-- fi
-- path=""
-- ;;
-- *)
-- path="-L$path"
-- ;;
-- esac
-- ;;
-- -l*)
-- case $host in
-- *-*-darwin*)
-- # Again, we only want to link against shared libraries
-- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-- for tmp in $newlib_search_path ; do
-- if test -f "$tmp/lib$tmp_libs.dylib" ; then
-- eval depdepl="$tmp/lib$tmp_libs.dylib"
-- break
-- fi
-- done
-- path=""
-- ;;
-- *) continue ;;
-- esac
-- ;;
-- *) continue ;;
-- esac
-- case " $deplibs " in
-- *" $path "*) ;;
-- *) deplibs="$path $deplibs" ;;
-- esac
-- case " $deplibs " in
-- *" $depdepl "*) ;;
-- *) deplibs="$depdepl $deplibs" ;;
-- esac
-- done
-- fi # link_all_deplibs != no
-- fi # linkmode = lib
-+ if test "$link_all_deplibs" != no; then
-+ # Add the search paths of all dependency libraries
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ -L*) path="$deplib" ;;
-+ *.la)
-+# func_dirname "$deplib" "" "."
-+# dir="$func_dirname_result"
-+ case "$deplib" in
-+ */*) dir="${deplib%/*}" ;;
-+ * ) dir="." ;;
-+ esac
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+ *)
-+ absdir=`cd "$dir" && pwd`
-+ if test -z "$absdir"; then
-+ $echo "$modename: warning: cannot determine absolute
directory name of \`$dir'" 1>&2
-+ absdir="$dir"
-+ fi
-+ ;;
-+ esac
-+ if grep "^installed=no" $deplib > /dev/null; then
-+ case $host in
-+ *-*-darwin*)
-+ depdepl=
-+ eval deplibrary_names=`${SED} -n -e
's/^library_names=\(.*\)$/\1/p' $deplib`
-+ if test -n "$deplibrary_names" ; then
-+ for tmp in $deplibrary_names ; do
-+ depdepl=$tmp
-+ done
-+ if test -f "$absdir/$objdir/$depdepl" ; then
-+ depdepl="$absdir/$objdir/$depdepl"
-+ darwin_install_name=`otool -L $depdepl | awk '{if (NR
== 2) {print $1;exit}}'`
-+ if test -z "$darwin_install_name"; then
-+ darwin_install_name=`otool64 -L $depdepl | awk
'{if (NR == 2) {print $1;exit}}'`
-+ fi
-+ compiler_flags="$compiler_flags ${wl}-dylib_file
${wl}${darwin_install_name}:${depdepl}"
-+ linker_flags="$linker_flags -dylib_file
${darwin_install_name}:${depdepl}"
-+ path=
-+ fi
-+ fi
-+ ;;
-+ *)
-+ path="-L$absdir/$objdir"
-+ ;;
-+ esac
-+ else
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ test -z "$libdir" && \
-+ $echo "\`$deplib' is not a valid libtool archive" 1>&2
-+ test -z "$libdir" && exit 1
-+ test "$absdir" != "$libdir" && \
-+ $echo "\`$deplib' seems to be moved" 1>&2
-+ path="-L$absdir"
-+ fi
-+ ;;
-+ esac
-+ case " $deplibs " in
-+ *" $path "*) ;;
-+ *) deplibs="$path $deplibs" ;;
-+ esac
-+ done
-+ fi # link_all_deplibs != no
-+ fi # linkmode = lib
- done # for deplib in $libs
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
-diff -Nurd -x'*~' pango-1.22.0.orig/pango/Makefile.in
pango-1.22.0/pango/Makefile.in
---- pango-1.22.0.orig/pango/Makefile.in 2008-09-22 18:34:12.000000000
-0400
-+++ pango-1.22.0/pango/Makefile.in 2008-09-27 03:36:24.000000000 -0400
-@@ -431,9 +431,9 @@
+diff -Nurd -x'*~' pango-1.24.2.orig/pango/Makefile.in
pango-1.24.2/pango/Makefile.in
+--- pango-1.24.2.orig/pango/Makefile.in 2009-05-04 16:05:20.000000000
-0400
++++ pango-1.24.2/pango/Makefile.in 2009-06-05 01:03:38.000000000 -0400
+@@ -455,9 +455,9 @@
-I$(top_srcdir) \
$(PANGO_DEBUG_FLAGS) \
$(GLIB_CFLAGS) \
@@ -234,7 +64,7 @@
$(X_CFLAGS)
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
-@@ -571,9 +571,9 @@
+@@ -609,9 +609,9 @@
libpangoft2-$(PANGO_API_VERSION).la \
libpango-$(PANGO_API_VERSION).la \
$(GLIB_LIBS) \
@@ -246,22 +76,46 @@
$(libm)
libpangoxft_1_0_la_DEPENDENCIES = \
-diff -Nurd -x'*~' pango-1.22.0.orig/pango/opentype/Makefile.in
pango-1.22.0/pango/opentype/Makefile.in
---- pango-1.22.0.orig/pango/opentype/Makefile.in 2008-09-22
18:34:12.000000000 -0400
-+++ pango-1.22.0/pango/opentype/Makefile.in 2008-10-01 00:56:33.000000000
-0400
-@@ -239,8 +239,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = \
-- $(FREETYPE_CFLAGS) \
-- -I $(srcdir)
-+ -I $(srcdir) $(FREETYPE_CFLAGS)
+diff -Nurd -x'*~' pango-1.24.2.orig/pango/pangofc-fontmap.c
pango-1.24.2/pango/pangofc-fontmap.c
+--- pango-1.24.2.orig/pango/pangofc-fontmap.c 2009-04-09 13:28:05.000000000
-0400
++++ pango-1.24.2/pango/pangofc-fontmap.c 2009-06-05 01:41:42.000000000
-0400
+@@ -1359,10 +1359,16 @@
+ return FC_WEIGHT_BOLD;
+ else if (pango_weight <= (PANGO_WEIGHT_ULTRABOLD + PANGO_WEIGHT_HEAVY) / 2)
+ return FC_WEIGHT_ULTRABOLD;
++#if 0
++ /* only have FC_WEIGHT_EXTRABLACK on fontconfig >= 2.5 */
+ else if (pango_weight <= (PANGO_WEIGHT_HEAVY + PANGO_WEIGHT_ULTRAHEAVY) / 2)
+ return FC_WEIGHT_BLACK;
+ else
+ return FC_WEIGHT_EXTRABLACK;
++#else
++ else
++ return FC_WEIGHT_BLACK;
++#endif
+ }
- noinst_LTLIBRARIES = libharfbuzz-1.la
- MAINSOURCES = \
-diff -Nurd -x'*~' pango-1.22.0.orig/pangoxft.pc.in pango-1.22.0/pangoxft.pc.in
---- pango-1.22.0.orig/pangoxft.pc.in 2008-07-05 14:34:52.000000000 -0400
-+++ pango-1.22.0/pangoxft.pc.in 2008-09-27 02:16:57.000000000 -0400
+ static int
+@@ -2049,10 +2056,16 @@
+ return PANGO_WEIGHT_BOLD;
+ else if (fc_weight <= (FC_WEIGHT_EXTRABOLD + FC_WEIGHT_BLACK) / 2)
+ return PANGO_WEIGHT_ULTRABOLD;
++#if 0
++ /* only have FC_WEIGHT_EXTRABLACK on fontconfig >= 2.5 */
+ else if (fc_weight <= (FC_WEIGHT_BLACK + FC_WEIGHT_EXTRABLACK) / 2)
+ return PANGO_WEIGHT_HEAVY;
+ else
+ return PANGO_WEIGHT_ULTRAHEAVY;
++#else
++ else
++ return PANGO_WEIGHT_HEAVY;
++#endif
+ }
+
+ static PangoStyle
+diff -Nurd -x'*~' pango-1.24.2.orig/pangoxft.pc.in pango-1.24.2/pangoxft.pc.in
+--- pango-1.24.2.orig/pangoxft.pc.in 2009-02-06 18:49:34.000000000 -0500
++++ pango-1.24.2/pangoxft.pc.in 2009-06-05 01:03:57.000000000 -0400
@@ -6,6 +6,6 @@
Name: Pango Xft
Description: Xft font support for Pango
@@ -270,10 +124,10 @@
+Requires: pango pangoft2 xft pangox
Libs: -L${libdir} -lpangox...@pango_api_version@
Cflags: -I${includedir}/pango-1.0
-diff -Nurd -x'*~' pango-1.22.0.orig/tests/Makefile.in
pango-1.22.0/tests/Makefile.in
---- pango-1.22.0.orig/tests/Makefile.in 2008-09-22 18:34:12.000000000
-0400
-+++ pango-1.22.0/tests/Makefile.in 2008-09-27 02:16:57.000000000 -0400
-@@ -291,7 +291,7 @@
+diff -Nurd -x'*~' pango-1.24.2.orig/tests/Makefile.in
pango-1.24.2/tests/Makefile.in
+--- pango-1.24.2.orig/tests/Makefile.in 2009-05-04 16:05:21.000000000
-0400
++++ pango-1.24.2/tests/Makefile.in 2009-06-05 01:04:57.000000000 -0400
+@@ -303,7 +303,7 @@
CLEANFILES = pangorc
DISTCLEANFILES = all-unicode.txt runtests.log
INCLUDES = -I$(top_srcdir) $(PANGO_DEBUG_FLAGS) $(GLIB_CFLAGS) \
@@ -282,9 +136,9 @@
$(am__append_1) $(am__append_2) $(am__append_3)
TESTS_ENVIRONMENT = \
srcdir=$(srcdir) \
-diff -Nurd -x'*~' pango-1.22.0.orig/update-pango-modules
pango-1.22.0/update-pango-modules
---- pango-1.22.0.orig/update-pango-modules 1969-12-31 19:00:00.000000000
-0500
-+++ pango-1.22.0/update-pango-modules 2008-09-27 02:16:57.000000000 -0400
+diff -Nurd -x'*~' pango-1.24.2.orig/update-pango-modules
pango-1.24.2/update-pango-modules
+--- pango-1.24.2.orig/update-pango-modules 1969-12-31 19:00:00.000000000
-0500
++++ pango-1.24.2/update-pango-modules 2009-06-05 01:05:06.000000000 -0400
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
Index: pango1-xft2-ft219.info
===================================================================
RCS file:
/cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.26/pango1-xft2-ft219.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pango1-xft2-ft219.info 5 Jun 2009 06:24:14 -0000 1.3
+++ pango1-xft2-ft219.info 5 Jun 2009 19:31:40 -0000 1.4
@@ -1,10 +1,6 @@
Package: pango1-xft2-ft219
-
-# do not update beyond 1.22.x until 10.4 is unsupported or 10.4's
-# fontconfig is updated!
-Version: 1.22.4
-Revision: 4
-
+Version: 1.24.2
+Revision: 1
Description: GTK+ - i18n libs (for freetype >= 2.1.9)
License: LGPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
@@ -43,10 +39,10 @@
xft2-dev (>= 2.1.2-5)
<<
-Source: mirror:gnome:sources/pango/1.22/pango-%v.tar.bz2
-Source-MD5: 7c3f3748052799746d73c6d3a0cc1205
+Source: mirror:gnome:sources/pango/1.24/pango-%v.tar.bz2
+Source-MD5: 7bc6c884d847cabc613e4c6d663771f5
PatchFile: %n.patch
-PatchFile-MD5: a58706ef1ed9f047d33fdcb99943fa1b
+PatchFile-MD5: 230c80977b24ccd14163ec8b12e51fb4
PatchScript: <<
#!/bin/bash -ev
perl -pi -e 's,(-dynamiclib)( +-single_module)*,$1 -single_module,g'
configure
@@ -69,6 +65,8 @@
Cflags: -I${includedir}
Libs: -L${libdir} -lXrender -lX11 -lXext
END
+
+ perl -pi -e 's/(fontconfig) >= 2.5.0/\1/g' configure
<<
SetCPPFLAGS: -I%p/lib/fontconfig2/include
@@ -155,11 +153,11 @@
lib/pango-ft219/lib/pango
<<
Shlibs: <<
- %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 2204.0.0 %n
(>= 1.22.4-1)
- %p/lib/pango-ft219/lib/libpangocairo-1.0.0.dylib 2204.0.0 %n
(>= 1.22.4-1)
- %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 2204.0.0 %n
(>= 1.22.4-1)
- %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 2204.0.0 %n
(>= 1.22.4-1)
- %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 2204.0.0 %n
(>= 1.22.4-1)
+ %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 2401.0.0 %n
(>= 1.24-2-1)
+ %p/lib/pango-ft219/lib/libpangocairo-1.0.0.dylib 2401.0.0 %n
(>= 1.24.2-1)
+ %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 2401.0.0 %n
(>= 1.24.2-1)
+ %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 2401.0.0 %n
(>= 1.24.2-1)
+ %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 2401.0.0 %n
(>= 1.24.2-1)
<<
<<
SplitOff2: <<
@@ -220,10 +218,6 @@
check uses some C++ but it doesn't leak out into the installed
package
-
- Import ltmain.sh dependent-lib dependency handlers from
- libtool2 (prevents linking against installed lib instead of
- build-dir one). Thanks pogma!
<<
DescPackaging: <<
Need to use glib that has errno patches to avoid self-test
@@ -242,12 +236,12 @@
Make sure local -I come before global. See:
http://bugzilla.gnome.org/show_bug.cgi?id=572529
- Lots of runtime noise:
- ($prog:$pid): Pango-WARNING **: Error loading GDEF table 0x6EAD
- ($prog:$pid): Pango-WARNING **: Error loading GSUB table 0x6EAD
- ($prog:$pid): Pango-WARNING **: Error loading GPOS table 0x6EAD
- See: http://bugzilla.gnome.org/show_bug.cgi?id=540617
-
- New version will require fontconfig >= 2.5.0 See:
+ Knock down fontconfig version requirement that is higher than
+ what's available in fink on 10.4 and patch pangofc-fontmap.c
+ to avoid using the fc-2.5 functionaliy. See:
http://bugzilla.gnome.org/show_bug.cgi?id=584891
+
+ Ignoring "uninitialized value in concatenation" during gtkdoc
+ processing. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=584952
<<
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
