[41238] trunk/dports/gnome/eog

[blb at macports.org]

Revision: 41238
          http://trac.macports.org/changeset/41238
Author:   blb at macports.org
Date:     2008-10-28 15:38:50 -0700 (Tue, 28 Oct 2008)
Log Message:
-----------
gnome/eog - version update to 2.24.1, ticket #17032

Modified Paths:
--------------
    trunk/dports/gnome/eog/Portfile

Added Paths:
-----------
    trunk/dports/gnome/eog/files/
    trunk/dports/gnome/eog/files/patch-src-main.c.diff

Modified: trunk/dports/gnome/eog/Portfile
===================================================================
--- trunk/dports/gnome/eog/Portfile	2008-10-28 22:05:53 UTC (rev 41237)
+++ trunk/dports/gnome/eog/Portfile	2008-10-28 22:38:50 UTC (rev 41238)
@@ -1,20 +1,22 @@
 # $Id$
+
 PortSystem 1.0
+
 name		eog
-version		2.18.2
-revision	0
+version		2.24.1
+set branch	[join [lrange [split ${version} .] 0 1] .]
 description	An image viewing program.
 long_description        This is the Eye of Gnome, an image viewer program. \
 			It is meant to be a fast and functional image viewer \
 			as well as an image cataloging program.
 maintainers	nomaintainer
 categories	gnome
-platforms	darwin 
+platforms	darwin
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/${name}/2.18/
-checksums	md5 7e5fc342201ea00404008258c19b4461 \
-			sha1 d3fcca9f2a6b72f37d1a5d37561bd0eae54b730e \
-			rmd160 9bc5286913e83058cf3b833493f0ed4cb218c1e7
+master_sites    gnome:sources/${name}/${branch}/
+checksums	md5 1233b5130e2d56e9d50d39084ae067ef \
+			sha1 f1406dc1ba9a2d7f8527cfbffa3f0889005b6971 \
+			rmd160 b387b05aa2f5adc979d1acdfa78788bed947c126
 
 depends_lib port:gnome-platform-suite \
         lib:libiconv.2:libiconv port:fontconfig \
@@ -30,6 +32,8 @@
 
 use_bzip2 	yes
 
+patchfiles	patch-src-main.c.diff
+
 configure.args  --mandir=${prefix}/share/man --disable-scrollkeeper
 
 post-destroot {

Added: trunk/dports/gnome/eog/files/patch-src-main.c.diff
===================================================================
--- trunk/dports/gnome/eog/files/patch-src-main.c.diff	                        (rev 0)
+++ trunk/dports/gnome/eog/files/patch-src-main.c.diff	2008-10-28 22:38:50 UTC (rev 41238)
@@ -0,0 +1,29 @@
+--- src/main.c.orig	2008-10-28 15:13:25.000000000 -0400
++++ src/main.c	2008-10-28 15:14:45.000000000 -0400
+@@ -58,7 +58,7 @@
+ static gboolean slide_show = FALSE;
+ static gboolean disable_collection = FALSE;
+ #if HAVE_DBUS
+-static gboolean wait = FALSE;
++static gboolean eog_wait = FALSE;
+ #endif
+ static gchar **startup_files = NULL;
+ 
+@@ -68,7 +68,7 @@
+ 	{ "disable-image-collection", 'c', 0, G_OPTION_ARG_NONE, &disable_collection, N_("Disable image collection"), NULL  },
+ 	{ "slide-show", 's', 0, G_OPTION_ARG_NONE, &slide_show, N_("Open in slide show mode"), NULL  },
+ #if HAVE_DBUS
+-	{ "new-instance", 'n', 0, G_OPTION_ARG_NONE, &wait, N_("Start a new instance instead of reusing an existing one"), NULL },
++	{ "new-instance", 'n', 0, G_OPTION_ARG_NONE, &eog_wait, N_("Start a new instance instead of reusing an existing one"), NULL },
+ #endif
+ 	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &startup_files, NULL, N_("[FILE...]") },
+ 	{ NULL }
+@@ -196,7 +196,7 @@
+ 	set_startup_flags ();
+ 	
+ #ifdef HAVE_DBUS
+-	if (!wait && !eog_application_register_service (EOG_APP)) {
++	if (!eog_wait && !eog_application_register_service (EOG_APP)) {
+ 		if (load_files_remote ()) {
+ 			g_object_unref (program);
+ 			return 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081028/98c996ce/attachment.html>