gnome-utils stable port information

Info3: <<
Package: gnome-utils
Version: 2.28.3
Revision: 1
Depends: <<
libgdict1.0.6-shlibs (>= %v-%r),
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-panel-shlibs (>= 2.28.0-1),
gtk+2 (>= 1.18.0-1),
libart2-shlibs,
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,
x11
<<
BuildDepends: <<
atk1 (>= 1.28.0-1),
cairo (>= 1.8.8-3),
fink (>= 0.24.12-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.22.0-1),
glitz,
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,
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-2),
pango1-xft2-ft219-dev (>= 1.24.5-4),
pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
popt,
x11-dev
<<
Conflicts: %N-dev
Replaces: %N-dev
Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
Source-MD5: ccfd36710952fa5280612c1c00e915e8
PatchFile: %n.patch
PatchFile-MD5: 13889cc8c9ccce380e3fe17cab5fc20c
PatchScript: <<
#!/bin/sh -ev
%{default_script}

# recode ./some/path/ChangeLog as ChangeLogs/ChangeLog.some.path
mkdir ChangeLogs
for cl in `find . -name ChangeLog` ; do
cp $cl ChangeLogs/`echo $cl | sed 's/^\.\(.*\)\/\(ChangeLog\)/\2\1/;s/\//./g'`
done

# recode ./some/path/README as READMEs/README.some.path
mkdir READMEs
for cl in `find . -name README` ; do
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 \
--enable-dependency-tracking \
--disable-static \
--with-grep=/usr/bin/grep \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
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.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
Shlibs: %p/lib/libgdict-1.0.6.dylib 7.0.0 %n (>= 2.24.0-1)
DocFiles: AUTHORS COPYING ChangeLogs/* NEWS READMEs/* THANKS
Description: Shared libraries for gnome untilities
<<
SplitOff2: <<
Package: libgdict1.0.6-dev
Depends: libgdict1.0.6-shlibs (>= %v-%r)
Replaces: %N (<< 2.20.2.1-3), %N-dev
Conflicts: %N-dev
BuildDependsOnly: true
Files: <<
include
lib/pkgconfig
lib/libgdict*
share/gtk-doc
<<
DocFiles: AUTHORS COPYING ChangeLogs/* NEWS READMEs/* THANKS
Description: Headers and libraries for gnome untilities development
<<
PostInstScript: <<
if [ configure = "$1" ]; then
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
for s in baobab gnome-dictionary gnome-screenshot gnome-search-tool gnome-system-log; do
gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/$s.schemas >/dev/null
done
%p/bin/gtk-update-icon-cache -f -t %p/share/icons/hicolor
fi
<<
PostRmScript: <<
if [ upgrade != "$1" ]; then
scrollkeeper-update
%p/bin/gtk-update-icon-cache -f -t %p/share/icons/hicolor
fi
<<
ConfFiles: <<
%p/etc/gconf/schemas/baobab.schemas
%p/etc/gconf/schemas/gnome-dictionary.schemas
%p/etc/gconf/schemas/gnome-screenshot.schemas
%p/etc/gconf/schemas/gnome-search-tool.schemas
%p/etc/gconf/schemas/gnome-system-log.schemas
<<
DocFiles: AUTHORS COPYING ChangeLogs/* NEWS READMEs/* THANKS
DescPort: <<
Avoid duplicate symbol defs: extern all but one usage.

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
gnome-utils-dev and lib documenation in gnome-utils.

Fix -I ordering in gnome-dictionary/src/Makefile. Don't need
to pass APPLET_CFLAGS to gnome-dictionary, but no harm. No
weird deps or linking b/c not passing APPLET_LIBS to it.
<<
Description: The Gnome Utilities
DescDetail: <<
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
manager for the X Window System. GNOME is similar in purpose and scope
to CDE and KDE, but GNOME is based completely on free software.

This package will install some GNOME utilities, such as the
calculator, search tool, and system information overview tool.
<<
License: GPL
Maintainer: The Gnome Core Team
Homepage: http://www.gnome.org/
<<

gnome-utils stable port .patch

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
*/

+#define NO_EXTERN_BAOBAB 1
+
#include

#include
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 @@
};

/* globals */
+#ifdef NO_EXTERN_BAOBAB
gboolean g_noactivescans;
baobab_application baobab;
baobab_fs g_fs;
+#else
+extern gboolean g_noactivescans;
+extern baobab_application baobab;
+extern baobab_fs g_fs;
+#endif

void baobab_set_busy (gboolean busy);
void baobab_scan_location (GFile *);
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

+GNOME_UTILS_LIBS="$GNOME_UTILS_LIBS $INTLLIBS"

# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
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) \
+ $(APPLET_CFLAGS) \
$(NULL)

gnome_dictionary_SOURCES = \
@@ -342,9 +346,6 @@
$(NULL)

gnome_dictionary_CFLAGS = \
- -I$(top_builddir)/gnome-dictionary \
- -I$(top_srcdir)/gnome-dictionary \
- $(GNOME_UTILS_CFLAGS) \
$(NULL)

gnome_dictionary_LDADD = \
@@ -372,10 +373,6 @@
$(NULL)

gnome_dictionary_applet_CFLAGS = \
- -I$(top_builddir)/gnome-dictionary \
- -I$(top_srcdir)/gnome-dictionary \
- $(GNOME_UTILS_CFLAGS) \
- $(APPLET_CFLAGS) \
$(NULL)

gnome_dictionary_applet_LDADD = \
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) \
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
#include

+#define XK_MISCELLANY
+#include
#ifdef HAVE_X11_EXTENSIONS_SHAPE_H
#include
#endif
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 @@

noinst_LTLIBRARIES = libeggsmclient.la
libeggsmclient_la_LIBADD = $(LIBEGGSMCLIENT_LIBS) \
- -lSM -lICE
+ $(X_LIBS) -lSM -lICE

libeggsmclient_la_CFLAGS = $(LIBEGGSMCLIENT_CFLAGS) \
-DEGG_SM_CLIENT_BACKEND_XSMP \

gnome-utils _unstable_ port .patch