[153690] trunk/dports/graphics

devans at macports.org devans at macports.org
Sat Oct 8 06:19:18 CEST 2016


Revision: 153690
          https://trac.macports.org/changeset/153690
Author:   devans at macports.org
Date:     2016-10-07 21:19:18 -0700 (Fri, 07 Oct 2016)
Log Message:
-----------
gimp2, gimp2-devel, gimp3-devel: remove dependency on deprecated webkit-gtk, webkit-gtk3 (#52400).
  * remove +help_browser variant which depends on webkit-gtk, webkit-gkt3
  * patch default preferences file etc/gimprc to access online help docs via
    an external web-browser using 'en' locale.
  * add runtime dependency on epiphany to provide such a browser
  * increment revision to rebuild with new webkit-gtk free configuration

Modified Paths:
--------------
    trunk/dports/graphics/gimp2/Portfile
    trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff
    trunk/dports/graphics/gimp2-devel/Portfile
    trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff
    trunk/dports/graphics/gimp3-devel/Portfile
    trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile	2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2/Portfile	2016-10-08 04:19:18 UTC (rev 153690)
@@ -8,6 +8,7 @@
 conflicts           gimp2-devel gimp3-devel
 # please remember to update the gimp metapackage to match
 version             2.8.18
+revision            1
 license             GPL-3+
 categories          graphics
 maintainers         devans
@@ -69,6 +70,8 @@
                     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)
 
@@ -156,25 +159,14 @@
     configure.args-append --without-x
 }
 
-variant help_browser description {Enable Gimp help browser} {
-    depends_run             path:share/gimp/2.0/help:gimp-help-en
-    configure.args-delete   --without-webkit
-
-    if {${configure.cxx_stdlib} eq "libstdc++"} {
-            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
-    } else {
-            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
-    }
-}
-
 #
 # set default variants
 #
 
 if {[variant_isset quartz]} {
-    default_variants    -gvfs +help_browser +python27
+    default_variants    -gvfs +python27
 } else {
-    default_variants    +help_browser +python27
+    default_variants    +python27
 }
 
 post-activate {

Modified: trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff
===================================================================
--- trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff	2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2/files/patch-etc-gimprc.diff	2016-10-08 04:19:18 UTC (rev 153690)
@@ -1,11 +1,31 @@
---- etc/gimprc.orig	2014-08-25 12:49:30.000000000 -0700
-+++ etc/gimprc	2014-08-25 19:08:51.000000000 -0700
-@@ -684,6 +684,8 @@
+--- etc/gimprc.orig	2016-07-12 18:01:30.000000000 -0700
++++ etc/gimprc	2016-10-07 15:35:54.000000000 -0700
+@@ -661,17 +661,20 @@
+ # string value.
  # 
+ # (help-locales "")
++(help-locales "en")
+ 
+ # Sets the browser used by the help system.  Possible values are gimp and
+ # web-browser.
+ # 
+ # (help-browser gimp)
++(help-browser web-browser)
+ 
+ # When enabled, the online user manual will be used by the help system.
+ # Otherwise the locally installed copy is used.  Possible values are yes and
+ # no.
+ # 
+ # (user-manual-online no)
++(user-manual-online yes)
+ 
+ # The location of the online user manual. This is used if
+ # 'user-manual-online' is enabled.  This is a string value.
+@@ -683,6 +686,7 @@
+ # windows.  Possible values are normal, utility and keep-above.
+ # 
  # (dock-window-hint utility)
++(dock-window-hint normal)
  
-+(dock-window-hint normal)
-+
  # Sets the pixel format to use for mouse pointers.  Possible values are
  # bitmap and pixbuf.
- # 

Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile	2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2-devel/Portfile	2016-10-08 04:19:18 UTC (rev 153690)
@@ -10,7 +10,7 @@
 set git_commit      8370fb13a7458e04ed86fe6bff61912d720dbda5
 set git_date        20160517
 version             2.9.3-${git_date}
-revision            1
+revision            2
 license             GPL-3+
 categories          graphics
 maintainers         devans
@@ -73,6 +73,8 @@
                     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)
 
@@ -139,22 +141,11 @@
     configure.args-append --without-x
 }
 
-variant help_browser description {Enable Gimp help browser} {
-    depends_run             path:share/gimp/2.0/help:gimp-help-en
-    configure.args-delete   --without-webkit
-
-    if {${configure.cxx_stdlib} eq "libstdc++"} {
-            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
-    } else {
-            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
-    }
-}
-
 #
 # set default variants
 #
 
-default_variants    +help_browser +python27
+default_variants    +python27
 
 # create unversioned symbolic link to versioned executable for compatibility with gimp-app
 

Modified: trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff
===================================================================
--- trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff	2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff	2016-10-08 04:19:18 UTC (rev 153690)
@@ -1,11 +1,32 @@
---- etc/gimprc.orig	2015-06-30 10:42:07.000000000 -0700
-+++ etc/gimprc	2015-07-01 06:15:27.000000000 -0700
-@@ -727,6 +727,8 @@
+--- etc/gimprc.orig	2016-05-17 11:07:38.000000000 -0700
++++ etc/gimprc	2016-10-07 18:24:54.000000000 -0700
+@@ -695,11 +695,13 @@
+ # string value.
  # 
+ # (help-locales "")
++(help-locales "en")
+ 
+ # Sets the browser used by the help system.  Possible values are gimp and
+ # web-browser.
+ # 
+ # (help-browser gimp)
++(help-browser web-browser)
+ 
+ # When enabled, a search of actions will also return inactive actions. 
+ # Possible values are yes and no.
+@@ -715,6 +717,7 @@
+ # no.
+ # 
+ # (user-manual-online no)
++(user-manual-online yes)
+ 
+ # The location of the online user manual. This is used if
+ # 'user-manual-online' is enabled.  This is a string value.
+@@ -726,6 +729,7 @@
+ # windows.  Possible values are normal, utility and keep-above.
+ # 
  # (dock-window-hint utility)
++(dock-window-hint normal)
  
-+(dock-window-hint normal)
-+
  # Sets the handedness for cursor positioning.  Possible values are left and
  # right.
- # 

Modified: trunk/dports/graphics/gimp3-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp3-devel/Portfile	2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp3-devel/Portfile	2016-10-08 04:19:18 UTC (rev 153690)
@@ -10,7 +10,7 @@
 set git_commit      fc73b3249d8b223bfa0a0434ea18d2c5b3bc57b8
 set git_date        20160330
 version             2.99.0-${git_date}
-revision            1
+revision            2
 license             GPL-3+
 categories          graphics
 maintainers         devans
@@ -74,6 +74,8 @@
                     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)
 
@@ -148,22 +150,11 @@
     configure.args-append --without-x
 }
 
-variant help_browser description {Enable Gimp help browser} {
-    depends_run             path:share/gimp/2.0/help:gimp-help-en
-    configure.args-delete   --without-webkit
-
-    if {${configure.cxx_stdlib} eq "libstdc++"} {
-            depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
-    } else {
-            depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
-    }
-}
-
 #
 # set default variants
 #
 
-default_variants    +help_browser +python27
+default_variants    +python27
 
 # create unversioned symbolic link to versioned executable for compatibility with gimp-app
 

Modified: trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff
===================================================================
--- trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff	2016-10-08 02:57:36 UTC (rev 153689)
+++ trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff	2016-10-08 04:19:18 UTC (rev 153690)
@@ -1,11 +1,32 @@
---- etc/gimprc.orig	2015-06-09 14:59:40.000000000 -0700
-+++ etc/gimprc	2015-07-01 12:08:41.000000000 -0700
-@@ -727,6 +727,8 @@
+--- etc/gimprc.orig	2016-05-17 11:07:38.000000000 -0700
++++ etc/gimprc	2016-10-07 18:24:54.000000000 -0700
+@@ -695,11 +695,13 @@
+ # string value.
  # 
+ # (help-locales "")
++(help-locales "en")
+ 
+ # Sets the browser used by the help system.  Possible values are gimp and
+ # web-browser.
+ # 
+ # (help-browser gimp)
++(help-browser web-browser)
+ 
+ # When enabled, a search of actions will also return inactive actions. 
+ # Possible values are yes and no.
+@@ -715,6 +717,7 @@
+ # no.
+ # 
+ # (user-manual-online no)
++(user-manual-online yes)
+ 
+ # The location of the online user manual. This is used if
+ # 'user-manual-online' is enabled.  This is a string value.
+@@ -726,6 +729,7 @@
+ # windows.  Possible values are normal, utility and keep-above.
+ # 
  # (dock-window-hint utility)
++(dock-window-hint normal)
  
-+(dock-window-hint normal)
-+
  # Sets the handedness for cursor positioning.  Possible values are left and
  # right.
- # 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161007/89b13367/attachment-0002.html>


More information about the macports-changes mailing list