[138244] trunk/dports/graphics/gimp2/Portfile

[devans at macports.org]

Revision: 138244
          https://trac.macports.org/changeset/138244
Author:   devans at macports.org
Date:     2015-07-02 15:30:06 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
gimp2: build +quartz using gtk-osx-application-gtk2, increment revision, disable +gvfs +help_browser when building +quartz due to build problems with webkit-gtk +quartz (#47936).

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

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile	2015-07-02 22:17:40 UTC (rev 138243)
+++ trunk/dports/graphics/gimp2/Portfile	2015-07-02 22:30:06 UTC (rev 138244)
@@ -8,7 +8,7 @@
 conflicts           gimp2-devel gimp3-devel
 # please remember to update the gimp metapackage to match
 version             2.8.14
-revision            2
+revision            3
 license             GPL-3+
 categories          graphics
 maintainers         devans
@@ -70,8 +70,6 @@
                     port:xorg-libXext \
                     port:xorg-libXfixes
 
-depends_run         path:share/gimp/2.0/help:gimp-help-en
-
 # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'
 compiler.blacklist-append gcc-3.3 gcc-4.0 gcc-4.2 apple-gcc-4.2
 
@@ -130,9 +128,7 @@
     configure.env             PATH=${python_framework}/bin:$env(PATH)
 }
 
-default_variants    +python27
-
-variant gvfs description {Enable GIO/gvfs support} {
+variant gvfs conflicts quartz description {Enable GIO/gvfs support} {
     depends_lib-append      port:gvfs
     configure.args-delete   --without-gvfs
 }
@@ -145,13 +141,13 @@
     configure.args-append  --enable-debug
 }
 
-variant quartz {
+variant quartz conflicts gvfs help_browser {
     depends_lib-delete    port:xorg-libXcursor \
                           port:xorg-libXmu \
                           port:xorg-libXext \
                           port:xorg-libXfixes \
                           port:xpm
-    depends_lib-append    port:gtk-osx-application
+    depends_lib-append    port:gtk-osx-application-gtk2
     configure.args-delete --with-x \
                           --x-includes=${prefix}/include \
                           --x-libraries=${prefix}/lib
@@ -167,11 +163,8 @@
     }
 }
 
-#
-# set default variants
-#
-
-variant help_browser description {Enable Gimp help browser} {
+variant help_browser conflicts quartz 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++"} {
@@ -181,8 +174,18 @@
     }
 }
 
-default_variants    +help_browser
+#
+# set default variants
+#
 
+# help browser uses webkit-gtk which currently doesn't build +quartz (#47936)
+
+if {[variant_isset quartz]} {
+    default_variants    -gvfs -help_browser +python27
+} else {
+    default_variants    +help_browser +python27
+}
+
 post-activate {
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150702/45a92db3/attachment.html>