Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13446/main/finkinfo/gnome
Modified Files:
Tag: pangocairo-branch
gnome-python-py23.patch gnome-python2-py.patch
gnopernicus9.info gnumeric.info libgksuui1.0.info
nautilus.info nautilus.patch rep-gtk.info
Added Files:
Tag: pangocairo-branch
gnopernicus9.patch
Log Message:
build fixes
Index: nautilus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/nautilus.info,v
retrieving revision 1.7.2.12
retrieving revision 1.7.2.13
diff -u -d -r1.7.2.12 -r1.7.2.13
--- nautilus.info 22 Dec 2006 05:02:13 -0000 1.7.2.12
+++ nautilus.info 1 Jan 2007 17:39:08 -0000 1.7.2.13
@@ -41,6 +41,8 @@
BuildDepends: <<
atk1 (>= 1.12.3-1),
audiofile (>= 0.2.5-1),
+ autoconf (>= 2.60-1),
+ automake1.9,
cairo (>= 1.2-1),
dbus-dev (>= 1.0-1),
eel2-dev (>= 2.6.0-1),
@@ -73,6 +75,7 @@
libiconv-dev,
libjpeg,
librsvg2 (>= 2.8.1-1),
+ libtool14,
libxml2 (>= 2.6.7-1),
orbit2-dev (>= 2.10.0-1),
pango1-xft2-ft219-dev (>= 1.14.9-1),
@@ -85,7 +88,9 @@
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: ef91c7eefd219800a3aab93e6510a5c9
Patch: %n.patch
-PatchScript: perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g'
configure
+PatchScript: <<
+ autoreconf -fvi
+<<
InstallScript: GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
PostInstScript: <<
if [ configure = "$1" ]; then
Index: gnome-python-py23.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-python-py23.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- gnome-python-py23.patch 20 Jan 2006 20:25:02 -0000 1.1
+++ gnome-python-py23.patch 1 Jan 2007 17:39:08 -0000 1.1.2.1
@@ -60,3 +60,14 @@
eval cmds=\"$archive_cmds\"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+diff -uNr gnome-python-2.12.4/gnomevfs/vfsmodule.c
gnome-python-2.12.4-new/gnomevfs/vfsmodule.c
+--- gnome-python-2.12.4/gnomevfs/vfsmodule.c 2005-12-01 13:28:06.000000000
-0500
++++ gnome-python-2.12.4-new/gnomevfs/vfsmodule.c 2006-12-30
09:16:02.000000000 -0500
+@@ -7,6 +7,7 @@
+ #include <libgnomevfs/gnome-vfs-resolve.h>
+ #include <libgnomevfs/gnome-vfs-dns-sd.h>
+ #include <pyorbit.h>
++#include <bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h>
+
+ static GHashTable *monitor_hash;
+ static gint monitor_id_counter = 0;
Index: nautilus.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/nautilus.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- nautilus.patch 20 Dec 2006 18:01:02 -0000 1.1.2.1
+++ nautilus.patch 1 Jan 2007 17:39:08 -0000 1.1.2.2
@@ -246,3 +246,26 @@
if (workareas != NULL)
g_free (workareas);
}
+diff -uNr nautilus-2.6.3/libnautilus-private/nautilus-global-preferences.c
nautilus-2.6.3-new/libnautilus-private/nautilus-global-preferences.c
+--- nautilus-2.6.3/libnautilus-private/nautilus-global-preferences.c
2004-02-20 05:33:46.000000000 -0500
++++ nautilus-2.6.3-new/libnautilus-private/nautilus-global-preferences.c
2006-12-30 15:29:51.000000000 -0500
+@@ -38,6 +38,7 @@
+ #include <libgnome/gnome-util.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
++#include <bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h>
+
+ /* Constants */
+ #define STRING_LIST_DEFAULT_TOKENS_DELIMETER ","
+diff -uNr nautilus-2.6.3/libnautilus-private/nautilus-mime-actions.h
nautilus-2.6.3-new/libnautilus-private/nautilus-mime-actions.h
+--- nautilus-2.6.3/libnautilus-private/nautilus-mime-actions.h 2004-03-05
07:46:48.000000000 -0500
++++ nautilus-2.6.3-new/libnautilus-private/nautilus-mime-actions.h
2006-12-31 01:11:51.000000000 -0500
+@@ -26,7 +26,7 @@
+ #define NAUTILUS_MIME_ACTIONS_H
+
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+-
++#include <bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h>
+ #include <libnautilus-private/nautilus-file.h>
+
+
Index: rep-gtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/rep-gtk.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- rep-gtk.info 22 Dec 2006 05:02:13 -0000 1.1.2.2
+++ rep-gtk.info 1 Jan 2007 17:39:08 -0000 1.1.2.3
@@ -8,10 +8,16 @@
BuildDepends: cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), freetype219,
xft2-dev, libiconv-dev, gdbm, libjpeg, libtiff, netpbm, audiofile, esound,
glib, orbit-dev, readline (>= 4.3-1028), giflib, imlib, gnome-libs-dev,
librep-dev (>= 0.16.2-1011), libxml, gtk+2 (>= 2.10.0-1), gdk-pixbuf, libglade2
(>= 2.6.0-1), libgettext3-dev, gettext-bin, gettext-tools, pkgconfig (>=
0.21-1), glib2-dev (>= 2.12.0-1), pango1-xft2-ft219-dev (>= 1.14.9-1), atk1 (>=
1.12.3-1), gtk+2-dev (>= 2.10.0-1), libxml2 (>= 2.6.6-1)
UpdateConfigGuess: true
Patch: %n.patch
-ConfigureParams: --libexecdir='${prefix}/lib' --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
+ConfigureParams: --libexecdir='${prefix}/lib' --disable-dependency-tracking
SetCPPFLAGS: -no-cpp-precomp
+CompileScript: <<
+#!/bin/sh -ev
+ export
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
+ ./configure %c
+ make
+<<
InstallScript: <<
- make install DESTDIR=%d
+ make -j1 install DESTDIR=%d
<<
DocFiles: README* COPYING AUTHORS
#
--- NEW FILE: gnopernicus9.patch ---
diff -uNr gnopernicus-0.10.9/configure gnopernicus-0.10.9-new/configure
--- gnopernicus-0.10.9/configure 2005-05-04 06:14:06.000000000 -0400
+++ gnopernicus-0.10.9-new/configure 2006-12-30 10:15:40.000000000 -0500
@@ -23681,6 +23681,7 @@
LIBKE_CFLAGS=`$PKG_CONFIG --cflags "\
cspi-1.0 >= $CSPI_REQUIRED \
gconf-2.0 >= $GCONF_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED "`
echo "$as_me:$LINENO: result: $LIBKE_CFLAGS" >&5
echo "${ECHO_T}$LIBKE_CFLAGS" >&6
@@ -23690,6 +23691,7 @@
LIBKE_LIBS=`$PKG_CONFIG --libs "\
cspi-1.0 >= $CSPI_REQUIRED \
gconf-2.0 >= $GCONF_REQUIRED \
+ gtk+-2.0 >= $GTK_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED "`
echo "$as_me:$LINENO: result: $LIBKE_LIBS" >&5
echo "${ECHO_T}$LIBKE_LIBS" >&6
Index: gnumeric.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnumeric.info,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -d -r1.6.2.7 -r1.6.2.8
--- gnumeric.info 22 Dec 2006 05:02:09 -0000 1.6.2.7
+++ gnumeric.info 1 Jan 2007 17:39:08 -0000 1.6.2.8
@@ -68,7 +68,7 @@
perl -pi.bak -e 's/scrollkeeper-update.*;/echo "no scrollkeeper-update";/g'
omf.make doc/C/Makefile.in
perl -pi.bak -e 's/static struct poptOption const/struct poptOption const/'
src/main-application.c
perl -pi.bak -e 's/static double/double/'
src/cut-n-paste-code/goffice/graph/plugins/plot_radar/gog-radar.c
- perl -pi.bak -e 's, \-DGNOME_DISABLE_DEPRECATED,,' configure{.in,}
+ perl -pi.bak -e 's, \-DGNOME_DISABLE_DEPRECATED,,; s,
\-DGTK_DISABLE_DEPRECATED,,' configure{.in,}
<<
ConfigureParams: --without-python --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' --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
CompileScript: <<
Index: gnopernicus9.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnopernicus9.info,v
retrieving revision 1.3.2.9
retrieving revision 1.3.2.10
diff -u -d -r1.3.2.9 -r1.3.2.10
--- gnopernicus9.info 22 Dec 2006 05:02:09 -0000 1.3.2.9
+++ gnopernicus9.info 1 Jan 2007 17:39:08 -0000 1.3.2.10
@@ -82,9 +82,14 @@
perl -pi.bak -e "s/-scrollkeeper-update/#-scrollkeeper-update/g"
help/*/*/Makefile.in
perl -pi -e 's|\s*options.c_oflag &= ~OCRNL;|#if
defined(OCRNL)\n$&\n#endif|' braille/libbrl/sercomm.c
<<
-SetCPPFLAGS: -no-cpp-precomp
+Patch: %n.patch
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -no-cpp-precomp -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
+NoSetLDFLAGS: true
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -lresolv
+SetLIBS: -L%p/lib
SetCFLAGS: -Os
-SetLDFLAGS: -lresolv
+SetCXXFLAGS: -Os
ConfigureParams: --libexecdir=%p/lib/gnopernicus-1.0 --mandir=%p/share/man
--disable-dependency-tracking --enable-gtk-doc --disable-brltty
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
InstallScript: <<
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
Index: libgksuui1.0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgksuui1.0.info,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- libgksuui1.0.info 22 Dec 2006 05:02:11 -0000 1.2.2.2
+++ libgksuui1.0.info 1 Jan 2007 17:39:08 -0000 1.2.2.3
@@ -11,7 +11,20 @@
Patch: %n.patch
-ConfigureParams: --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
+SetCPPFLAGS: -no-cpp-precomp -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
+NoSetLDFLAGS: true
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
+SetLIBS: -L%p/lib
+SetCFLAGS: -Os
+SetCXXFLAGS: -Os
+ConfigureParams: --disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ev
+ export
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
+ ./configure %c
+ make
+<<
InstallScript: make install DESTDIR=%d
Index: gnome-python2-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-python2-py.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- gnome-python2-py.patch 20 Jun 2006 15:54:27 -0000 1.1
+++ gnome-python2-py.patch 1 Jan 2007 17:39:08 -0000 1.1.2.1
@@ -12,3 +12,14 @@
+ echo "Incomplete package configuration."
+ exit 1
+fi
+diff -uNr gnome-python-2.12.4/gnomevfs/vfsmodule.c
gnome-python-2.12.4-new/gnomevfs/vfsmodule.c
+--- gnome-python-2.12.4/gnomevfs/vfsmodule.c 2005-12-01 13:28:06.000000000
-0500
++++ gnome-python-2.12.4-new/gnomevfs/vfsmodule.c 2006-12-30
09:16:02.000000000 -0500
+@@ -7,6 +7,7 @@
+ #include <libgnomevfs/gnome-vfs-resolve.h>
+ #include <libgnomevfs/gnome-vfs-dns-sd.h>
+ #include <pyorbit.h>
++#include <bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h>
+
+ static GHashTable *monitor_hash;
+ static gint monitor_id_counter = 0;
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
