Revision: 138254 https://trac.macports.org/changeset/138254 Author: devans@macports.org Date: 2015-07-03 06:42:48 -0700 (Fri, 03 Jul 2015) Log Message: ----------- gimp3-devel: update to git branch gtk3-port as of 20150609, build +quartz using gtk-osx-application-gtk3, now supports lcms2, remove outdated +gvfs variant, disable +help_browser when building +quartz due to build problems with webkit-gtk +quartz (#47936). Modified Paths: -------------- trunk/dports/graphics/gimp3-devel/Portfile trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff Modified: trunk/dports/graphics/gimp3-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp3-devel/Portfile 2015-07-03 12:36:31 UTC (rev 138253) +++ trunk/dports/graphics/gimp3-devel/Portfile 2015-07-03 13:42:48 UTC (rev 138254) @@ -7,10 +7,9 @@ name gimp3-devel conflicts gimp2 gimp2-devel set git_name gimp -set git_commit 3eff2ebc4b583a63dcb46c71b92f86da1e5cede5 -set git_date 20150208 +set git_commit 061b0ccd03a89b85f6ceea6878e323844695bcf6 +set git_date 20150609 version 2.99.0-${git_date} -revision 1 license GPL-3+ categories graphics maintainers devans @@ -18,9 +17,9 @@ description The GNU Image Manipulation Program long_description The GNU Image Manipulation Program (GIMP) is a powerful \ - tool for the preparation and manipulation of digital images. \ - The GIMP provides the user with a wide variety of image \ - manipulation, painting, processing, and rendering tools. \ + tool for the preparation and manipulation of digital images. \ + The GIMP provides the user with a wide variety of image \ + manipulation, painting, processing, and rendering tools. \ This is the experimental GTK3 based development version leading \ to a future 3.0 release branch based on a recent snapshot of \ the GTK3 git development branch. @@ -30,15 +29,15 @@ distname ${git_name}-${git_commit} -checksums rmd160 d7184955226ef247bd4bdef97d43152fd6e47acf \ - sha256 5858eaad766527e2d5739474fba8db509aef35f79cdd449648f710366158c746 +checksums rmd160 4af85ef167c2aae03e0fd1e57945f8145c8b4062 \ + sha256 c076be0ad227e30c88c5fe76a33ffa0fc6f0f7010737752cae1bc59daa2a4e1c depends_build port:pkgconfig \ + port:intltool \ + port:gtk-doc \ port:autoconf \ port:automake \ - port:libtool \ - port:intltool \ - port:gtk-doc + port:libtool depends_lib port:desktop-file-utils \ port:iso-codes \ @@ -63,7 +62,7 @@ port:curl \ port:libwmf \ port:jasper \ - port:lcms \ + port:lcms2 \ port:dbus-glib \ port:libxml2 \ port:libxslt \ @@ -72,17 +71,12 @@ port:xorg-libXext \ port:xorg-libXfixes -depends_run path:share/gimp/2.0/help:gimp-help-en - -use_parallel_build no - -patchfiles patch-configure.ac.diff \ - patch-etc-gimprc.diff \ - patch-plug-ins-twain-tw_mac.c.diff - # 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 +patchfiles patch-configure.ac.diff \ + patch-etc-gimprc.diff + pre-configure { if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} { set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}] @@ -108,16 +102,17 @@ --disable-silent-rules \ --disable-python \ --without-alsa \ - --without-gvfs \ --without-gudev \ - --without-webkit \ - --without-mac-twain + --without-webkit # --without-mac-twain: # Leopard's 64bit Carbon is missing QuitApplicationEventLoop -# It doesn't build any more anyways: +# It doesn't build any more anyway: # https://trac.macports.org/ticket/35168 +configure.args-append \ + --without-mac-twain + variant python27 description {Build with python plugin support using python 2.7} { configure.args-delete --disable-python configure.python ${prefix}/bin/python2.7 @@ -127,10 +122,6 @@ configure.env PATH=${python_framework}/bin:$env(PATH) } -variant gvfs description {Enable GIO/gvfs support} { - depends_lib-append port:gvfs - configure.args-delete --without-gvfs -} variant remote description {Enable building of obsolete gimp-remote helper app} { configure.args-append --enable-gimp-remote @@ -140,29 +131,22 @@ configure.args-append --enable-debug } -variant quartz { +variant quartz conflicts 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-gtk3 configure.args-delete --with-x \ --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-append --without-lcms - } } -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++"} { @@ -176,9 +160,13 @@ # set default variants # -default_variants +help_browser +gvfs +# help browser uses webkit-gtk which currently doesn't build +quartz (#47936) -default_variants +python27 +if {[variant_isset quartz]} { + default_variants -help_browser +python27 +} else { + default_variants +help_browser +python27 +} # create unversioned symbolic link to versioned executable for compatibility with gimp-app Modified: trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff =================================================================== --- trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff 2015-07-03 12:36:31 UTC (rev 138253) +++ trunk/dports/graphics/gimp3-devel/files/patch-configure.ac.diff 2015-07-03 13:42:48 UTC (rev 138254) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2015-02-08 09:38:37.000000000 -0800 -+++ configure.ac 2015-02-24 07:43:03.000000000 -0800 -@@ -1117,7 +1117,7 @@ +--- configure.ac.orig 2015-06-09 14:59:40.000000000 -0700 ++++ configure.ac 2015-07-01 12:08:41.000000000 -0700 +@@ -1126,7 +1126,7 @@ GTK_CHECK_BACKEND([x11], [gtk_required_version], [have_gtk_x11=yes], [have_gtk_x11=no]) Modified: trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff =================================================================== --- trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff 2015-07-03 12:36:31 UTC (rev 138253) +++ trunk/dports/graphics/gimp3-devel/files/patch-etc-gimprc.diff 2015-07-03 13:42:48 UTC (rev 138254) @@ -1,6 +1,6 @@ ---- etc/gimprc.orig 2014-11-01 07:00:08.000000000 -0700 -+++ etc/gimprc 2014-11-01 09:28:58.000000000 -0700 -@@ -705,6 +705,8 @@ +--- etc/gimprc.orig 2015-06-09 14:59:40.000000000 -0700 ++++ etc/gimprc 2015-07-01 12:08:41.000000000 -0700 +@@ -718,6 +718,8 @@ # # (dock-window-hint utility)