[138249] trunk/dports/graphics/gimp2-devel
devans at macports.org
devans at macports.org
Thu Jul 2 16:35:25 PDT 2015
Revision: 138249
https://trac.macports.org/changeset/138249
Author: devans at macports.org
Date: 2015-07-02 16:35:25 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
gimp2-devel: update to git master as of 20150630, build +quartz using gtk-osx-application-gtk2, 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/gimp2-devel/Portfile
trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff
Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile 2015-07-02 23:29:39 UTC (rev 138248)
+++ trunk/dports/graphics/gimp2-devel/Portfile 2015-07-02 23:35:25 UTC (rev 138249)
@@ -7,10 +7,9 @@
name gimp2-devel
conflicts gimp2 gimp3-devel
set git_name gimp
-set git_commit 1d5bffd1c288425214c01025807ecda8e0227c69
-set git_date 20150223
+set git_commit f72f8f20e57ba8abeac3a656b07314a34673776c
+set git_date 20150630
version 2.9.1-${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 development version leading to a future 2.10 release \
branch based on a recent snapshot of upstream git master.
@@ -29,15 +28,15 @@
distname ${git_name}-${git_commit}
-checksums rmd160 450f9577947b8c5392a3eb5ac9beee707cd1fcb6 \
- sha256 d6197cf9410d06d7d1248837cfd2bf395edc723bef86a73973fe93bfb75e861d
+checksums rmd160 013a0e9e5bebf8e142fe69c509ecde143dc30062 \
+ sha256 204b7acc03b332cf1f9d1fd6776242bd7200367ae3d0cb39bdf7e0c0ffc8b59e
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 \
@@ -62,7 +61,7 @@
port:curl \
port:libwmf \
port:jasper \
- port:lcms \
+ port:lcms2 \
port:dbus-glib \
port:libxml2 \
port:libxslt \
@@ -71,15 +70,11 @@
port:xorg-libXext \
port:xorg-libXfixes
-depends_run path:share/gimp/2.0/help:gimp-help-en
-
-use_parallel_build no
-
-patchfiles patch-etc-gimprc.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-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}]
@@ -105,16 +100,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
@@ -124,10 +120,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
@@ -137,29 +129,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-gtk2
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++"} {
@@ -173,9 +158,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/gimp2-devel/files/patch-etc-gimprc.diff
===================================================================
--- trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2015-07-02 23:29:39 UTC (rev 138248)
+++ trunk/dports/graphics/gimp2-devel/files/patch-etc-gimprc.diff 2015-07-02 23:35:25 UTC (rev 138249)
@@ -1,6 +1,6 @@
---- etc/gimprc.orig 2015-02-23 15:12:33.000000000 -0800
-+++ etc/gimprc 2015-02-23 18:09:38.000000000 -0800
-@@ -705,6 +705,8 @@
+--- etc/gimprc.orig 2015-06-30 10:42:07.000000000 -0700
++++ etc/gimprc 2015-07-01 06:15:27.000000000 -0700
+@@ -718,6 +718,8 @@
#
# (dock-window-hint utility)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150702/1ecc6086/attachment.html>
More information about the macports-changes
mailing list