gimp: update to 2.10.20

Alexander Pyhalov

2020-08-01 ce99a8a4a843f200ffb934432d66e40096892140

gimp: update to 2.10.20

 components/image/gimp/Makefile

@@ -13,11 +13,11 @@
# Copyright (c) 2019 Tim Mooney
#

BUILD_BITS= 64
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        gimp
COMPONENT_VERSION=    2.8.22
COMPONENT_REVISION=    7
COMPONENT_VERSION=    2.10.20
COMPONENT_PROJECT_URL=    https://www.gimp.org/
COMPONENT_SUMMARY=    Gimp - The Free & Open Source Image Editor
COMPONENT_FMRI=        image/editor/gimp
@@ -25,18 +25,16 @@
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH=    \
    sha256:9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a
COMPONENT_ARCHIVE_URL=    https://download.gimp.org/pub/gimp/v2.8/$(COMPONENT_ARCHIVE)
    sha256:e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
COMPONENT_ARCHIVE_URL=    https://download.gimp.org/pub/gimp/v2.10/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    GPLv3
COMPONENT_LICENSE_FILE=    COPYING

include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/common.mk

PATH=$(PATH.gnu)

CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/$(MACH64)/glib-2.0/include
CFLAGS += -I/usr/include/libmng

# build with the distribution preferred libjpeg implementation
@@ -52,7 +50,7 @@
                autoconf)

CONFIGURE_OPTIONS+=    --sysconfdir=/etc
CONFIGURE_OPTIONS+=    --libexecdir=/usr/lib
CONFIGURE_OPTIONS+=    --libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
CONFIGURE_OPTIONS+=    --localstatedir=/var/lib
CONFIGURE_OPTIONS+=    --enable-mp
CONFIGURE_OPTIONS+=    --enable-default-binary
@@ -64,35 +62,44 @@
# Tests need this
unexport SHELLOPTS

build:        $(BUILD_32)

install:    $(INSTALL_32)

test:        $(TEST_32)
# Replace "#!/usr/bin/env ..." shebang lines with properly versioned ones.
COMPONENT_POST_INSTALL_ACTION = \
        /usr/bin/find $(PROTO_DIR) -name *.py \
                -exec $(GSED) -i -e '1s|env python.*|$(MACH64)/python$(PYTHON_VERSION)|' "{}" \; ;

# Build dependencies
REQUIRED_PACKAGES += library/mypaint-brushes
REQUIRED_PACKAGES += library/python/pygobject
REQUIRED_PACKAGES += library/python/pygtk2

# Auto-generated dependencies
REQUIRED_PACKAGES += codec/jasper
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += compress/bzip2
REQUIRED_PACKAGES += compress/xz
REQUIRED_PACKAGES += image/library/babl
REQUIRED_PACKAGES += image/library/gegl
REQUIRED_PACKAGES += image/library/libexif
REQUIRED_PACKAGES += image/library/gexiv2
REQUIRED_PACKAGES += image/library/libjpeg8-turbo
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += image/library/librsvg
REQUIRED_PACKAGES += image/library/libtiff
REQUIRED_PACKAGES += image/library/openjpeg
REQUIRED_PACKAGES += library/aalib
REQUIRED_PACKAGES += library/c++/harfbuzz
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/json-glib
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/graphics/libmng
REQUIRED_PACKAGES += library/ilmbase
REQUIRED_PACKAGES += library/lcms2
REQUIRED_PACKAGES += library/libmypaint
REQUIRED_PACKAGES += library/libpoppler
REQUIRED_PACKAGES += library/libwebp
REQUIRED_PACKAGES += library/openexr
REQUIRED_PACKAGES += library/python/pygobject-27
REQUIRED_PACKAGES += library/python/pygtk2-27
REQUIRED_PACKAGES += library/zlib
@@ -101,8 +108,6 @@
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/fontconfig
REQUIRED_PACKAGES += system/library/freetype-2
REQUIRED_PACKAGES += system/library/libdbus
REQUIRED_PACKAGES += system/library/libdbus-glib
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += x11/library/libx11
REQUIRED_PACKAGES += x11/library/libxcursor

 components/image/gimp/gimp.p5m

Diff too large

 components/image/gimp/manifests/sample-manifest.p5m

Diff too large

 components/image/gimp/patches/01-menu-entry.patch

@@ -1,5 +1,5 @@
--- gimp-2.6.6/desktop/gimp.desktop.in.in.old    2009-04-27 16:35:45.492062000 +0800
+++ gimp-2.6.6/desktop/gimp.desktop.in.in    2009-04-27 16:39:09.991566000 +0800
--- gimp-2.10.20/desktop/gimp.desktop.in.in.~1~    2020-07-31 08:25:40.779668355 +0000
+++ gimp-2.10.20/desktop/gimp.desktop.in.in    2020-07-31 08:28:53.584594164 +0000
@@ -1,9 +1,11 @@
 [Desktop Entry]
 Version=1.0
@@ -11,6 +11,6 @@
-_Comment=Create images and edit photographs
+# SUN_BRANDING
+_Comment=Create, edit or convert images between standard graphics formats
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 _Keywords=GIMP;graphic;design;illustration;painting;
 Exec=@GIMP_COMMAND@ %U
 TryExec=gimp-@GIMP_APP_VERSION@
 Icon=gimp

 components/image/gimp/patches/02-branding.patch

New file
@@ -0,0 +1,13 @@
--- gimp-2.10.20/app/config/gimpguiconfig.h.1    2020-08-01 18:06:00.362870946 +0000
+++ gimp-2.10.20/app/config/gimpguiconfig.h    2020-08-01 18:07:10.806828257 +0000
@@ -24,8 +24,8 @@
 #include "config/gimpdisplayconfig.h"
 
 
-#define GIMP_CONFIG_DEFAULT_THEME          "Dark"
-#define GIMP_CONFIG_DEFAULT_ICON_THEME     "Symbolic"
+#define GIMP_CONFIG_DEFAULT_THEME          "System"
+#define GIMP_CONFIG_DEFAULT_ICON_THEME     "Legacy"
 
 
 #define GIMP_TYPE_GUI_CONFIG            (gimp_gui_config_get_type ())

 components/image/gimp/patches/02-py27.patch

File was deleted

 components/image/gimp/patches/03-atk.patch

File was deleted

 components/image/gimp/patches/05-CVE-2017-17784.patch

File was deleted

 components/image/gimp/patches/06-CVE-2017-17785.patch

File was deleted

 components/image/gimp/patches/07-CVE-2017-17786.patch

File was deleted

 components/image/gimp/patches/08-CVE-2017-17787.patch

File was deleted

 components/image/gimp/patches/09-CVE-2017-17788.patch

File was deleted

 components/image/gimp/patches/10-CVE-2017-17789.patch

File was deleted

 components/image/gimp/pkg5

@@ -1,23 +1,31 @@
{
    "dependencies": [
        "codec/jasper",
        "compress/bzip2",
        "compress/xz",
        "image/library/babl",
        "image/library/gegl",
        "image/library/libexif",
        "image/library/gexiv2",
        "image/library/libjpeg8-turbo",
        "image/library/libpng16",
        "image/library/librsvg",
        "image/library/libtiff",
        "image/library/openjpeg",
        "library/aalib",
        "library/c++/harfbuzz",
        "library/desktop/cairo",
        "library/desktop/gdk-pixbuf",
        "library/desktop/gtk2",
        "library/desktop/json-glib",
        "library/desktop/pango",
        "library/glib2",
        "library/graphics/libmng",
        "library/ilmbase",
        "library/lcms2",
        "library/libmypaint",
        "library/libpoppler",
        "library/libwebp",
        "library/mypaint-brushes",
        "library/openexr",
        "library/python/pygobject",
        "library/python/pygobject-27",
        "library/python/pygtk2",
@@ -29,8 +37,8 @@
        "system/library",
        "system/library/fontconfig",
        "system/library/freetype-2",
        "system/library/libdbus",
        "system/library/libdbus-glib",
        "system/library/g++-7-runtime",
        "system/library/gcc-7-runtime",
        "system/library/math",
        "x11/library/libx11",
        "x11/library/libxcursor",