[153733] trunk/dports/graphics/gimp2

devans at macports.org devans at macports.org
Sun Oct 9 21:20:15 CEST 2016


Revision: 153733
          https://trac.macports.org/changeset/153733
Author:   devans at macports.org
Date:     2016-10-09 12:20:15 -0700 (Sun, 09 Oct 2016)
Log Message:
-----------
gimp2: remove hard runtime dependency on a specific GNOME/GTK web browser to display help, patch GIMP generic web browser plugin to fall back to using the macOS default web browser if no GNOME/GTK web browser is available (#52548, #52549).

Modified Paths:
--------------
    trunk/dports/graphics/gimp2/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile	2016-10-09 18:43:29 UTC (rev 153732)
+++ trunk/dports/graphics/gimp2/Portfile	2016-10-09 19:20:15 UTC (rev 153733)
@@ -8,7 +8,7 @@
 conflicts           gimp2-devel gimp3-devel
 # please remember to update the gimp metapackage to match
 version             2.8.18
-revision            1
+revision            2
 license             GPL-3+
 categories          graphics
 maintainers         devans
@@ -70,14 +70,13 @@
                     port:xorg-libXext \
                     port:xorg-libXfixes
 
-depends_run         port:epiphany
-
 # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
 # redefinition of typedef is invalid in C [-Wtypedef-redefinition] (#50329)
 
 compiler.blacklist *gcc* {clang < 300}
 
-patchfiles          patch-etc-gimprc.diff
+patchfiles          patch-etc-gimprc.diff \
+                    patch-plug-ins-common-web-browser.c.diff
 
 post-patch {
     xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}

Added: trunk/dports/graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff	                        (rev 0)
+++ trunk/dports/graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff	2016-10-09 19:20:15 UTC (rev 153733)
@@ -0,0 +1,29 @@
+--- plug-ins/common/web-browser.c.orig	2015-08-15 00:52:41.000000000 -0700
++++ plug-ins/common/web-browser.c	2016-10-09 03:07:01.000000000 -0700
+@@ -181,11 +181,25 @@
+ 
+   return TRUE;
+ #else
++  gboolean rstatus;
++  gchar *command_line;
++
+   gimp_ui_init (PLUG_IN_BINARY, FALSE);
+ 
+-  return gtk_show_uri (gdk_screen_get_default (),
++  rstatus = gtk_show_uri (gdk_screen_get_default (),
+                        url,
+                        gtk_get_current_event_time(),
+                        error);
++
++  if (!rstatus) {
++     command_line = g_strdup_printf ("open %s", url);
++
++     rstatus = g_spawn_command_line_async (command_line,
++                       error);
++
++     g_free (command_line);
++  }
++  
++  return rstatus;
+ #endif
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161009/86f8f2df/attachment-0002.html>


More information about the macports-changes mailing list