Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory 
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14266/unstable/main/finkinfo/editors

Modified Files:
        ghex2.info 
Added Files:
        ghex2.patch 
Log Message:
new gnome2.28 suite to unstable


--- NEW FILE: ghex2.patch ---
diff -Nurd -x'*~' ghex-2.24.0.orig/src/Makefile.in ghex-2.24.0/src/Makefile.in
--- ghex-2.24.0.orig/src/Makefile.in    2009-02-19 00:16:58.000000000 -0500
+++ ghex-2.24.0/src/Makefile.in 2010-02-25 03:14:10.000000000 -0500
@@ -66,7 +66,7 @@
 libgtkhex_la_OBJECTS = $(am_libgtkhex_la_OBJECTS)
 libgtkhex_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgtkhex_la_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -no-undefined $(INTLLIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_ghex2_OBJECTS = hex-document-ui.$(OBJEXT) preferences.$(OBJEXT) \
diff -Nurd -x'*~' ghex-2.24.0.orig/src/ghex-window.c 
ghex-2.24.0/src/ghex-window.c
--- ghex-2.24.0.orig/src/ghex-window.c  2009-02-06 23:05:35.000000000 -0500
+++ ghex-2.24.0/src/ghex-window.c       2010-02-25 02:57:02.000000000 -0500
@@ -20,7 +20,7 @@
 #include <bonobo.h>
 #include <bonobo/bonobo-ui-main.h>
 
-#include <libgnomevfs/gnome-vfs-ops.h>
+#include <gio/gio.h>
 
 #include <math.h>
 #include <ctype.h>
@@ -1183,15 +1183,15 @@
 gboolean
 ghex_window_uri_exists (const gchar* text_uri)
 {
-       GnomeVFSURI *uri;
+       GFile *uri;
        gboolean res;
 
        g_return_val_if_fail (text_uri != NULL, FALSE);
-       uri = gnome_vfs_uri_new (text_uri);
+       uri = g_file_new_for_uri (text_uri);
        g_return_val_if_fail (uri != NULL, FALSE);
-       res = gnome_vfs_uri_exists (uri);
+       res = g_file_query_exists (uri, NULL);
 
-       gnome_vfs_uri_unref (uri);
+       g_object_unref (uri);
        return res;
 }
 

Index: ghex2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/ghex2.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ghex2.info  22 Feb 2009 20:20:53 -0000      1.7
+++ ghex2.info  7 Apr 2010 13:55:53 -0000       1.8
@@ -1,91 +1,84 @@
 Package: ghex2
 Version: 2.24.0
-Revision: 1
+Revision: 3
 Source: mirror:gnome:sources/ghex/2.24/ghex-%v.tar.bz2
 Source-MD5: 982b2a4e70e80d2166bcc782e989889c
 
 Depends: <<
-       atk1-shlibs (>= 1.22.0-1),
-       audiofile-shlibs,
-       cairo-shlibs (>= 1.8-1),
-       dbus-shlibs (>= 1.2.1-1),
-       esound-shlibs (>= 0.2.38-1),
-       expat1-shlibs,
-       fontconfig2-shlibs (>= 2.4.1-1),
-       freetype219-shlibs (>= 2.3.7-7),
-       gconf2 (>= 2.24.0-1),
-       glib2-shlibs (>= 2.18.0-1),
-       glitz-shlibs,
-       gnome-keyring-shlibs (>= 0.8.1-1),
-       gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
-       gtk+2-shlibs (>= 2.14.0-1),
+       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),
+       gtk+2-shlibs (>= 2.18.0-1),
        libart2-shlibs,
-       libavahi-client3-shlibs,
-       libavahi-common3-shlibs,
-       libavahi-glib1-shlibs,
-       libbonobo2-shlibs (>= 2.24.0-1),
-       libbonoboui2-shlibs (>= 2.24.0-1),
-       libgettext3-shlibs,
-       libgnome2-shlibs (>= 2.24.0-1),
-       libgnomeui2-shlibs (>= 2.24.0-1),
-       libgnomecanvas2-shlibs (>= 2.20.1.1-1),
-       libgnomeprint2.2-shlibs (>= 2.18.5-1),
-       libgnomeprintui2.2-shlibs (>= 2.18.3-1),
+       libbonobo2-shlibs (>= 2.24.2-1),
+       libbonoboui2-shlibs (>= 2.24.2-1),
+       libgettext8-shlibs,
+       libgnome2-shlibs (>= 2.28.0-1),
+       libgnomeui2-shlibs (>= 2.24.2-1),
+       libgnomecanvas2-shlibs (>= 2.26.0-3),
+       libgnomeprint2.2-shlibs (>= 2.18.6-5),
+       libgnomeprintui2.2-shlibs (>= 2.18.4-4),
        libgtkhex0-shlibs (>= %v-%r),
-       libiconv,
-       libpng3-shlibs,
        libxml2-shlibs (>= 2.6.30-1),
-       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-2),
+       pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+       pixman-shlibs (>= 0.16.0-1),
        popt-shlibs,
        rarian-compat,
        x11-shlibs
 <<
 BuildDepends: <<
-       atk1 (>= 1.24.0-1),
-       audiofile,
-       avahi-dev,
-       cairo (>= 1.8-1),
-       dbus-dev (>= 1.2.1-1),
-       esound (>= 0.2.38-1),
-       expat1,
-       fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
-       gconf2-dev (>= 2.24.0-1),
+       atk1 (>= 1.28.0-1),
+       cairo (>= 1.8.8-3),
+       fink (>= 0.24.12),
+       fink-package-precedence,
+       fontconfig2-dev (>= 2.8.0-4),
+       freetype219 (>= 2.3.12-1),
+       gconf2-dev (>= 2.28.0-1),
        gettext-tools,
        gettext-bin,
-       glib2-dev (>= 2.18.0-1),
+       glib2-dev (>= 2.22.0-1),
        glitz,
-       gnome-doc-utils,
-       gnome-keyring-dev (>= 0.8.1-1),
-       gnome-vfs2-unified-dev (>= 1:2.24.0-1),
-       gtk-doc (>= 1.8-1),
-       gtk+2-dev (>= 2.14.0-1),
+       gnome-doc-utils (>= 0.18.1-1),
+       gtk+2-dev (>= 2.18.0-1),
+       gtk-doc (>= 1.13-5),
        intltool40,
        libart2,
-       libavahi-glib1-dev,
-       libbonobo2-dev (>= 2.24.0-1),
-       libbonoboui2-dev (>= 2.24.0-1),
-       libgettext3-dev,
-       libgnome2-dev (>= 2.24.0-1),
-       libgnomeui2-dev (>= 2.24.0-1),
-       libgnomecanvas2-dev (>= 2.20.1.1-1),
-       libgnomeprint2.2-dev (>= 2.18.5-1),
-       libgnomeprintui2.2-dev (>= 2.18.3-1),
-       libiconv-dev,
-       libpng3,
+       libbonobo2-dev (>= 2.24.2-1),
+       libbonoboui2-dev (>= 2.24.2-1),
+       libgettext8-dev,
+       libgnome2-dev (>= 2.28.0-1),
+       libgnomeui2-dev (>= 2.24.2-1),
+       libgnomecanvas2-dev (>= 2.26.0-3),
+       libgnomeprint2.2-dev (>= 2.18.6-5),
+       libgnomeprintui2.2-dev (>= 2.18.4-4),
        libxml2 (>= 2.6.30-1),
-       orbit2-dev (>= 2.14.16-1),
-       pango1-xft2-ft219-dev (>= 1.22.0-4),
-       pixman (>= 0.12.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,
-       x11-dev,
-       xft2-dev
+       x11-dev
 <<
 
-ConfigureParams: --disable-schemas-install --disable-scrollkeeper 
--disable-dependency-tracking --disable-static 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:PKG_CONFIG_PATH"
+PatchFile: %n.patch
+PatchFile-MD5: 8293296c7abe3ec6abfe4fe1d6a4551d
+PatchScript: <<
+       %{default_script}
+       perl -pi -e 's/(gtk\+-2.0)/gio-2.0 \1/g' configure
+<<
+
+ConfigureParams: --disable-schemas-install --disable-scrollkeeper 
--enable-dependency-tracking --disable-static 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:PKG_CONFIG_PATH"
+CompileScript: <<
+       ./configure %c
+       make
+       fink-package-precedence .
+<<
 
 InstallScript: make install DESTDIR=%d
 DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README
@@ -109,20 +102,14 @@
 SplitOff: <<
        Package: libgtkhex0-shlibs
        Depends: <<
-               atk1-shlibs (>= 1.24.0-1),
-               cairo-shlibs (>= 1.8-1),
-               expat1-shlibs,
-               fontconfig2-shlibs (>= 2.4.1-1),
-               freetype219-shlibs (>= 2.3.7-7),
-               glib2-shlibs (>= 2.18.0-1),
-               glitz-shlibs,
-               gtk+2-shlibs (>= 2.14.0-1),
-               libgettext3-shlibs,
-               libiconv,
-               libpng3-shlibs,
-               pango1-xft2-ft219-shlibs (>= 1.22.0-4),
-               pixman-shlibs (>= 0.12.0-1),
-               x11-shlibs
+               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-shlibs (>= 2.18.0-1),
+               libgettext8-shlibs,
+               pango1-xft2-ft219-shlibs (>= 1.24.5-4)
        <<
        Files: lib/libgtkhex.0*.dylib
        Shlibs: %p/lib/libgtkhex.0.dylib 1.0.0 %n (>= 2.8.2-1)
@@ -149,14 +136,22 @@
        Still uses libgnomeprint. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=508563
 
-       Still uses libgnomevfs. See:
-       http://bugzilla.gnome.org/show_bug.cgi?id=525072
+       Convert libgnomevfs calls to gio. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=525072#c3
+       (but patchscript to fix configure instead of patching
+       configure.in template and redoing autotools)
+       Still inherits libgnomevfs from libgnomeui...oh well
 
        Not fixing some compiler noise. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=570688
 
        Not removing non-public-interface dependencies from .pc. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=572697
+       They're Requires of ones that are in public API anyway, so
+       doesn't cause extra inherited BDep.
+<<
+DescPort: <<
+       Recent glib doesn't publish -lintl, so pass it directly.
 <<
 License: GPL/GFDL
 Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to