Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv781
Modified Files:
libgnomedb.info libgnomedb.patch
Log Message:
clean up deps for GNOME2.26; make sure we don't mis-link against installed
older libs; fix gtk-doc xrefs
Index: libgnomedb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/libgnomedb.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgnomedb.info 6 Nov 2008 16:31:55 -0000 1.3
+++ libgnomedb.info 2 Jul 2009 05:13:46 -0000 1.4
@@ -1,60 +1,60 @@
Package: libgnomedb
Version: 3.1.2
-Revision: 9
+Revision: 10
BuildDepends: <<
- atk1 (>= 1.24.0-1),
+ atk1 (>= 1.26.0-1),
audiofile,
- automake1.10,
avahi-dev,
cairo (>= 1.8-1),
dbus-dev (>= 1.2.1-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
- gconf2-dev (>= 2.24.0-1),
+ freetype219 (>= 2.3.8-2),
+ gconf2-dev (>= 2.26.0-1),
gettext-bin,
gettext-tools,
- glade3-dev (>= 3.4.5-2),
- glib2-dev (>= 2.18.0-1),
+ glade3-dev (>= 3.6.7-1),
+ glib2-dev (>= 2.20.0-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
- goocanvas (>= 0.12-1),
- gtk+2-dev (>= 2.14.0-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.1-1),
+ goocanvas (>= 0.14-1),
+ gtk+2-dev (>= 2.16.0-1),
+ gtk-doc (>= 1.8-1),
gtksourceview-dev (>= 1.8.5-2),
intltool40,
libart2,
libavahi-glib1-dev,
libgcrypt (>= 1.4.3-2),
- libgda4-dev (>= 3.1.5-1),
+ libgda4-dev (>= 3.1.5-5),
libgettext3-dev,
- libglade2 (>= 2.6.3-1),
- libgnome2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.1.1-1),
- libgnomeprint2.2-dev (>= 2.18.5-1),
+ libglade2 (>= 2.6.4-1),
+ libgnome2-dev (>= 2.26.0-1),
+ libgnomecanvas2-dev (>= 2.26.0-1),
+ libgnomeprint2.2-dev (>= 2.18.6-2),
libgpg-error,
libiconv-dev,
libpng3,
- libtool14,
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
- orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ orbit2-dev (>= 2.14.17-1),
+ pango1-xft2-ft219-dev (>= 1.24.0-1),
+ pixman (>= 0.14.0-1),
pkgconfig (>= 0.23),
readline5,
sqlite3-dev,
x11-dev,
xft2-dev
<<
-Depends: %N4-shlibs (= %v-%r), gconf2 (>= 2.24.0-1), rarian-compat
+Depends: %N4-shlibs (>= %v-%r), gconf2 (>= 2.26.0-1), rarian-compat
Source: mirror:gnome:sources/%n/3.1/%n-%v.tar.bz2
Source-MD5: 9896bd66451c3f1e2bdd1cd79d524348
PatchFile: %n.patch
-PatchFile-MD5: f75b84b3c222b79ae6e3b176e713d16d
+PatchFile-MD5: 9b440b816ffef0bdb505341a8137b1f3
PatchScript: <<
%{default_script}
perl -pi -e 's/-scrollkeeper-update/#$&/' doc/Makefile.in
+ perl -pi -e 's,/local/G18/share/gtk-doc/html,%p/share/gtk-doc/html,g'
doc/C/html/*.html
<<
ConfigureParams: --mandir='${prefix}/share/man' --disable-gtk-doc
--libexecdir='${prefix}/bin' --disable-schemas-install
--disable-dependency-tracking --disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
SetCPPFLAGS: -I%p/lib/fontconfig2/include
@@ -64,37 +64,38 @@
SplitOff: <<
Package: %N4-shlibs
Depends: <<
- atk1-shlibs (>= 1.24.0-1),
+ atk1-shlibs (>= 1.26.0-1),
cairo-shlibs (>= 1.8-1),
dbus-shlibs (>= 1.2.1-1),
expat1-shlibs,
fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- gconf2-shlibs (>= 2.24.0-1),
- glade3-shlibs (>= 3.4.5-2),
- glib2-shlibs (>= 2.18.0-1),
+ freetype219-shlibs (>= 2.3.8-2),
+ gconf2-shlibs (>= 2.26.0-1),
+ glade3-shlibs (>= 3.6.7-1),
+ glib2-shlibs (>= 2.20.0-1),
glitz-shlibs,
- gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
- goocanvas-shlibs (>= 0.12-1),
- gtk+2-shlibs (>= 2.14.0-1),
+ gnome-vfs2-unified-shlibs (>= 1:2.24.1-1),
+ goocanvas-shlibs (>= 0.14-1),
+ gtk+2-shlibs (>= 2.16.0-1),
gtksourceview-shlibs (>= 1.8.5-2),
libart2-shlibs,
libavahi-client3-shlibs,
libavahi-common3-shlibs,
libavahi-glib1-shlibs,
libgcrypt-shlibs (>= 1.4.3-2),
- libgda4-shlibs (>= 3.1.5-1),
+ libgda4-shlibs (>= 3.1.5-5),
libgettext3-shlibs,
libglade2-shlibs (>= 2.6.3-1),
- libgnomecanvas2-shlibs (>= 2.20.1.1-1),
- libgnomeprint2.2-shlibs (>= 2.18.5-1),
+ libgnomecanvas2-shlibs (>= 2.26.0-1),
+ libgnomeprint2.2-shlibs (>= 2.18.6-2),
libgpg-error-shlibs,
libiconv,
iso-codes,
libpng3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.16-1),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ orbit2-shlibs (>= 2.14.17-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.0-1),
+ pixman-shlibs (>= 0.14.0-1),
sqlite3-shlibs,
x11
<<
@@ -154,6 +155,9 @@
DescPort: <<
Fix misuse of value instead of shell return code.
See: http://bugzilla.gnome.org/show_bug.cgi?id=520464
+
+ Import ltmain.sh dependent-lib dependency handlers from libtool2
+ (prevents linking against installed lib instead of build-dir one)
<<
DescPackaging: <<
share/gtk-doc moved %N -> %N4-dev as of 3.1.2-3
@@ -171,6 +175,12 @@
(libgladegnomedb.so -> libgnomedb_entry_builtin_plugins.so)
Just scrap the link...all symbols still seem to be resolved.
See: http://bugzilla.gnome.org/show_bug.cgi?id=521511
+
+ Requires old libgda4-dev/shlibs (libgda-3.0.pc).
+
+ Regenerating gtk-doc files The Right Way (--enable-gtk-doc) is
+ very slow, so just patch the prefix in the bad URLs in the
+ existing generated files.
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: libgnomedb.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/libgnomedb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgnomedb.patch 6 Nov 2008 16:31:55 -0000 1.3
+++ libgnomedb.patch 2 Jul 2009 05:13:46 -0000 1.4
@@ -81,3 +81,167 @@
$(graphlib)
gladegnomedbdir = @GLADE3_MODULES_DIR@
+diff -Nurd -x'*~' libgnomedb-3.1.2.orig/ltmain.sh libgnomedb-3.1.2/ltmain.sh
+--- libgnomedb-3.1.2.orig/ltmain.sh 2007-08-14 13:43:36.000000000 -0400
++++ libgnomedb-3.1.2/ltmain.sh 2009-07-02 00:36:17.000000000 -0400
+@@ -2909,94 +2909,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`
+- if test -n "$deplibrary_names" ; then
+- for tmp in $deplibrary_names ; do
+- depdepl=$tmp
+- done
+- if test -f "$path/$depdepl" ; then
+- depdepl="$path/$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
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
