Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25344
Modified Files: glunarclock.info glunarclock.patch Log Message: don't assume bad assumptions in gnome2.old are actually viable in gnome2.26 Index: glunarclock.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glunarclock.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- glunarclock.patch 9 Feb 2009 08:44:42 -0000 1.2 +++ glunarclock.patch 19 Nov 2009 09:20:08 -0000 1.3 @@ -1,3 +1,23 @@ +diff -Nurd -x'*~' glunarclock-0.32.4.orig/configure glunarclock-0.32.4/configure +--- glunarclock-0.32.4.orig/configure 2005-04-12 10:40:07.000000000 -0400 ++++ glunarclock-0.32.4/configure 2009-11-19 03:47:26.000000000 -0500 +@@ -22445,6 +22445,7 @@ + + fi + ++if false; then + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" +@@ -22498,7 +22499,7 @@ + The latest release is available from http://prdownloads.sourceforge.net/gswitchit" >&2;} + { (exit 1); exit 1; }; } + fi +- ++fi + + + diff -Nurd -x'*~' glunarclock-0.32.4.orig/screen-exec/egg-screen-help.c glunarclock-0.32.4/screen-exec/egg-screen-help.c --- glunarclock-0.32.4.orig/screen-exec/egg-screen-help.c 2005-04-10 12:01:43.000000000 -0400 +++ glunarclock-0.32.4/screen-exec/egg-screen-help.c 2009-02-09 02:59:37.000000000 -0500 @@ -22,8 +42,24 @@ #include "Moon.h" diff -Nurd -x'*~' glunarclock-0.32.4.orig/src/Makefile.in glunarclock-0.32.4/src/Makefile.in --- glunarclock-0.32.4.orig/src/Makefile.in 2005-04-12 10:40:13.000000000 -0400 -+++ glunarclock-0.32.4/src/Makefile.in 2009-02-09 03:38:29.000000000 -0500 -@@ -749,7 +749,6 @@ ++++ glunarclock-0.32.4/src/Makefile.in 2009-11-19 03:35:35.000000000 -0500 +@@ -225,6 +225,7 @@ + INCLUDES = \ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ ++ $(GNOME_LIBS2_CFLAGS) \ + -I$(srcdir) \ + -I$(srcdir)/pixmaps \ + -I$(top_srcdir)/screen-exec \ +@@ -245,6 +246,7 @@ + glunarclock_applet_2_LDADD = \ + $(GNOME_APPLETS_LIBS) \ + $(LIBGLADE_LIBS) \ ++ $(GNOME_LIBS2_LIBS) \ + $(top_builddir)/screen-exec/libscreen-exec.la + + +@@ -749,7 +751,6 @@ @INTLTOOL_SCHEMAS_RULE@ install-data-local: Index: glunarclock.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glunarclock.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- glunarclock.info 9 Feb 2009 08:44:42 -0000 1.6 +++ glunarclock.info 19 Nov 2009 09:20:07 -0000 1.7 @@ -1,13 +1,13 @@ Package: glunarclock Version: 0.32.4 -Revision: 1 +Revision: 2 Maintainer: None <fink-de...@lists.sourceforge.net> Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 63e1d989581e6bf95cec82ff1bbc56ef PatchFile: %n.patch -PatchFile-MD5: de1e4ac264a51fcecccc647d78c05416 +PatchFile-MD5: 12163b48535724ea11e9d6fa36984a40 BuildDepends: << - atk1 (>= 1.24.0-1), + atk1 (>= 1.26.0-1), audiofile, avahi-dev, cairo (>= 1.8-1), @@ -16,72 +16,72 @@ expat1, fink (>= 0.24.12), 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, - glib2-dev (>= 2.18.0-1), + glib2-dev (>= 2.20.0-1), glitz, - gnome-keyring-dev (>= 0.8.1-1), - gnome-panel-dev (>= 2.24.0-1), - gnome-vfs2-unified-dev (>= 1:2.24.0-1), - gtk+2-dev (>= 2.14.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+2-dev (>= 2.16.0-1), intltool40, libart2, libavahi-glib1-dev, - libbonobo2-dev (>= 2.24.0-1), - libbonoboui2-dev (>= 2.24.0-1), + libbonobo2-dev (>= 2.24.1-1), + libbonoboui2-dev (>= 2.24.1-1), libgettext3-dev, - libglade2 (>= 2.6.3-1), - libgnome2-dev (>= 2.24.0-1), - libgnomecanvas2-dev (>= 2.20.1.1-2), - libgnomeui2-dev (>= 2.24.0-1), + libglade2 (>= 2.6.4-1), + libgnome2-dev (>= 2.26.0-1), + libgnomecanvas2-dev (>= 2.26.0-1), + libgnomeui2-dev (>= 2.24.1-1), libiconv-dev, libpng3, libxml2 (>= 2.6.30), - 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.16.0-1), pkgconfig (>= 0.23), popt, x11, xft2-dev << Depends: << - atk1-shlibs (>= 1.24.0-1), + 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.7-7), - gconf2 (>= 2.24.0-1), - gconf2-shlibs (>= 2.24.0-1), - glib2-shlibs (>= 2.18.0-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, - gnome-keyring-shlibs (>= 0.8.1-1), - gnome-panel-shlibs (>= 2.24.0-1), - gnome-vfs2-unified-shlibs (>= 1:2.24.0-1), - gtk+2-shlibs (>= 2.14.0-1), + 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-shlibs (>= 2.16.0-1), libart2-shlibs, libavahi-client3-shlibs, libavahi-common3-shlibs, libavahi-glib1-shlibs, - libbonobo2 (>= 2.24.0-1), - libbonobo2-shlibs (>= 2.24.0-1), - libbonoboui2-shlibs (>= 2.24.0-1), + libbonobo2 (>= 2.24.1-1), + libbonobo2-shlibs (>= 2.24.1-1), + libbonoboui2-shlibs (>= 2.24.1-1), libgettext3-shlibs, - libglade2-shlibs (>= 2.6.3-1), - libgnome2-shlibs (>= 2.24.0-1), - libgnomecanvas2-shlibs (>= 2.20.1.1-2), - libgnomeui2-shlibs (>= 2.24.0-1), + libglade2-shlibs (>= 2.6.4-1), + libgnome2-shlibs (>= 2.26.0-1), + libgnomecanvas2-shlibs (>= 2.26.0-1), + libgnomeui2-shlibs (>= 2.24.1-1), libiconv, libpng3-shlibs, libxml2-shlibs (>= 2.6.30), - orbit2-shlibs (>= 2.14.16-1), - pango1-xft2-ft219-shlibs (>= 1.22.0-4), - pixman-shlibs (>= 0.12.0-1), + orbit2-shlibs (>= 2.14.17-1), + pango1-xft2-ft219-shlibs (>= 1.24.0-1), + pixman-shlibs (>= 0.16.0-1), popt-shlibs, rarian-compat, x11 @@ -91,6 +91,7 @@ make install DESTDIR=%d << PostInstScript: << + . %p/bin/init.sh if [ configure = "$1" ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/glunarclock.schemas >/dev/null @@ -98,6 +99,7 @@ fi << PostRmScript: << + . %p/bin/init.sh if [ remove != "$1" ]; then scrollkeeper-update -q fi @@ -124,6 +126,11 @@ Doesn't respect --disable-schemas-install, so patch out gconftool call + + Don't rely on recent versions of gnome core libs to propagate + flags for deprecated dependencies. + + LIBXKLAVIER pc flags never used, so disable their autconf test << DescPort: << PoMakefile is updated for internationalization. ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs