Revision
145261
Author
devans@macports.org
Date
2016-01-29 18:10:49 -0800 (Fri, 29 Jan 2016)

Log Message

gimp2: apply mcalhoun's patch to allow +quartz variant to build with lcms2 and help browser enabled (#50482).

Modified Paths

Diff

Modified: trunk/dports/graphics/gimp2/Portfile (145260 => 145261)


--- trunk/dports/graphics/gimp2/Portfile	2016-01-30 01:11:29 UTC (rev 145260)
+++ trunk/dports/graphics/gimp2/Portfile	2016-01-30 02:10:49 UTC (rev 145261)
@@ -8,7 +8,7 @@
 conflicts           gimp2-devel gimp3-devel
 # please remember to update the gimp metapackage to match
 version             2.8.16
-revision            1
+revision            2
 license             GPL-3+
 categories          graphics
 maintainers         devans
@@ -155,15 +155,6 @@
                           --x-includes=${prefix}/include \
                           --x-libraries=${prefix}/lib
     configure.args-append --without-x
-    configure.ldflags-append   -framework Carbon
-
-#
-# if variant is +quartz lcms plugin uses 32 bit only Carbon API
-#
-
-    if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
-        configure.args-replace --with-lcms=2 --without-lcms
-    }
 }
 
 variant help_browser description {Enable Gimp help browser} {
@@ -181,10 +172,8 @@
 # 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
+    default_variants    -gvfs +help_browser +python27
 } else {
     default_variants    +help_browser +python27
 }