Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17637
Modified Files:
Tag: pangocairo-branch
libgnomedb.info
Added Files:
Tag: pangocairo-branch
libgnomedb.patch
Log Message:
lots of fixes; gtksoruceview disabled for now
Index: libgnomedb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/Attic/libgnomedb.info,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- libgnomedb.info 29 Feb 2008 04:36:26 -0000 1.1.2.4
+++ libgnomedb.info 5 Mar 2008 05:36:48 -0000 1.1.2.5
@@ -1,6 +1,6 @@
Package: libgnomedb
Version: 3.1.2
-Revision: 2
+Revision: 3
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile,
@@ -8,33 +8,28 @@
avahi-dev,
cairo (>= 1.2-1),
dbus-dev (>= 1.0-1),
- esound (>= 0.2.38-1),
expat1,
+ fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
gail18-dev,
gconf2-dev (>= 2.20.0-1),
gettext-bin,
gettext-tools,
+ glade3-dev,
glib2-dev (>= 2.14.0-1),
glitz,
- gnome-keyring-dev (>= 0.8.1-1),
gnome-vfs2-unified-dev (>= 1:2.20.0-1),
gtk+2-dev (>= 2.12.0-1),
- gtksourceview2-dev (>= 2.0.0-1),
intltool (>= 0.36.0-1),
libart2,
libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
libgcrypt,
libgda4-dev (>= 3.1.2-4),
libgettext3-dev,
libglade2 (>= 2.6.2-1),
libgnome2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomeprint2.2-dev (>= 2.18.2-1),
- libgnomeui2-dev (>= 2.20.0-1),
libgpg-error,
libiconv-dev,
libjpeg,
@@ -45,7 +40,6 @@
orbit2-dev (>= 2.14.9-1),
pango1-xft2-ft219-dev (>= 1.18.2-1),
pkgconfig (>= 0.21-1),
- popt,
pth2-dev,
readline5,
sqlite3-dev,
@@ -55,9 +49,11 @@
Depends: %N4-shlibs (= %v-%r), gconf2 (>= 2.20.0-1), scrollkeeper
Source: mirror:gnome:sources/%n/3.1/%n-%v.tar.bz2
Source-MD5: 9896bd66451c3f1e2bdd1cd79d524348
-
+PatchFile: %n.patch
+PatchFile-MD5: 1d416cb4554c0eb76355379dbfd7c000
PatchScript: <<
- perl -ni -e 'print unless /-scrollkeeper-update/' doc/Makefile.am
+ %{default_script}
+ perl -pi -e 's/-scrollkeeper-update/#$&/' doc/Makefile.in
<<
ConfigureParams: --mandir='${prefix}/share/man' --disable-gtk-doc
--libexecdir='${prefix}/bin' --disable-schemas-install
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
NoSetCPPFLAGS: true
@@ -70,8 +66,50 @@
InstallScript: make -j1 install DESTDIR="%d"
SplitOff: <<
Package: %N4-shlibs
- Depends: gtksourceview2-shlibs (>= 2.0.0-1), libgda4-shlibs (>=
3.1.2-4), libgnomeui2-shlibs (>= 2.20.0-1)
- Files: lib/lib*-*.*.*.dylib lib/*/*/*.so share/locale
+ Depends: <<
+ atk1-shlibs (>= 1.20.0-1),
+ cairo-shlibs (>= 1.2-1),
+ dbus-shlibs (>= 1.0-1),
+ expat1-shlibs,
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.5-1),
+ gail18-shlibs,
+ gconf2-shlibs (>= 2.20.0-1),
+ glade3-shlibs,
+ glib2-shlibs (>= 2.14.0-1),
+ glitz-shlibs,
+ gnome-vfs2-unified-shlibs (>= 1:2.20.0-1),
+ gtk+2-shlibs (>= 2.12.0-1),
+ libart2-shlibs,
+ libavahi-client3-shlibs,
+ libavahi-common3-shlibs,
+ libavahi-glib1-shlibs,
+ libgcrypt-shlibs,
+ libgda4-shlibs (>= 3.1.2-4),
+ libgettext3-shlibs,
+ libglade2-shlibs (>= 2.6.2-1),
+ libgnomecanvas2-shlibs (>= 2.20.0-1),
+ libgpg-error-shlibs,
+ libiconv,
+ iso-codes,
+ libpng3-shlibs,
+ libxml2-shlibs (>= 2.6.30-1),
+ orbit2-shlibs (>= 2.14.9-1),
+ pango1-xft2-ft219-shlibs (>= 1.18.2-1),
+ pth2-shlibs,
+ sqlite3-shlibs,
+ x11
+ <<
+ Files: <<
+ lib/libgnomedb-3.0.4*.dylib
+ lib/libgnomedb_extra-3.0.4*.dylib
+ lib/libgnomedb_graph-3.0.4*.dylib
+ lib/glade3
+ lib/gnome-db-3.0
+ lib/libglade
+ share/gnome-db-3.0
+ share/locale
+ <<
Replaces: %N-shlibs, %N
Shlibs: <<
%p/lib/libgnomedb-3.0.4.dylib 5.0.0 %n (>= 3.0.0-1)
@@ -85,9 +123,13 @@
Package: %N4-dev
Depends: %N (= %v-%r)
Conflicts: %N-dev, %N3-dev
- Replaces: %N-dev, %N3-dev
+ Replaces: %N-dev, %N3-dev, %N (<< 3.1.2-2)
BuildDependsOnly: True
- Files: include lib/lib* lib/pkgconfig
+ Files: <<
+ include
+ lib
+ share/gtk-doc
+ <<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
Description: Developer files for libgnomedb package
<<
@@ -109,6 +151,16 @@
Database Widget Library. These widgets are integrated with the
latest versions of glade.
<<
+DescPackaging: <<
+ share/gtk-doc moved %N -> %N4-dev as of 3.1.2-3
+
+ share/gnome-db-3.0 moved %N -> %N4-shlibs as of 3.1.2-3
+ (used by lib/glade3/modules/libgladegnomedb.so)
+
+ Force non-detection of some deps for packaging sanity.
+ gtksourceview omitted for now, should look at what it entails
+ (gnomeprint stack...feh) or switching to use gtksourceview2.
+<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome-db.org
--- NEW FILE: libgnomedb.patch ---
diff -Nurd libgnomedb-3.1.2.orig/configure libgnomedb-3.1.2/configure
--- libgnomedb-3.1.2.orig/configure 2007-10-24 15:44:07.000000000 -0400
+++ libgnomedb-3.1.2/configure 2008-03-04 13:51:04.000000000 -0500
@@ -23288,7 +23288,7 @@
LIBGCRYPT_LIBS=""
-if 0; then
+if false; then
HAVE_LIBGCRYPT_TRUE=
HAVE_LIBGCRYPT_FALSE='#'
else
@@ -23316,7 +23316,7 @@
LIBGCRYPT_LIBS=""
-if 0; then
+if false; then
HAVE_LIBGCRYPT_TRUE=
HAVE_LIBGCRYPT_FALSE='#'
else
@@ -23436,6 +23436,7 @@
GOOCANVAS_MODULES="goocanvas >= 0.9"
+if false; then
pkg_failed=no
{ echo "$as_me:$LINENO: checking for GOOCANVAS" >&5
echo $ECHO_N "checking for GOOCANVAS... $ECHO_C" >&6; }
@@ -23506,6 +23507,8 @@
echo "${ECHO_T}yes" >&6; }
have_goocanvas=yes
fi
+fi
+have_goocanvas=no
if test x"$have_goocanvas" = "xyes"; then
@@ -23527,6 +23530,7 @@
GRAPHVIZ_MODULES="libgvc"
+if false; then
pkg_failed=no
{ echo "$as_me:$LINENO: checking for GRAPHVIZ" >&5
echo $ECHO_N "checking for GRAPHVIZ... $ECHO_C" >&6; }
@@ -23597,6 +23601,8 @@
echo "${ECHO_T}yes" >&6; }
have_graphviz=yes
fi
+fi
+have_graphviz=no
if test x"$have_graphviz" = "xyes"; then
@@ -24001,6 +24007,7 @@
+if false; then
pkg_failed=no
{ echo "$as_me:$LINENO: checking for GTKSOURCEVIEW" >&5
echo $ECHO_N "checking for GTKSOURCEVIEW... $ECHO_C" >&6; }
@@ -24071,6 +24078,8 @@
echo "${ECHO_T}yes" >&6; }
have_gtksourceview=yes
fi
+fi
+have_gtksourceview=no
if test x"$have_gtksourceview" = "xyes"; then
@@ -24092,6 +24101,7 @@
+if false; then
pkg_failed=no
{ echo "$as_me:$LINENO: checking for GDA_EVOLUTION" >&5
echo $ECHO_N "checking for GDA_EVOLUTION... $ECHO_C" >&6; }
@@ -24167,6 +24177,8 @@
EVOLUTION_VERSION=`pkg-config --modversion libedataserver-1.2`
fi
+fi
+have_evolution=no
if test x"$have_evolution" = "xyes"; then
diff -Nurd libgnomedb-3.1.2.orig/glade3/Makefile.in
libgnomedb-3.1.2/glade3/Makefile.in
--- libgnomedb-3.1.2.orig/glade3/Makefile.in 2007-10-24 16:22:18.000000000
-0400
+++ libgnomedb-3.1.2/glade3/Makefile.in 2008-03-04 13:18:29.000000000 -0500
@@ -319,7 +319,7 @@
@[EMAIL PROTECTED] = $(top_builddir)/libgnomedb-graph/libgnomedb_graph-3.0.la
gladegnomedb_LTLIBRARIES = libgladegnomedb.la
libgladegnomedb_la_SOURCES = glade3-gnomedb.c
-libgladegnomedb_la_CFLAGS = -g -Wall -I$(top_srcdir) -I$(top_builddir) \
+AM_CPPFLAGS = -g -Wall -I$(top_srcdir) -I$(top_builddir) \
-DG_LOG_DOMAIN=\"GnomeDB\" \
$(GLADE3_CFLAGS) $(LIBGNOMEDB_CFLAGS)
$(LIBGLADE_CFLAGS)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
