Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3948
Modified Files:
gnome-utils.info gnome-utils.patch
Log Message:
new version
Index: gnome-utils.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-utils.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnome-utils.patch 11 Feb 2010 17:15:05 -0000 1.5
+++ gnome-utils.patch 25 Apr 2010 17:01:48 -0000 1.6
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/baobab/src/baobab.c
gnome-utils-2.26.0/baobab/src/baobab.c
---- gnome-utils-2.26.0.orig/baobab/src/baobab.c 2009-02-02
17:03:31.000000000 -0500
-+++ gnome-utils-2.26.0/baobab/src/baobab.c 2009-06-10 18:12:35.000000000
-0400
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/baobab/src/baobab.c
gnome-utils-2.28.3/baobab/src/baobab.c
+--- gnome-utils-2.28.3.orig/baobab/src/baobab.c 2010-01-16
11:36:16.000000000 -0500
++++ gnome-utils-2.28.3/baobab/src/baobab.c 2010-04-25 04:53:51.000000000
-0400
@@ -20,6 +20,8 @@
* Boston, MA 02110-1301 USA
*/
@@ -10,9 +10,9 @@
#include <config.h>
#include <gtk/gtk.h>
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/baobab/src/baobab.h
gnome-utils-2.26.0/baobab/src/baobab.h
---- gnome-utils-2.26.0.orig/baobab/src/baobab.h 2008-08-09
11:18:50.000000000 -0400
-+++ gnome-utils-2.26.0/baobab/src/baobab.h 2009-06-10 18:12:41.000000000
-0400
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/baobab/src/baobab.h
gnome-utils-2.28.3/baobab/src/baobab.h
+--- gnome-utils-2.28.3.orig/baobab/src/baobab.h 2009-10-27
09:16:36.000000000 -0400
++++ gnome-utils-2.28.3/baobab/src/baobab.h 2010-04-25 04:53:42.000000000
-0400
@@ -103,9 +103,15 @@
};
@@ -29,10 +29,10 @@
void baobab_set_busy (gboolean busy);
void baobab_scan_location (GFile *);
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/configure
gnome-utils-2.26.0/configure
---- gnome-utils-2.26.0.orig/configure 2009-03-16 18:02:06.000000000 -0400
-+++ gnome-utils-2.26.0/configure 2010-02-11 11:51:32.000000000 -0500
-@@ -30349,6 +30349,7 @@
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/configure
gnome-utils-2.28.3/configure
+--- gnome-utils-2.28.3.orig/configure 2010-01-16 12:13:41.000000000 -0500
++++ gnome-utils-2.28.3/configure 2010-04-25 04:48:47.000000000 -0400
+@@ -23977,6 +23977,7 @@
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e
"\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
@@ -40,59 +40,56 @@
# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/gnome-dictionary/src/Makefile.in
gnome-utils-2.26.0/gnome-dictionary/src/Makefile.in
---- gnome-utils-2.26.0.orig/gnome-dictionary/src/Makefile.in 2009-03-16
18:02:11.000000000 -0400
-+++ gnome-utils-2.26.0/gnome-dictionary/src/Makefile.in 2009-06-10
18:12:14.000000000 -0400
-@@ -325,6 +325,11 @@
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/gnome-dictionary/src/Makefile.in
gnome-utils-2.28.3/gnome-dictionary/src/Makefile.in
+--- gnome-utils-2.28.3.orig/gnome-dictionary/src/Makefile.in 2010-01-16
12:13:44.000000000 -0500
++++ gnome-utils-2.28.3/gnome-dictionary/src/Makefile.in 2010-04-25
04:50:55.000000000 -0400
+@@ -319,6 +319,10 @@
-DUIDATADIR=\""$(datadir)/gnome-2.0/ui"\" \
-DPKGDATADIR=\""$(datadir)/gnome-dictionary"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -I$(top_builddir)/gnome-dictionary \
+ -I$(top_srcdir)/gnome-dictionary \
+ $(GNOME_UTILS_CFLAGS) \
-+ $(LIBGLADE_CFLAGS) \
+ $(APPLET_CFLAGS) \
$(NULL)
gnome_dictionary_SOURCES = \
-@@ -348,10 +353,6 @@
+@@ -342,9 +346,6 @@
$(NULL)
gnome_dictionary_CFLAGS = \
- -I$(top_builddir)/gnome-dictionary \
- -I$(top_srcdir)/gnome-dictionary \
- $(GNOME_UTILS_CFLAGS) \
-- $(LIBGLADE_CFLAGS) \
$(NULL)
gnome_dictionary_LDADD = \
-@@ -380,11 +381,6 @@
+@@ -372,10 +373,6 @@
$(NULL)
gnome_dictionary_applet_CFLAGS = \
- -I$(top_builddir)/gnome-dictionary \
- -I$(top_srcdir)/gnome-dictionary \
- $(GNOME_UTILS_CFLAGS) \
-- $(LIBGLADE_CFLAGS) \
- $(APPLET_CFLAGS) \
$(NULL)
gnome_dictionary_applet_LDADD = \
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/gnome-screenshot/Makefile.in
gnome-utils-2.26.0/gnome-screenshot/Makefile.in
---- gnome-utils-2.26.0.orig/gnome-screenshot/Makefile.in 2009-03-16
18:02:12.000000000 -0400
-+++ gnome-utils-2.26.0/gnome-screenshot/Makefile.in 2010-02-11
12:03:17.000000000 -0500
-@@ -326,7 +326,7 @@
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/gnome-screenshot/Makefile.in
gnome-utils-2.28.3/gnome-screenshot/Makefile.in
+--- gnome-utils-2.28.3.orig/gnome-screenshot/Makefile.in 2010-01-16
12:13:44.000000000 -0500
++++ gnome-utils-2.28.3/gnome-screenshot/Makefile.in 2010-04-25
04:51:50.000000000 -0400
+@@ -338,7 +338,7 @@
gnome_screenshot_LDFLAGS = -export-dynamic
gnome_screenshot_LDADD = \
- $(XSHAPE_LIBS) \
+ $(XSHAPE_LIBS) $(X_LIBS) \
$(GNOME_UTILS_LIBS) \
+ $(LIBCANBERRA_GTK_LIBS) \
$(GTHREAD_LIBS) \
- $(NULL)
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/gnome-screenshot/screenshot-utils.c
gnome-utils-2.26.0/gnome-screenshot/screenshot-utils.c
---- gnome-utils-2.26.0.orig/gnome-screenshot/screenshot-utils.c
2009-02-27 09:30:57.000000000 -0500
-+++ gnome-utils-2.26.0/gnome-screenshot/screenshot-utils.c 2009-06-10
20:25:47.000000000 -0400
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/gnome-screenshot/screenshot-utils.c
gnome-utils-2.28.3/gnome-screenshot/screenshot-utils.c
+--- gnome-utils-2.28.3.orig/gnome-screenshot/screenshot-utils.c
2009-10-27 09:16:36.000000000 -0400
++++ gnome-utils-2.28.3/gnome-screenshot/screenshot-utils.c 2010-04-25
04:52:30.000000000 -0400
@@ -26,6 +26,8 @@
#include <glib.h>
#include <glib/gi18n.h>
@@ -102,15 +99,15 @@
#ifdef HAVE_X11_EXTENSIONS_SHAPE_H
#include <X11/extensions/shape.h>
#endif
-diff -Nurd -x'*~' gnome-utils-2.26.0.orig/logview/tests/Makefile.in
gnome-utils-2.26.0/logview/tests/Makefile.in
---- gnome-utils-2.26.0.orig/logview/tests/Makefile.in 2009-03-16
18:02:15.000000000 -0400
-+++ gnome-utils-2.26.0/logview/tests/Makefile.in 2010-02-11
12:04:44.000000000 -0500
-@@ -281,7 +281,7 @@
- -I../
+diff -Nurd -x'*~' gnome-utils-2.28.3.orig/libeggsmclient/Makefile.in
gnome-utils-2.28.3/libeggsmclient/Makefile.in
+--- gnome-utils-2.28.3.orig/libeggsmclient/Makefile.in 2010-01-16
12:13:45.000000000 -0500
++++ gnome-utils-2.28.3/libeggsmclient/Makefile.in 2010-04-25
06:12:26.000000000 -0400
+@@ -283,7 +283,7 @@
- test_reader_SOURCES = test-reader.c ../logview-log.c ../logview-utils.c
--test_reader_LDADD = $(GNOME_UTILS_LIBS)
-+test_reader_LDADD = $(GNOME_UTILS_LIBS) $(Z_LIBS)
- all: all-am
+ noinst_LTLIBRARIES = libeggsmclient.la
+ libeggsmclient_la_LIBADD = $(LIBEGGSMCLIENT_LIBS) \
+- -lSM -lICE
++ $(X_LIBS) -lSM -lICE
- .SUFFIXES:
+ libeggsmclient_la_CFLAGS = $(LIBEGGSMCLIENT_CFLAGS) \
+ -DEGG_SM_CLIENT_BACKEND_XSMP \
Index: gnome-utils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-utils.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gnome-utils.info 11 Feb 2010 17:15:05 -0000 1.18
+++ gnome-utils.info 25 Apr 2010 17:01:48 -0000 1.19
@@ -1,103 +1,76 @@
Info3: <<
Package: gnome-utils
-Version: 2.26.0
-Revision: 3
+Version: 2.28.3
+Revision: 1
Depends: <<
libgdict1.0.6-shlibs (>= %v-%r),
- atk1-shlibs (>= 1.26.0-1),
- audiofile-shlibs,
- cairo-shlibs (>= 1.8-1),
- dbus-shlibs (>= 1.2.1-1),
- esound-shlibs,
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- gconf2 (>= 2.26.0-1),
- gconf2-shlibs (>= 2.26.0-1),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ dpkg-base-files,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ gconf2 (>= 2.28.0-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
gnome-base,
- gnome-desktop (>= 2.26.0-1),
- gnome-desktop2.11-shlibs,
- gnome-keyring-shlibs (>= 2.26.0-1),
- gnome-panel-shlibs (>= 2.26.0-1),
- gnome-vfs2-unified-shlibs (>= 1:2.24.1-1),
- gtk+2 (>= 1.16.0-1),
+ gnome-panel-shlibs (>= 2.28.0-1),
+ gtk+2 (>= 1.18.0-1),
libart2-shlibs,
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libbonobo2 (>= 2.24.1-1),
- libbonoboui2-shlibs (>= 2.24.1-1),
- libgettext3-shlibs,
- libglade2-shlibs (>= 2.6.4-1),
- libgnome2-shlibs (>= 2.26.0-1),
- libgnomecanvas2-shlibs (>= 2.26.0-1),
- libgnomeui2-shlibs (>= 2.24.1-1),
- libgtop2.0.7-shlibs (>= 2.26.0-1),
- libiconv,
- libpng3-shlibs,
- libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.17-1),
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
+ libbonobo2 (>= 2.24.2-1),
+ libbonobo2-shlibs (>= 2.24.2-1),
+ libbonoboui2-shlibs (>= 2.24.2-1),
+ libcanberra-gtk0-shlibs (>= 0.23-1),
+ libcanberra0-shlibs (>= 0.23-1),
+ libgettext8-shlibs,
+ libgnome2-shlibs (>= 2.28.0-1),
+ libgnomecanvas2-shlibs (>= 2.26.0-3),
+ libgtop2.0.7-shlibs (>= 2.28.0-1),
+ orbit2-shlibs (>= 2.14.17-2),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
popt-shlibs,
rarian-compat,
- startup-notification-shlibs,
x11
<<
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- audiofile,
- avahi-dev,
- cairo (>= 1.8-1),
- dbus-dev (>= 1.2.1-1),
- esound,
- expat1,
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.8-2),
- gconf2-dev (>= 2.26.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.20.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gnome-desktop2.11-dev,
- gnome-doc-utils (>= 0.16.0-1),
- gnome-keyring-dev (>= 2.26.0-1),
- gnome-panel-dev (>= 2.26.0-1),
- gnome-vfs2-unified-dev (>= 1:2.24.1-1),
- gtk-doc (>= 1.9-1),
- gtk+2-dev (>= 1.16.0-1),
+ gnome-doc-utils (>= 0.18.0-1),
+ gnome-panel-dev (>= 2.28.0-1),
+ gtk-doc (>= 1.13-5),
+ gtk+2-dev (>= 1.18.0-1),
intltool40,
libart2,
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.24.1-1),
- libbonoboui2-dev (>= 2.24.1-1),
- libgettext3-dev,
- libglade2 (>= 2.6.4-1),
- libgnome2-dev (>= 2.26.0-1),
- libgnomecanvas2-dev (>= 2.26.0-1),
- libgnomeui2-dev (>= 2.24.1-1),
- libgtop2.0.7-dev (>= 2.26.0-1),
- libiconv-dev,
- libpng3,
+ libbonobo2-dev (>= 2.24.2-1),
+ libbonoboui2-dev (>= 2.24.2-1),
+ libcanberra-gtk0 (>= 0.23-1),
+ libcanberra0 (>= 0.23-1),
+ libgettext8-dev,
+ libgnome2-dev (>= 2.28.0-1),
+ libgnomecanvas2-dev (>= 2.26.0-3),
+ libgtop2.0.7-dev (>= 2.28.0-1),
libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.17-1),
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pixman (>= 0.14.0-1),
+ orbit2-dev (>= 2.14.17-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
popt,
- startup-notification-dev,
- x11-dev,
- xft2-dev
+ x11-dev
<<
Conflicts: %N-dev
Replaces: %N-dev
-Source: mirror:gnome:sources/%n/2.26/%n-%v.tar.bz2
-Source-MD5: 667400cfb9bee954028024ac3cf91a09
+Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
+Source-MD5: ccfd36710952fa5280612c1c00e915e8
PatchFile: %n.patch
-PatchFile-MD5: 01e72895e25a8b5ad68bf5cd2bc8f8d2
+PatchFile-MD5: 13889cc8c9ccce380e3fe17cab5fc20c
PatchScript: <<
#!/bin/sh -ev
%{default_script}
@@ -114,34 +87,35 @@
cp $cl READMEs/`echo $cl | sed
's/^\.\(.*\)\/\(README\)/\2\1/;s/\//./g'`
done
<<
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os -fno-common
ConfigureParams: <<
--libexecdir=%p/lib/%n --mandir=%p/share/man --enable-gtk-doc \
--disable-scrollkeeper --disable-schemas-install \
- --disable-dependency-tracking \
+ --enable-dependency-tracking \
--disable-static \
- --disable-console-helper \
--with-grep=/usr/bin/grep \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
- PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
\
+ XSHAPE_CFLAGS=" " XSHAPE_LIBS="-lXext -lX11"
+<<
+CompileScript: <<
+ ./configure %c
+ make
+ fink-package-precedence --prohibit-bdep libgdict1.0.6-dev .
<<
InstallScript: make -j1 install DESTDIR="%d"
SplitOff: <<
Package: libgdict1.0.6-shlibs
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.8-2),
- glib2-shlibs (>= 2.20.0-1),
- glitz-shlibs,
- gtk+2 (>= 2.16.0-1),
- libgettext3-shlibs,
- libiconv,
- libpng3-shlibs,
- pango1-xft2-ft219 (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2 (>= 2.18.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
Replaces: %N (<< 2.20.2.1-3)
Files: lib/libgdict-1.0.*.dylib
@@ -165,7 +139,6 @@
Description: Headers and libraries for gnome untilities development
<<
PostInstScript: <<
- . %p/bin/init.sh
if [ configure = "$1" ]; then
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -176,7 +149,6 @@
fi
<<
PostRmScript: <<
- . %p/bin/init.sh
if [ upgrade != "$1" ]; then
scrollkeeper-update
%p/bin/gtk-update-icon-cache -f -t %p/share/icons/hicolor
@@ -195,6 +167,10 @@
Fix #includes for XK_Escape definition. See:
http://bugzilla.gnome.org/show_bug.cgi?id=585399
+
+ Not all fink platforms have full x11 .pc set and internal
+ fallback for XSHAPE does not supply flags expected from
+ xext.pc:Requires so override with what we really need.
<<
DescPackaging: <<
Previous libversion had lots of runtime files in
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
