<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b16898e6b4f6db1fcfc06ef2410aa2c05a9df417">https://github.com/macports/macports-ports/commit/b16898e6b4f6db1fcfc06ef2410aa2c05a9df417</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b16898e gimp2, gimp: update to version 2.10.0, dependencies
</span>b16898e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b16898e6b4f6db1fcfc06ef2410aa2c05a9df417
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue May 1 19:58:03 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2, gimp: update to version 2.10.0, dependencies
</span>---
graphics/gimp/Portfile | 2 +-
graphics/gimp2/Portfile | 66 ++---
graphics/gimp2/files/autogen.sh | 321 ---------------------
...=> patch-app-widgets-gimpcriticaldialog.c.diff} | 25 +-
graphics/gimp2/files/patch-configure.ac.diff | 20 ++
.../patch-disable-broken-composite-altivec.diff | 11 -
...ch-etc-gimprc.diff => patch-etc-gimprc.in.diff} | 17 +-
.../gimp2/files/patch-fix-ref-to-gegl-0.3.diff | 23 ++
graphics/gimp2/files/patch-set-perl-from-env.diff | 11 -
9 files changed, 98 insertions(+), 398 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp/Portfile b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39b0936..4258094 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name gimp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.0
</span> license none
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c69704..d928786 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gimp2
conflicts gimp2-devel gimp3-devel
# please remember to update the gimp metapackage to match
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.0
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,26 +26,27 @@ distname gimp-${version}
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 67fb5ba3958c18725ff50ecb41df750c5476c80d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 719e57056b64de9d17962a05e08765786b553760 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7fcc96fb88cb0a0595d2610f63a15dec245bb37bf9db527d37a24fb75e547de2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 30694779
</span>
set perl_version 5.26
depends_build port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:appstream-glib \
</span> port:intltool \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span> port:perl${perl_version}
depends_lib port:desktop-file-utils \
port:iso-codes \
port:babl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gegl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gegl-0.4 \
</span> port:atk \
port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glib-networking \
</span> port:gtk2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gvfs \
</span> port:fontconfig \
port:freetype \
port:tiff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,8 @@ depends_lib port:desktop-file-utils \
</span> port:ghostscript \
port:libpng \
port:libmng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libexif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gexiv2 \
</span> port:aalib \
port:xpm \
port:librsvg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,28 +65,34 @@ depends_lib port:desktop-file-utils \
</span> port:curl \
port:libwmf \
port:jasper \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/libmypaint.pc:libmypaint \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mypaint-brushes \
</span> port:lcms2 \
port:dbus-glib \
port:libxml2 \
port:libxslt \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xdg-utils \
</span> port:xorg-libXcursor \
port:xorg-libXmu \
port:xorg-libXext \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# libgimpwidgets/gimpwidgetsmarshal.h can be referenced by a parallel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build before it is created
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # 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)
compiler.blacklist *gcc-3.* *gcc-4.* {clang < 300}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-etc-gimprc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-set-perl-from-env.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-plug-ins-common-web-browser.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-disable-broken-composite-altivec.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-ref-to-gegl-0.3.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-etc-gimprc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-app-widgets-gimpcriticaldialog.c.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
pre-configure {
if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,34 +108,21 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span> configure.perl ${prefix}/bin/perl${perl_version}
configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
--enable-mp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-bundled-mypaint-brushes \
</span> --with-pdbgen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lcms=2 \
</span> --with-x \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-maintainer-mode \
</span> --disable-silent-rules \
--disable-python \
--without-alsa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gvfs \
</span> --without-gudev \
--without-webkit \
ac_cv_path_INTLTOOL_PERL=${configure.perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# --without-mac-twain:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Leopard's 64bit Carbon is missing QuitApplicationEventLoop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# It doesn't build any more anyway:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/35168
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mac-twain
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant python27 description {Build with python plugin support using python 2.7} {
configure.args-delete --disable-python
configure.python ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,10 +132,6 @@ variant python27 description {Build with python plugin support using python 2.7}
</span> configure.env PATH=${python_framework}/bin:$env(PATH)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gvfs conflicts quartz description {Enable GIO/gvfs support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gvfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-gvfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
variant remote description {Enable building of obsolete gimp-remote helper app} {
configure.args-append --enable-gimp-remote
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,7 +141,7 @@ variant debug description {Enable debugging} {
</span> configure.args-append --enable-debug
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts gvfs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz {
</span> depends_lib-delete port:xorg-libXcursor \
port:xorg-libXmu \
port:xorg-libXext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,11 +158,7 @@ variant quartz conflicts gvfs {
</span> # set default variants
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants -gvfs +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +python27
</span>
post-activate {
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/autogen.sh b/graphics/gimp2/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 09dca7c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,321 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This script does all the magic calls to automake/autoconf and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# friends that are needed to configure a git clone. As described in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the file HACKING you need a couple of extra tools to run this script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# successfully.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# If you are compiling from a released tarball you don't need these
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# tools and you shouldn't use this script. Just call ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# directly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ACLOCAL=${ACLOCAL-aclocal-1.11}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOCONF=${AUTOCONF-autoconf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOHEADER=${AUTOHEADER-autoheader}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE=${AUTOMAKE-automake-1.11}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOCONF_REQUIRED_VERSION=2.54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE_REQUIRED_VERSION=1.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INTLTOOL_REQUIRED_VERSION=0.40.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBTOOL_REQUIRED_VERSION=1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBTOOL_WIN32_REQUIRED_VERSION=2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PROJECT="GNU Image Manipulation Program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TEST_TYPE=-d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FILE=plug-ins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ORIGDIR=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check_version ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERSION_A=$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERSION_B=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- save_ifs="$IFS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFS=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dummy $VERSION_A 0 0 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAJOR_A=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MINOR_A=$3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MICRO_A=$4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dummy $VERSION_B 0 0 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAJOR_B=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MINOR_B=$3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MICRO_B=$4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFS="$save_ifs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if expr "$MAJOR_A" = "$MAJOR_B" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if expr "$MINOR_A" \> "$MINOR_B" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "yes (version $VERSION_A)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif expr "$MINOR_A" = "$MINOR_B" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if expr "$MICRO_A" \>= "$MICRO_B" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "yes (version $VERSION_A)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Too old (version $VERSION_A)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Too old (version $VERSION_A)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif expr "$MAJOR_A" \> "$MAJOR_B" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Major version might be too new ($VERSION_A)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Too old (version $VERSION_A)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "I am testing that you have the tools required to build the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "$PROJECT from git. This test is not foolproof,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "so if anything goes wrong, see the file HACKING for more information..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DIE=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OS=`uname -s`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case $OS in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *YGWIN* | *INGW*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Looks like Win32, you will need libtool $LIBTOOL_WIN32_REQUIRED_VERSION or newer."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_REQUIRED_VERSION=$LIBTOOL_WIN32_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOLIZE=$LIBTOOLIZE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOLIZE=glibtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You must have libtool installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Install the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test x$LIBTOOLIZE != x; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VER=`$LIBTOOLIZE --version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_version $VER $LIBTOOL_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# check if gtk-doc is explicitely disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for ag_option in $AUTOGEN_CONFIGURE_ARGS $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $ag_option in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -disable-gtk-doc | --disable-gtk-doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_gtk_doc=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test x$enable_gtk_doc = xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "skipping test for gtkdocize"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "checking for gtkdocize ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You must have gtk-doc installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Install the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " or get the source tarball at"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You can also use the option --disable-gtk-doc to skip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " this test but then you will not be able to generate a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " configure script that can build the API documentation."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VER=`$AUTOCONF --version | head -n 1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_version $VER $AUTOCONF_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You must have autoconf installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=$AUTOMAKE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=$ACLOCAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE=automake-1.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL=aclocal-1.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test x$AUTOMAKE != x; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VER=`$AUTOMAKE --version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | grep automake | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_version $VER $AUTOMAKE_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo -n "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VER=`intltoolize --version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_version $VER $INTLTOOL_REQUIRED_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You must have intltool installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Get the latest version from"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ftp://ftp.gnome.org/pub/GNOME/sources/intltool/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo -n "checking for xsltproc ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if (xsltproc --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You must have xsltproc installed to compile $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Get the latest version from"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "$DIE" -eq 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Please install/upgrade the missing tools and call me again."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test $TEST_TYPE $FILE || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must run this script in the top-level $PROJECT directory."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$NOCONFIGURE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "I am going to run ./configure with the following arguments:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " $AUTOGEN_CONFIGURE_ARGS $@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$*"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "If you wish to pass additional arguments, please specify them "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "environment variable."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$ACLOCAL_FLAGS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- acdir=`$ACLOCAL --print-ac-dir`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for file in $m4list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! -f "$acdir/$file" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "WARNING: aclocal's directory is $acdir, but..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " no file $acdir/$file"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " You may see fatal macro warnings below."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " If these files are installed in /some/dir, set the "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " or install $acdir/$file."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rm -rf autom4te.cache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$ACLOCAL $ACLOCAL_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RC=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test $RC -ne 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$ACLOCAL gave errors. Please fix the error conditions and try again."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit $RC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$LIBTOOLIZE --force || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test x$enable_gtk_doc = xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -f gtk-doc.make; then :; else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "WARNING: You have disabled gtk-doc."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " As a result, you will not be able to generate the API"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " documentation and 'make dist' will not work."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtkdocize || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# optionally feature autoheader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 && $AUTOHEADER || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$AUTOMAKE --add-missing || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$AUTOCONF || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --automake || exit $?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $ORIGDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$NOCONFIGURE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $RC -ne 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Configure failed or did not finish!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit $RC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Now type 'make' to compile the $PROJECT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff b/graphics/gimp2/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span>similarity index 52%
rename from graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff
rename to graphics/gimp2/files/patch-app-widgets-gimpcriticaldialog.c.diff
<span style='display:block; white-space:pre;color:#808080;'>index a5cc2ad..5559992 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-plug-ins-common-web-browser.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plug-ins/common/web-browser.c.orig 2017-01-28 10:58:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plug-ins/common/web-browser.c 2017-02-07 12:04:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,13 +201,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpcriticaldialog.c.orig 2018-05-01 13:13:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpcriticaldialog.c 2018-05-01 13:18:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,26 +272,25 @@
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(PLATFORM_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NSURL *ns_url;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gboolean retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @autoreleasepool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ns_url = [NSURL URLWithString: [NSString stringWithUTF8String: url]];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- retval = [[NSWorkspace sharedWorkspace] openURL: ns_url];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> #else
+ gboolean rstatus;
+ gchar *command_line;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gimp_ui_init (PLUG_IN_BINARY, FALSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> - return gtk_show_uri (gdk_screen_get_default (),
+ rstatus = gtk_show_uri (gdk_screen_get_default (),
url,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,3 +39,4 @@
</span> + return rstatus;
#endif
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-configure.ac.diff b/graphics/gimp2/files/patch-configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c443130
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-04-26 06:27:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-05-01 12:54:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -741,7 +741,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT($have_glib_2_43)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROG(GEGL, gegl, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PATH_PROG(GEGL, gegl-0.4, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$GEGL" = xno; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_deps_error([gegl], [Could not find native gegl executable in your PATH.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2001,7 +2001,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROGS(PERL,perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PATH_PROGS(PERL,perl5.26 perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AX_PROG_PERL_VERSION([perl_required_version],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [add_deps_error([perl >= perl_required_version])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-disable-broken-composite-altivec.diff b/graphics/gimp2/files/patch-disable-broken-composite-altivec.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f7a3a4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-disable-broken-composite-altivec.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/composite/gimp-composite-altivec.h.orig 2018-04-20 10:01:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/composite/gimp-composite-altivec.h 2018-04-20 10:02:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(USE_ALTIVEC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(ARCH_PPC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if __GNUC__ >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define COMPILE_ALTIVEC_IS_OKAY (1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef COMPILE_ALTIVEC_IS_OKAY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __GNUC__ >= 3 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* defined(ARCH_PPC) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* defined(USE_ALTIVEC) */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-etc-gimprc.diff b/graphics/gimp2/files/patch-etc-gimprc.in.diff
</span>similarity index 57%
rename from graphics/gimp2/files/patch-etc-gimprc.diff
rename to graphics/gimp2/files/patch-etc-gimprc.in.diff
<span style='display:block; white-space:pre;color:#808080;'>index f67cd32..5744ef3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-etc-gimprc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/patch-etc-gimprc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/gimprc.orig 2016-07-12 18:01:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/gimprc 2016-10-07 15:35:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -661,17 +661,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/gimprc.in.orig 2018-03-26 16:15:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/gimprc.in 2018-04-16 14:10:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -747,11 +747,13 @@
</span> # string value.
#
# (help-locales "")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,8 +12,9 @@
</span> # (help-browser gimp)
+(help-browser web-browser)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # When enabled, the online user manual will be used by the help system.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Otherwise the locally installed copy is used. Possible values are yes and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When enabled, a search of actions will also return inactive actions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Possible values are yes and no.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,6 +769,7 @@
</span> # no.
#
# (user-manual-online no)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +22,11 @@
</span>
# The location of the online user manual. This is used if
# 'user-manual-online' is enabled. This is a string value.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -683,6 +686,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -778,6 +781,7 @@
</span> # windows. Possible values are normal, utility and keep-above.
#
# (dock-window-hint utility)
+(dock-window-hint normal)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Sets the pixel format to use for mouse pointers. Possible values are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bitmap and pixbuf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Sets the handedness for cursor positioning. Possible values are left and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # right.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-fix-ref-to-gegl-0.3.diff b/graphics/gimp2/files/patch-fix-ref-to-gegl-0.3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0a135b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/patch-fix-ref-to-gegl-0.3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7e19906827d301eb70275dba089849a632a0eabe Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jehan <jehan@girinstud.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 28 Apr 2018 00:27:31 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: gimp.pc: Fix reference to gegl-0.3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gimp.pc.in | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gimp.pc.in b/gimp.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9cf1da9..9acf6ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gimp.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gimp.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,6 @@ gimplocaledir=@gimplocaledir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Name: GIMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Description: GIMP Library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version: @GIMP_REAL_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.3 >= @GEGL_REQUIRED_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.4 >= @GEGL_REQUIRED_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Libs: -L${libdir} -lgimp-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ -lgimpconfig-@GIMP_API_VERSION@ -lgimpcolor-@GIMP_API_VERSION@ -lgimpbase-@GIMP_API_VERSION@ @RT_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-set-perl-from-env.diff b/graphics/gimp2/files/patch-set-perl-from-env.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 50ae539..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-set-perl-from-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2017-12-03 11:23:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-12-03 11:24:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1840,7 +1840,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_PATH_PROGS(PERL,perl5 perl perl5.005 perl5.004,perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PATH_PROGS(PERL,$PERL perl5 perl perl5.005 perl5.004,perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_WITH(pdbgen,
</span></pre><pre style='margin:0'>
</pre>