* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2015-12-05 1:42 Sebastian Pipping
0 siblings, 0 replies; 8+ messages in thread
From: Sebastian Pipping @ 2015-12-05 1:42 UTC (permalink / raw
To: gentoo-commits
commit: bfa2ea1e5cda2965eb51f61ab0070a6508e50d74
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 5 01:35:28 2015 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Dec 5 01:42:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa2ea1e
media-gfx/gimp: 2.9.2 (bug #567366)
Package-Manager: portage-2.2.24
media-gfx/gimp/Manifest | 1 +
.../gimp/files/gimp-2.9.2-no-deprecation.patch | 50 +++++++
media-gfx/gimp/files/gimp-2.9.2-version.patch | 28 ++++
media-gfx/gimp/gimp-2.9.2.ebuild | 166 +++++++++++++++++++++
4 files changed, 245 insertions(+)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 66dc29e..3fe6b5b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
DIST gimp-2.8.10.tar.bz2 20343461 SHA256 e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 SHA512 21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 WHIRLPOOL 16b0a7e8a4197db41da29832977bee917e65d5cbbf308dde1ba73c150742c70c52cd60d449d0fd0269b0ed5db0378461d3277a2350898c3a5e07b1f3cf8bdf47
DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b
DIST gimp-2.8.16.tar.bz2 20847212 SHA256 95e3857bd0b5162cf8d1eda8c78b741eef968c3e3ac6c1195aaac2a4e2574fb7 SHA512 480b49a7fc7775aa924bf2e7a5a5165b94df1318fc8439faf2e4263dd26efbca9d1d8ccc5b9b52114c33d2363e087d5a364fab86077c27bc19e58383880b13fd WHIRLPOOL 26e8e26cea15a4689a2efbecbaf1425f0bb645b9cf4f380ad2047e52606bb8d5f64261cd12b40d603a86f0d5e253dffcac18990a461c601294931a3a87e1d334
+DIST gimp-2.9.2.tar.bz2 21370301 SHA256 85bed436b868b2e45ffab48d1bf5743006932770e8cca3322e345aefc000e29e SHA512 5c870a36d62de5fde0c7799dd28b78daca2d349bb7fdbc7b940db89ab00fc025256408b581ba6b4d795d6db9bc25672cf6a45552b22c3eae053ce94a2201fa37 WHIRLPOOL cfa5300659f97c75b7b4f4fbc6f3ad3d03a7c0e97153749d224859b8b618d041f8cbe9232578d720803589d8a48bc7ea9a785294991b626ba7b458512a3d4b2e
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
new file mode 100644
index 0000000..441298a
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
@@ -0,0 +1,50 @@
+From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 5 Dec 2015 01:14:37 +0100
+Subject: [PATCH] Do not disable deprecated APIs
+
+---
+ configure.ac | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4de6e53..8528e87 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;"
+ AC_SUBST(MIME_TYPES)
+
+
+-#########################
+-# Disable deprecated APIs
+-#########################
+-
+-CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+-
+-# Make sure not to disable deprecated APIs for unreleased versions.
+-# We must build without problems with future releases of libraries
+-# and disabling deprecated API risks breaking the build
+-
+-if test "x$have_glib_2_43" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gtk_2_26" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gdk_pixbuf_2_31" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_pango_1_32" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
+-fi
+-
+-
+ ############################
+ # Require multihead safe API
+ ############################
+--
+2.6.3
+
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch
new file mode 100644
index 0000000..e486144
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.2-version.patch
@@ -0,0 +1,28 @@
+From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 5 Dec 2015 01:15:22 +0100
+Subject: [PATCH] Sync version string
+
+.. with
+m4_define([gimp_micro_version], [2])
+above
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8528e87..21d86a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ m4_define([gimp_binary_age],
+ [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
+
+ # For overriding the version string. Comment out if not needed.
+-# m4_define([gimp_version], [2.9.1])
++# m4_define([gimp_version], [2.9.2])
+
+ # This is the X.Y used in -lgimp-X.Y
+ m4_define([gimp_api_version], [2.0])
+--
+2.6.3
+
diff --git a/media-gfx/gimp/gimp-2.9.2.ebuild b/media-gfx/gimp/gimp-2.9.2.ebuild
new file mode 100644
index 0000000..f04722f
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.9.2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
+
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+ >=dev-libs/atk-2.2.0
+ >=x11-libs/gtk+-2.24.10:2
+ dev-util/gtk-update-icon-cache
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/pango-1.29.4
+ xpm? ( x11-libs/libXpm )
+ >=media-libs/freetype-2.1.7
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/gexiv2-0.6.1
+ >=media-libs/fontconfig-2.2.0
+ sys-libs/zlib
+ dev-libs/libxml2
+ dev-libs/libxslt
+ x11-themes/hicolor-icon-theme
+ >=media-libs/babl-0.1.14
+ >=media-libs/gegl-0.3.4:0.3
+ >=dev-libs/glib-2.43
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ aqua? ( x11-libs/gtk-mac-integration )
+ dev-util/gdbus-codegen
+ gnome? ( gnome-base/gvfs )
+ webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
+ virtual/jpeg:0
+ jpeg2k? ( media-libs/jasper )
+ >=media-libs/lcms-2.2:2
+ mng? ( media-libs/libmng )
+ openexr? ( >=media-libs/openexr-1.6.1 )
+ pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
+ >=media-libs/libpng-1.2.37:0
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+ )
+ tiff? ( >=media-libs/tiff-3.5.7:0 )
+ svg? ( >=gnome-base/librsvg-2.36.0:2 )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ x11-libs/libXcursor
+ sys-libs/zlib
+ app-arch/bzip2
+ >=app-arch/xz-utils-5.0.0
+ postscript? ( app-text/ghostscript-gpl )
+ udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+ sys-apps/findutils
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19
+ doc? ( >=dev-util/gtk-doc-1 )
+ >=sys-devel/libtool-2.2
+ >=sys-devel/automake-1.11
+ dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ G2CONF="--enable-default-binary \
+ --disable-silent-rules \
+ $(use_with !aqua x) \
+ --without-libmypaint \
+ $(use_with aalib aa) \
+ $(use_with alsa) \
+ $(use_enable altivec) \
+ $(use_with webkit) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with postscript gs) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_with mng libmng) \
+ $(use_with openexr) \
+ $(use_with pdf poppler) \
+ $(use_enable python) \
+ $(use_enable smp mp) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with udev gudev) \
+ $(use_with wmf) \
+ --with-xmc \
+ $(use_with xpm libxpm) \
+ --without-xvfb-run"
+
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.9.2-version.patch
+ epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch # bug 395695, comment 9 and 16
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+ gnome2_src_prepare
+}
+
+_clean_up_locales() {
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+ done
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_optimize
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ prune_libtool_files --all
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ _clean_up_locales
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2016-07-18 16:18 Sebastian Pipping
0 siblings, 0 replies; 8+ messages in thread
From: Sebastian Pipping @ 2016-07-18 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 796494f92df70761e6fea2c25d6fb9161789265f
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 16:18:13 2016 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 16:18:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796494f9
media-gfx/gimp: 2.9.4
Package-Manager: portage-2.2.28
media-gfx/gimp/Manifest | 1 +
media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch | 28 +++++
media-gfx/gimp/gimp-2.9.4.ebuild | 168 +++++++++++++++++++++++++
3 files changed, 197 insertions(+)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1491b30..4ceead7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b
DIST gimp-2.8.16.tar.bz2 20847212 SHA256 95e3857bd0b5162cf8d1eda8c78b741eef968c3e3ac6c1195aaac2a4e2574fb7 SHA512 480b49a7fc7775aa924bf2e7a5a5165b94df1318fc8439faf2e4263dd26efbca9d1d8ccc5b9b52114c33d2363e087d5a364fab86077c27bc19e58383880b13fd WHIRLPOOL 26e8e26cea15a4689a2efbecbaf1425f0bb645b9cf4f380ad2047e52606bb8d5f64261cd12b40d603a86f0d5e253dffcac18990a461c601294931a3a87e1d334
DIST gimp-2.9.2.tar.bz2 21370301 SHA256 85bed436b868b2e45ffab48d1bf5743006932770e8cca3322e345aefc000e29e SHA512 5c870a36d62de5fde0c7799dd28b78daca2d349bb7fdbc7b940db89ab00fc025256408b581ba6b4d795d6db9bc25672cf6a45552b22c3eae053ce94a2201fa37 WHIRLPOOL cfa5300659f97c75b7b4f4fbc6f3ad3d03a7c0e97153749d224859b8b618d041f8cbe9232578d720803589d8a48bc7ea9a785294991b626ba7b458512a3d4b2e
+DIST gimp-2.9.4.tar.bz2 24290911 SHA256 c13ac540fd0bd566d7bdd404afe8a04ec0cb1e547788995cd4e8b218c1057b8a SHA512 fb7e4bb08a3e3a87948bfeb4688d624ff8f9e452a1cd27b583bf40cda1a176b44d7d1dca6cfb52fbd930a728ab5550a1fa74730cc1dd1e7f7f8b9cb131e0f434 WHIRLPOOL 9c073f3a30f43bd36f7377b70037f09a74c033ff591b6fff06cd6cb91ca8b44109d4c6b67248c4b75715900f8f3108bc3f32c8a54ae9ca9caac9054711cac415
diff --git a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch b/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
new file mode 100644
index 0000000..31057b5
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
@@ -0,0 +1,28 @@
+From 8d5de5ce62cd0410c9bccaa77725d0cad051faad Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 18 Jul 2016 17:42:45 +0200
+Subject: [PATCH] Fix gegl executable name to check for
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 45b31b1..0e5be99 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -674,9 +674,9 @@ else
+ fi
+ AC_MSG_RESULT($have_glib_2_43)
+
+-AC_PATH_PROG(GEGL, gegl, no)
++AC_PATH_PROG(GEGL, gegl-0.3, no)
+ if test "x$GEGL" = xno; then
+- add_deps_error([gegl], [Could not find gegl in your PATH.])
++ add_deps_error([gegl], [Could not find gegl-0.3 in your PATH.])
+ fi
+
+
+--
+2.9.2
+
diff --git a/media-gfx/gimp/gimp-2.9.4.ebuild b/media-gfx/gimp/gimp-2.9.4.ebuild
new file mode 100644
index 0000000..6a177a1
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.9.4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg udev webkit wmf xpm"
+
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+ >=dev-libs/atk-2.2.0
+ >=x11-libs/gtk+-2.24.10:2
+ dev-util/gtk-update-icon-cache
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/pango-1.29.4
+ xpm? ( x11-libs/libXpm )
+ >=media-libs/freetype-2.1.7
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/gexiv2-0.6.1
+ >=media-libs/libmypaint-1.3.0_beta0[gegl]
+ >=media-libs/fontconfig-2.2.0
+ sys-libs/zlib
+ dev-libs/libxml2
+ dev-libs/libxslt
+ x11-themes/hicolor-icon-theme
+ >=media-libs/babl-0.1.18
+ >=media-libs/gegl-0.3.8:0.3[cairo]
+ >=dev-libs/glib-2.43
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ aqua? ( x11-libs/gtk-mac-integration )
+ dev-util/gdbus-codegen
+ gnome? ( gnome-base/gvfs )
+ webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
+ virtual/jpeg:0
+ jpeg2k? ( media-libs/jasper )
+ >=media-libs/lcms-2.2:2
+ mng? ( media-libs/libmng )
+ openexr? ( >=media-libs/openexr-1.6.1 )
+ pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
+ >=media-libs/libpng-1.2.37:0
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+ >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+ )
+ >=media-libs/tiff-3.5.7:0
+ svg? ( >=gnome-base/librsvg-2.36.0:2 )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ x11-libs/libXcursor
+ sys-libs/zlib
+ app-arch/bzip2
+ >=app-arch/xz-utils-5.0.0
+ postscript? ( app-text/ghostscript-gpl )
+ udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+ sys-apps/findutils
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19
+ doc? ( >=dev-util/gtk-doc-1 )
+ >=sys-devel/libtool-2.2
+ >=sys-devel/automake-1.11
+ dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ G2CONF="--enable-default-binary \
+ --disable-silent-rules \
+ $(use_with !aqua x) \
+ $(use_with aalib aa) \
+ $(use_with alsa) \
+ $(use_enable altivec) \
+ $(use_with webkit) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with postscript gs) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_with mng libmng) \
+ $(use_with openexr) \
+ $(use_with pdf poppler) \
+ $(use_enable python) \
+ $(use_enable smp mp) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with udev gudev) \
+ $(use_with wmf) \
+ --with-xmc \
+ $(use_with xpm libxpm) \
+ --without-xvfb-run"
+
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch # bug 395695, comment 9 and 16
+ epatch "${FILESDIR}"/${PN}-2.9.4-gegl-bin.patch
+
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+ gnome2_src_prepare
+}
+
+_clean_up_locales() {
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+ done
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_optimize
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ prune_libtool_files --all
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ _clean_up_locales
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2018-01-03 3:21 Sebastian Pipping
0 siblings, 0 replies; 8+ messages in thread
From: Sebastian Pipping @ 2018-01-03 3:21 UTC (permalink / raw
To: gentoo-commits
commit: c0f2d036a569a8a7d5dca3f17ab8c2f952b8cce6
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 03:15:03 2018 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 03:15:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f2d036
media-gfx/gimp: CVE-2017-17784 to CVE-2017-17789
Package-Manager: Portage-2.3.16, Repoman-2.3.6
.../gimp/files/gimp-2.8.22-cve-2017-17784.patch | 32 ++++
.../gimp/files/gimp-2.8.22-cve-2017-17785.patch | 161 ++++++++++++++++
.../gimp/files/gimp-2.8.22-cve-2017-17786-1.patch | 53 ++++++
.../gimp/files/gimp-2.8.22-cve-2017-17786-2.patch | 31 ++++
.../gimp/files/gimp-2.8.22-cve-2017-17787.patch | 33 ++++
.../gimp/files/gimp-2.8.22-cve-2017-17788.patch | 29 +++
.../gimp/files/gimp-2.8.22-cve-2017-17789.patch | 38 ++++
.../gimp/files/gimp-2.9.8-cve-2017-17784.patch | 30 +++
media-gfx/gimp/gimp-2.8.22-r1.ebuild | 176 ++++++++++++++++++
media-gfx/gimp/gimp-2.9.8-r1.ebuild | 205 +++++++++++++++++++++
10 files changed, 788 insertions(+)
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
new file mode 100644
index 00000000000..c7df330409f
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
@@ -0,0 +1,32 @@
+From c57f9dcf1934a9ab0cd67650f2dea18cb0902270 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Thu, 21 Dec 2017 12:25:32 +0100
+Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
+ load_image.
+
+We were assuming the input name was well formed, hence was
+nul-terminated. As any data coming from external input, this has to be
+thorougly checked.
+Similar to commit 06d24a79af94837d615d0024916bb95a01bf3c59 but adapted
+to older gimp-2-8 code.
+---
+ plug-ins/common/file-gbr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
+index b028100..d3f01d9 100644
+--- a/plug-ins/common/file-gbr.c
++++ b/plug-ins/common/file-gbr.c
+@@ -443,7 +443,8 @@ load_image (const gchar *filename,
+ {
+ gchar *temp = g_new (gchar, bn_size);
+
+- if ((read (fd, temp, bn_size)) < bn_size)
++ if ((read (fd, temp, bn_size)) < bn_size ||
++ temp[bn_size - 1] != '\0')
+ {
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Error in GIMP brush file '%s'"),
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
new file mode 100644
index 00000000000..1f77d36ec6c
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
@@ -0,0 +1,161 @@
+From 1882bac996a20ab5c15c42b0c5e8f49033a1af54 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Sun, 29 Oct 2017 15:19:41 +0100
+Subject: Bug 739133 - (CVE-2017-17785) Heap overflow while parsing FLI files.
+
+It is possible to trigger a heap overflow while parsing FLI files. The
+RLE decoder is vulnerable to out of boundary writes due to lack of
+boundary checks.
+
+The variable "framebuf" points to a memory area which was allocated
+with fli_header->width * fli_header->height bytes. The RLE decoder
+therefore must never write beyond that limit.
+
+If an illegal frame is detected, the parser won't stop, which means
+that the next valid sequence is properly parsed again. This should
+allow GIMP to parse FLI files as good as possible even if they are
+broken by an attacker or by accident.
+
+While at it, I changed the variable xc to be of type size_t, because
+the multiplication of width and height could overflow a 16 bit type.
+
+Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
+(cherry picked from commit edb251a7ef1602d20a5afcbf23f24afb163de63b)
+---
+ plug-ins/file-fli/fli.c | 50 ++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 35 insertions(+), 15 deletions(-)
+
+diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
+index 313efeb..ffb651e 100644
+--- a/plug-ins/file-fli/fli.c
++++ b/plug-ins/file-fli/fli.c
+@@ -25,6 +25,8 @@
+
+ #include "config.h"
+
++#include <glib/gstdio.h>
++
+ #include <string.h>
+ #include <stdio.h>
+
+@@ -461,23 +463,27 @@ void fli_read_brun(FILE *f, s_fli_header *fli_header, unsigned char *framebuf)
+ unsigned short yc;
+ unsigned char *pos;
+ for (yc=0; yc < fli_header->height; yc++) {
+- unsigned short xc, pc, pcnt;
++ unsigned short pc, pcnt;
++ size_t n, xc;
+ pc=fli_read_char(f);
+ xc=0;
+ pos=framebuf+(fli_header->width * yc);
++ n=(size_t)fli_header->width * (fli_header->height-yc);
+ for (pcnt=pc; pcnt>0; pcnt--) {
+ unsigned short ps;
+ ps=fli_read_char(f);
+ if (ps & 0x80) {
+ unsigned short len;
+- for (len=-(signed char)ps; len>0; len--) {
++ for (len=-(signed char)ps; len>0 && xc<n; len--) {
+ pos[xc++]=fli_read_char(f);
+ }
+ } else {
+ unsigned char val;
++ size_t len;
++ len=MIN(n-xc,ps);
+ val=fli_read_char(f);
+- memset(&(pos[xc]), val, ps);
+- xc+=ps;
++ memset(&(pos[xc]), val, len);
++ xc+=len;
+ }
+ }
+ }
+@@ -564,25 +570,34 @@ void fli_read_lc(FILE *f, s_fli_header *fli_header, unsigned char *old_framebuf,
+ memcpy(framebuf, old_framebuf, fli_header->width * fli_header->height);
+ firstline = fli_read_short(f);
+ numline = fli_read_short(f);
++ if (numline > fli_header->height || fli_header->height-numline < firstline)
++ return;
++
+ for (yc=0; yc < numline; yc++) {
+- unsigned short xc, pc, pcnt;
++ unsigned short pc, pcnt;
++ size_t n, xc;
+ pc=fli_read_char(f);
+ xc=0;
+ pos=framebuf+(fli_header->width * (firstline+yc));
++ n=(size_t)fli_header->width * (fli_header->height-firstline-yc);
+ for (pcnt=pc; pcnt>0; pcnt--) {
+ unsigned short ps,skip;
+ skip=fli_read_char(f);
+ ps=fli_read_char(f);
+- xc+=skip;
++ xc+=MIN(n-xc,skip);
+ if (ps & 0x80) {
+ unsigned char val;
++ size_t len;
+ ps=-(signed char)ps;
+ val=fli_read_char(f);
+- memset(&(pos[xc]), val, ps);
+- xc+=ps;
++ len=MIN(n-xc,ps);
++ memset(&(pos[xc]), val, len);
++ xc+=len;
+ } else {
+- fread(&(pos[xc]), ps, 1, f);
+- xc+=ps;
++ size_t len;
++ len=MIN(n-xc,ps);
++ fread(&(pos[xc]), len, 1, f);
++ xc+=len;
+ }
+ }
+ }
+@@ -689,7 +704,8 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
+ yc=0;
+ numline = fli_read_short(f);
+ for (lc=0; lc < numline; lc++) {
+- unsigned short xc, pc, pcnt, lpf, lpn;
++ unsigned short pc, pcnt, lpf, lpn;
++ size_t n, xc;
+ pc=fli_read_short(f);
+ lpf=0; lpn=0;
+ while (pc & 0x8000) {
+@@ -700,26 +716,30 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
+ }
+ pc=fli_read_short(f);
+ }
++ yc=MIN(yc, fli_header->height);
+ xc=0;
+ pos=framebuf+(fli_header->width * yc);
++ n=(size_t)fli_header->width * (fli_header->height-yc);
+ for (pcnt=pc; pcnt>0; pcnt--) {
+ unsigned short ps,skip;
+ skip=fli_read_char(f);
+ ps=fli_read_char(f);
+- xc+=skip;
++ xc+=MIN(n-xc,skip);
+ if (ps & 0x80) {
+ unsigned char v1,v2;
+ ps=-(signed char)ps;
+ v1=fli_read_char(f);
+ v2=fli_read_char(f);
+- while (ps>0) {
++ while (ps>0 && xc+1<n) {
+ pos[xc++]=v1;
+ pos[xc++]=v2;
+ ps--;
+ }
+ } else {
+- fread(&(pos[xc]), ps, 2, f);
+- xc+=ps << 1;
++ size_t len;
++ len=MIN((n-xc)/2,ps);
++ fread(&(pos[xc]), len, 2, f);
++ xc+=len << 1;
+ }
+ }
+ if (lpf) pos[xc]=lpn;
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
new file mode 100644
index 00000000000..4047f7cb3c9
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
@@ -0,0 +1,53 @@
+From ef9c821fff8b637a2178eab1c78cae6764c50e12 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Wed, 20 Dec 2017 13:02:38 +0100
+Subject: Bug 739134 - (CVE-2017-17786) Out of bounds read / heap overflow
+ in...
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+... TGA importer.
+
+Be more thorough on valid TGA RGB and RGBA images.
+In particular current TGA plug-in can import RGBA as 32 bits (8 bits per
+channel) and 16 bits (5 bits per color channel and 1 bit for alpha), and
+RGB as 15 and 24 bits.
+Maybe there exist more variants, but if they do exist, we simply don't
+support them yet.
+
+Thanks to Hanno Böck for the report and a first patch attempt.
+
+(cherry picked from commit 674b62ad45b6579ec6d7923dc3cb1ef4e8b5498b)
+---
+ plug-ins/common/file-tga.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
+index aef9870..426acc2 100644
+--- a/plug-ins/common/file-tga.c
++++ b/plug-ins/common/file-tga.c
+@@ -564,12 +564,16 @@ load_image (const gchar *filename,
+ }
+ break;
+ case TGA_TYPE_COLOR:
+- if (info.bpp != 15 && info.bpp != 16 &&
+- info.bpp != 24 && info.bpp != 32)
++ if ((info.bpp != 15 && info.bpp != 16 &&
++ info.bpp != 24 && info.bpp != 32) ||
++ ((info.bpp == 15 || info.bpp == 24) &&
++ info.alphaBits != 0) ||
++ (info.bpp == 16 && info.alphaBits != 1) ||
++ (info.bpp == 32 && info.alphaBits != 8))
+ {
+- g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
++ g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
+ gimp_filename_to_utf8 (filename),
+- info.imageType, info.bpp);
++ info.imageType, info.bpp, info.alphaBits);
+ return -1;
+ }
+ break;
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
new file mode 100644
index 00000000000..7177dd3c1f1
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
@@ -0,0 +1,31 @@
+From 22e2571c25425f225abdb11a566cc281fca6f366 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Wed, 20 Dec 2017 13:26:26 +0100
+Subject: plug-ins: TGA 16-bit RGB (without alpha bit) is also valid.
+
+According to some spec on the web, 16-bit RGB is also valid. In this
+case, the last bit is simply ignored (at least that's how it is
+implemented right now).
+
+(cherry picked from commit 8ea316667c8a3296bce2832b3986b58d0fdfc077)
+---
+ plug-ins/common/file-tga.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
+index 426acc2..eb14a1d 100644
+--- a/plug-ins/common/file-tga.c
++++ b/plug-ins/common/file-tga.c
+@@ -568,7 +568,8 @@ load_image (const gchar *filename,
+ info.bpp != 24 && info.bpp != 32) ||
+ ((info.bpp == 15 || info.bpp == 24) &&
+ info.alphaBits != 0) ||
+- (info.bpp == 16 && info.alphaBits != 1) ||
++ (info.bpp == 16 && info.alphaBits != 1 &&
++ info.alphaBits != 0) ||
+ (info.bpp == 32 && info.alphaBits != 8))
+ {
+ g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
new file mode 100644
index 00000000000..654726388ea
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
@@ -0,0 +1,33 @@
+From 87ba505fff85989af795f4ab6a047713f4d9381d Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Thu, 21 Dec 2017 12:49:41 +0100
+Subject: Bug 790853 - (CVE-2017-17787) heap overread in psp importer.
+
+As any external data, we have to check that strings being read at fixed
+length are properly nul-terminated.
+
+(cherry picked from commit eb2980683e6472aff35a3117587c4f814515c74d)
+---
+ plug-ins/common/file-psp.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
+index 4cbafe3..e350e4d 100644
+--- a/plug-ins/common/file-psp.c
++++ b/plug-ins/common/file-psp.c
+@@ -890,6 +890,12 @@ read_creator_block (FILE *f,
+ g_free (string);
+ return -1;
+ }
++ if (string[length - 1] != '\0')
++ {
++ g_message ("Creator keyword data not nul-terminated");
++ g_free (string);
++ return -1;
++ }
+ switch (keyword)
+ {
+ case PSP_CRTR_FLD_TITLE:
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
new file mode 100644
index 00000000000..2bf16b85e60
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
@@ -0,0 +1,29 @@
+From: Hanno Boeck <hanno@hboeck.de>
+Date: Mon, 27 Nov 2017 00:37:29 +0100
+Subject: 790783 - buffer overread in XCF parser if version field...
+Origin: https://git.gnome.org/browse/GIMP/commit/?id=702c4227e8b6169f781e4bb5ae4b5733f51ab126
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17788
+Bug-Debian: https://bugs.debian.org/885347
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=790783
+
+...has no null terminator
+
+Check for the presence of '\0' before using atoi() on the version
+string. Patch slightly modified (mitch).
+[carnil: backport to gimp-2-8: affected code in xcf_load_invoker]
+---
+ app/xcf/xcf.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/app/xcf/xcf.c
++++ b/app/xcf/xcf.c
+@@ -318,7 +318,8 @@ xcf_load_invoker (GimpProcedure *pr
+ {
+ info.file_version = 0;
+ }
+- else if (id[9] == 'v')
++ else if (id[9] == 'v' &&
++ id[13] == '\0')
+ {
+ info.file_version = atoi (id + 10);
+ }
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
new file mode 100644
index 00000000000..3d63694f679
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
@@ -0,0 +1,38 @@
+From 01898f10f87a094665a7fdcf7153990f4e511d3f Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Wed, 20 Dec 2017 16:44:20 +0100
+Subject: Bug 790849 - (CVE-2017-17789) CVE-2017-17789 Heap buffer overflow...
+
+... in PSP importer.
+Check if declared block length is valid (i.e. within the actual file)
+before going further.
+Consider the file as broken otherwise and fail loading it.
+
+(cherry picked from commit 28e95fbeb5720e6005a088fa811f5bf3c1af48b8)
+---
+ plug-ins/common/file-psp.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
+index ac0fff7..4cbafe3 100644
+--- a/plug-ins/common/file-psp.c
++++ b/plug-ins/common/file-psp.c
+@@ -1771,6 +1771,15 @@ load_image (const gchar *filename,
+ {
+ block_start = ftell (f);
+
++ if (block_start + block_total_len > st.st_size)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("Could not open '%s' for reading: %s"),
++ gimp_filename_to_utf8 (filename),
++ _("invalid block size"));
++ goto error;
++ }
++
+ if (id == PSP_IMAGE_BLOCK)
+ {
+ if (block_number != 0)
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
new file mode 100644
index 00000000000..e46703d3d3d
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
@@ -0,0 +1,30 @@
+From 06d24a79af94837d615d0024916bb95a01bf3c59 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Thu, 21 Dec 2017 12:15:34 +0100
+Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
+ load_image.
+
+We were assuming the input name was well formed, hence was
+nul-terminated. As any data coming from external input, this has to be
+thorougly checked.
+---
+ plug-ins/common/file-gbr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
+index b8933e7..585e74a 100644
+--- a/plug-ins/common/file-gbr.c
++++ b/plug-ins/common/file-gbr.c
+@@ -456,7 +456,8 @@ load_image (GFile *file,
+
+ if (! g_input_stream_read_all (input, temp, size,
+ &bytes_read, NULL, error) ||
+- bytes_read != size)
++ bytes_read != size ||
++ temp[size - 1] != '\0')
+ {
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Error in GIMP brush file '%s'"),
+--
+cgit v0.12
+
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
new file mode 100644
index 00000000000..afa66f12019
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
+
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+ >=dev-libs/atk-2.2.0
+ >=x11-libs/gtk+-2.24.10:2
+ >=x11-libs/gdk-pixbuf-2.24.1:2
+ >=x11-libs/cairo-1.10.2
+ >=x11-libs/pango-1.29.4
+ xpm? ( x11-libs/libXpm )
+ >=media-libs/freetype-2.1.7
+ >=media-libs/fontconfig-2.2.0
+ sys-libs/zlib
+ dev-libs/libxml2
+ dev-libs/libxslt
+ x11-themes/hicolor-icon-theme
+ >=media-libs/babl-0.1.10
+ >=media-libs/gegl-0.2.0:0
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ aqua? ( x11-libs/gtk-mac-integration )
+ curl? ( net-misc/curl )
+ dbus? ( dev-libs/dbus-glib )
+ gnome? ( gnome-base/gvfs )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper:= )
+ exif? ( >=media-libs/libexif-0.6.15 )
+ lcms? ( >=media-libs/lcms-2.2:2 )
+ mng? ( media-libs/libmng )
+ pdf? ( >=app-text/poppler-0.12.4[cairo] )
+ png? ( >=media-libs/libpng-1.2.37:0 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+ )
+ tiff? ( >=media-libs/tiff-3.5.7:0 )
+ svg? ( >=gnome-base/librsvg-2.36.0:2 )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ x11-libs/libXcursor
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ postscript? ( app-text/ghostscript-gpl )
+ udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+ sys-apps/findutils
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19
+ doc? ( >=dev-util/gtk-doc-1 )
+ >=sys-devel/libtool-2.2
+ >=sys-devel/automake-1.11
+ dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ G2CONF="--enable-default-binary \
+ --disable-silent-rules \
+ $(use_with !aqua x) \
+ $(use_with aalib aa) \
+ $(use_with alsa) \
+ $(use_enable altivec) \
+ $(use_with bzip2) \
+ $(use_with curl libcurl) \
+ $(use_with dbus) \
+ $(use_with gnome gvfs) \
+ --without-webkit \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with exif libexif) \
+ $(use_with lcms lcms lcms2) \
+ $(use_with postscript gs) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_with mng libmng) \
+ $(use_with pdf poppler) \
+ $(use_with png libpng) \
+ $(use_enable python) \
+ $(use_enable smp mp) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with udev gudev) \
+ $(use_with wmf) \
+ --with-xmc \
+ $(use_with xpm libxpm) \
+ --without-xvfb-run"
+
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954
+ epatch "${FILESDIR}"/${P}-cve-2017-17785.patch # bug 641954
+ epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch # bug 641954
+ epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch # bug 641954
+ epatch "${FILESDIR}"/${P}-cve-2017-17787.patch # bug 641954
+ epatch "${FILESDIR}"/${P}-cve-2017-17788.patch # bug 641954
+ epatch "${FILESDIR}"/${P}-cve-2017-17789.patch # bug 641954
+
+ epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch # bug 558878
+ epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16
+ epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
+
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+ gnome2_src_prepare
+}
+
+_clean_up_locales() {
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+ done
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_optimize
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ prune_libtool_files --all
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ _clean_up_locales
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
new file mode 100644
index 00000000000..76986e47e6e
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.40.0:2
+ >=dev-libs/atk-2.2.0
+ >=x11-libs/gtk+-2.24.10:2
+ dev-util/gtk-update-icon-cache
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/pango-1.29.4
+ xpm? ( x11-libs/libXpm )
+ >=media-libs/freetype-2.1.7
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/gexiv2-0.10.6
+ >=media-libs/libmypaint-1.3.0[gegl]
+ >=media-libs/fontconfig-2.2.0
+ sys-libs/zlib
+ dev-libs/libxml2
+ dev-libs/libxslt
+ x11-themes/hicolor-icon-theme
+ >=media-libs/babl-0.1.38
+ >=media-libs/gegl-0.3.24:0.3[cairo]
+ >=dev-libs/glib-2.43
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ aqua? ( x11-libs/gtk-mac-integration )
+ gnome? ( gnome-base/gvfs )
+ virtual/jpeg:0
+ jpeg2k? ( media-libs/jasper:= )
+ >=media-libs/lcms-2.8:2
+ mng? ( media-libs/libmng )
+ openexr? ( >=media-libs/openexr-1.6.1 )
+ pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
+ >=media-libs/libpng-1.6.25:0
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+ >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+ )
+ >=media-libs/tiff-3.5.7:0
+ >=gnome-base/librsvg-2.40.6:2
+ webp? ( >=media-libs/libwebp-0.6.0 )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ net-libs/glib-networking[ssl]
+ x11-libs/libXcursor
+ sys-libs/zlib
+ app-arch/bzip2
+ >=app-arch/xz-utils-5.0.0
+ postscript? ( app-text/ghostscript-gpl )
+ udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5.10.0
+ dev-libs/appstream-glib
+ sys-apps/findutils
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19
+ doc? ( >=dev-util/gtk-doc-1 )
+ >=sys-devel/libtool-2.2
+ >=sys-devel/automake-1.11
+ dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954
+ epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch # bug 641954
+ epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch # bug 641954
+ epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch # bug 641954
+ epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch # bug 641954
+ # NOTE: CVE-2017-17788 already fixed upstream
+ epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch # bug 641954
+
+ eapply_user
+
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+ eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+ gnome2_src_prepare
+
+ sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+ fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+src_configure() {
+ local myconf=(
+ GEGL=${EPREFIX}/usr/bin/gegl-0.3
+ GDBUS_CODEGEN=${EPREFIX}/bin/false
+
+ --enable-default-binary
+ --disable-silent-rules
+
+ $(use_with !aqua x)
+ $(use_with aalib aa)
+ $(use_with alsa)
+ $(use_enable altivec)
+ --with-appdata-test
+ --without-webkit
+ $(use_with jpeg2k libjasper)
+ $(use_with postscript gs)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_with mng libmng)
+ $(use_with openexr)
+ $(use_with webp)
+ $(use_with pdf poppler)
+ $(use_enable python)
+ $(use_enable smp mp)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_with udev gudev)
+ $(use_with wmf)
+ --with-xmc
+ $(use_with xpm libxpm)
+ $(use_enable vector-icons)
+ --without-xvfb-run
+ )
+
+ gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+ # Bugs #569738 and #591214
+ local nv
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+ # We do not check for existence as they may show up later
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+ addwrite "${nv}"
+ done
+ addwrite /dev/dri/ # bug #574038
+ addwrite /dev/ati/ # bug 589198
+ addwrite /proc/mtrr # bug 589198
+
+ export XDG_DATA_DIRS=${EPREFIX}/usr/share # bug 587004
+ gnome2_src_compile
+}
+
+_clean_up_locales() {
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+ done
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_optimize
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ prune_libtool_files --all
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ _clean_up_locales
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2019-12-01 3:18 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-12-01 3:18 UTC (permalink / raw
To: gentoo-commits
commit: c10f0b62bc6c5391b2943028fc073ce837d071aa
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Nov 16 01:29:29 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 03:15:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10f0b62
media-gfx/gimp: 2.10.14 version bump
The patch from this commit resolves two issues mentioned below.
They both could be closed after the 2.10.{10,12} revision bump
with addition of "gimp-2.10_fix_test-appdata.patch".
Bug: https://bugs.gentoo.org/685210
Bug: https://bugs.gentoo.org/691070
Closes: https://bugs.gentoo.org/699064
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/gimp/Manifest | 1 +
.../gimp/files/gimp-2.10_fix_test-appdata.patch | 14 ++
media-gfx/gimp/gimp-2.10.14.ebuild | 224 +++++++++++++++++++++
3 files changed, 239 insertions(+)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 66dd90d4dc5..a767a47d51d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,6 @@
DIST gimp-2.10.10.tar.bz2 32408724 BLAKE2B 7d4f06d255d7b853f08c2a8bd9695b5cbc27a417f2f78aab56c970675430534b7c6f870168c5555369b873971b4ca3889565085cfc0cb9b2e1bb60c3bfe938bd SHA512 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172
DIST gimp-2.10.12.tar.bz2 32614932 BLAKE2B 93e0c6c3ac58335920a9ebcfa81c970f0c657757860ab255e8a584ec2fa0c4d97c639797419eef58d5ef076797f2437eade20c1dea02c18bcbd8bd0fb30a8069 SHA512 dd4af3f0fa6fca815d254b7f42aeff15412c38294f1f5bd491563e2b597fcb868e6adff9001b196a68e01cf49bde61cbb153b662b8da1aa1b4b1f7285879659f
+DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch
new file mode 100644
index 00000000000..77b7b2f3cbd
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch
@@ -0,0 +1,14 @@
+diff -Nur a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in
+--- a/desktop/test-appdata.sh.in 2019-04-07 14:38:14.000000000 +0300
++++ b/desktop/test-appdata.sh.in 2019-11-06 23:19:32.000000000 +0300
+@@ -2,8 +2,8 @@
+
+ # TODO: use validate-strict when the last errors for a strict validation
+ # are fixed.
+-appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
+-appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
++appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
++appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
+ if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then
+ grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml
+ if [ $? = 0 ]; then
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild
new file mode 100644
index 00000000000..0217d66c15c
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.14.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools gnome2 python-single-r1 virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ app-arch/bzip2
+ >=app-arch/xz-utils-5.0.0
+ >=app-text/poppler-0.50[cairo]
+ >=app-text/poppler-data-0.4.7
+ >=dev-libs/atk-2.2.0
+ >=dev-libs/glib-2.56.0:2
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.40.6:2
+ >=media-gfx/mypaint-brushes-1.3.0
+ >=media-libs/babl-0.1.72
+ >=media-libs/fontconfig-2.12.4
+ >=media-libs/freetype-2.1.7
+ >=media-libs/gegl-0.4.18:0.4[cairo]
+ >=media-libs/gexiv2-0.10.6
+ >=media-libs/harfbuzz-0.9.19
+ >=media-libs/lcms-2.8:2
+ >=media-libs/libmypaint-1.3.0:=
+ >=media-libs/libpng-1.6.25:0=
+ >=media-libs/tiff-3.5.7:0
+ net-libs/glib-networking[ssl]
+ sys-libs/zlib
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/gtk+-2.24.32:2
+ x11-libs/libXcursor
+ >=x11-libs/pango-1.29.4
+ aalib? ( media-libs/aalib )
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+ heif? ( >=media-libs/libheif-1.3.2:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ postscript? ( app-text/ghostscript-gpl )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+ )
+ udev? ( dev-libs/libgudev:= )
+ unwind? ( >=sys-libs/libunwind-1.1.0:= )
+ webp? ( >=media-libs/libwebp-0.6.0:= )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-themes/hicolor-icon-theme
+ gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ >=dev-lang/perl-5.10.0
+ dev-libs/appstream-glib
+ dev-util/gtk-update-icon-cache
+ >=dev-util/intltool-0.40.1
+ sys-apps/findutils
+ >=sys-devel/automake-1.11
+ >=sys-devel/gettext-0.19
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+ gnome2_src_prepare # calls eautoreconf
+
+ sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+ fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+_adjust_sandbox() {
+ # Bugs #569738 and #591214
+ local nv
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+ # We do not check for existence as they may show up later
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+ addwrite "${nv}"
+ done
+
+ addwrite /dev/dri/ # bugs #574038 and #684886
+ addwrite /dev/ati/ # bug #589198
+ addwrite /proc/mtrr # bug #589198
+}
+
+src_configure() {
+ _adjust_sandbox
+
+ local myconf=(
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+ --enable-default-binary
+
+ --enable-mp
+ --with-appdata-test
+ --with-bug-report-url=https://bugs.gentoo.org/
+ --with-xmc
+ --without-libbacktrace
+ --without-webkit
+ --without-xvfb-run
+ $(use_enable altivec)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable python)
+ $(use_enable vector-icons)
+ $(use_with aalib aa)
+ $(use_with alsa)
+ $(use_with !aqua x)
+ $(use_with heif libheif)
+ $(use_with jpeg2k jpeg2000)
+ $(use_with mng libmng)
+ $(use_with openexr)
+ $(use_with postscript gs)
+ $(use_with udev gudev)
+ $(use_with unwind libunwind)
+ $(use_with webp)
+ $(use_with wmf)
+ $(use_with xpm libxpm)
+ )
+
+ gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
+ gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+ einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+ local prepend=gimp-org-
+ (
+ cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+ for plugin_slash in $(ls -d1 */); do
+ plugin=${plugin_slash%/}
+ if [[ -f ${plugin}/${plugin} ]]; then
+ # NOTE: Folder and file name need to match for Gimp to load that plug-in
+ # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+ mv ${plugin}/{,${prepend}}${plugin} || exit 1
+ mv {,${prepend}}${plugin} || exit 1
+ fi
+ done
+ )
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_optimize
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ find "${D}" -name '*.la' -type f -delete || die
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(get_version_component_range 1-2)
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ # Remove gimp devel-docs html files if user doesn't need it
+ if ! use doc; then
+ rm -r "${ED%/}"/usr/share/gtk-doc || die
+ fi
+
+ _rename_plugins || die
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2020-08-22 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-08-22 16:07 UTC (permalink / raw
To: gentoo-commits
commit: d9c0647ef9ae9f3837fe4be808b9e6e09a3b0371
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 11:12:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 16:06:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c0647e
media-gfx/gimp: Drop 2.8.22-r2 and 2.9.8-r1
Effectively dropping to ~ppc.
Bug: https://bugs.gentoo.org/685624
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/gimp/Manifest | 2 -
.../gimp/files/gimp-2.7.4-no-deprecation.patch | 36 ----
media-gfx/gimp/files/gimp-2.8.10-clang.patch | 204 --------------------
.../gimp/files/gimp-2.8.14-blend-center.patch | 30 ---
.../gimp/files/gimp-2.8.22-cve-2017-17784.patch | 32 ----
.../gimp/files/gimp-2.8.22-cve-2017-17785.patch | 161 ----------------
.../gimp/files/gimp-2.8.22-cve-2017-17786-1.patch | 53 ------
.../gimp/files/gimp-2.8.22-cve-2017-17786-2.patch | 31 ----
.../gimp/files/gimp-2.8.22-cve-2017-17787.patch | 33 ----
.../gimp/files/gimp-2.8.22-cve-2017-17788.patch | 29 ---
.../gimp/files/gimp-2.8.22-cve-2017-17789.patch | 38 ----
.../gimp/files/gimp-2.9.8-cve-2017-17784.patch | 30 ---
media-gfx/gimp/gimp-2.8.22-r2.ebuild | 173 -----------------
media-gfx/gimp/gimp-2.9.8-r1.ebuild | 205 ---------------------
media-gfx/gimp/metadata.xml | 11 +-
15 files changed, 2 insertions(+), 1066 deletions(-)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 28ee9093337..06c48a73c14 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,3 @@
DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
-DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
-DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
diff --git a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
deleted file mode 100644
index 66bd93d0d1a..00000000000
--- a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.ac 2012-01-02 13:15:53.695067626 +0100
-+++ configure.ac 2012-01-02 13:21:49.161623684 +0100
-@@ -1943,33 +1943,6 @@
- AC_SUBST(MIME_TYPES)
-
-
--#########################
--# Disable deprecated APIs
--#########################
--
--CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
--
--# Make sure not to disable deprecated APIs for unreleased versions.
--# We must build without problems with future releases of libraries
--# and disabling deprecated API risks breaking the build
--
--if test "x$have_glib_2_31" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gtk_2_26" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gdk_pixbuf_2_26" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_pango_1_32" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
--fi
--
--
- ############################
- # Require multihead safe API
- ############################
diff --git a/media-gfx/gimp/files/gimp-2.8.10-clang.patch b/media-gfx/gimp/files/gimp-2.8.10-clang.patch
deleted file mode 100644
index 065c66b3613..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.10-clang.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- app/Makefile.am
-+++ app/Makefile.am
-@@ -120,29 +120,29 @@
-
- # FIXME: core should not depend on xcf
- workaround_that_core_depends_on_xcf = \
-- -u $(SYMPREFIX)xcf_init
-+ -Wl,-u,$(SYMPREFIX)xcf_init
-
- # FIXME: core should not depend on pdb
- workaround_that_core_depends_on_pdb = \
-- -u $(SYMPREFIX)internal_procs_init \
-- -u $(SYMPREFIX)gimp_plug_in_manager_restore
-+ -Wl,-u,$(SYMPREFIX)internal_procs_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
-
- # FIXME: plug-in should not depend on pdb
- workaround_that_plug_in_depends_on_pdb = \
-- -u $(SYMPREFIX)gimp_pdb_compat_param_spec
-+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
-
- # FIXME: file should not depend on plug-in
- workaround_that_file_depends_on_plug_in = \
-- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-- -u $(SYMPREFIX)gimp_image_map_config_get_type
-+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
-
- # core, vectors and gegl are on the same architectural layer, prevent
- # the linker from panicing
- calm_down_linker = \
-- -u $(SYMPREFIX)gimp_vectors_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-- -u $(SYMPREFIX)gimp_curve_map_pixels
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
-
- AM_LDFLAGS = \
- $(munix) \
---- app/Makefile.in
-+++ app/Makefile.in
-@@ -702,33 +702,33 @@
-
- # FIXME: core should not depend on xcf
- workaround_that_core_depends_on_xcf = \
-- -u $(SYMPREFIX)xcf_init
-+ -Wl,-u,$(SYMPREFIX)xcf_init
-
-
- # FIXME: core should not depend on pdb
- workaround_that_core_depends_on_pdb = \
-- -u $(SYMPREFIX)internal_procs_init \
-- -u $(SYMPREFIX)gimp_plug_in_manager_restore
-+ -Wl,-u,$(SYMPREFIX)internal_procs_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
-
-
- # FIXME: plug-in should not depend on pdb
- workaround_that_plug_in_depends_on_pdb = \
-- -u $(SYMPREFIX)gimp_pdb_compat_param_spec
-+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
-
-
- # FIXME: file should not depend on plug-in
- workaround_that_file_depends_on_plug_in = \
-- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-- -u $(SYMPREFIX)gimp_image_map_config_get_type
-+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
-
-
- # core, vectors and gegl are on the same architectural layer, prevent
- # the linker from panicing
- calm_down_linker = \
-- -u $(SYMPREFIX)gimp_vectors_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-- -u $(SYMPREFIX)gimp_curve_map_pixels
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
-
- AM_LDFLAGS = \
- $(munix) \
---- app/tests/Makefile.am
-+++ app/tests/Makefile.am
-@@ -63,22 +63,22 @@
- # We need this due to circular dependencies, see more detailed
- # comments about it in app/Makefile.am
- AM_LDFLAGS = \
-- -u $(SYMPREFIX)xcf_init \
-- -u $(SYMPREFIX)base_init \
-- -u $(SYMPREFIX)internal_procs_init \
-- -u $(SYMPREFIX)gimp_plug_in_manager_restore \
-- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \
-- -u $(SYMPREFIX)gui_init \
-- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-- -u $(SYMPREFIX)gimp_image_map_config_get_type \
-- -u $(SYMPREFIX)gimp_vectors_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-- -u $(SYMPREFIX)actions_init \
-- -u $(SYMPREFIX)gimp_error_dialog_new \
-- -u $(SYMPREFIX)menus_save \
-- -u $(SYMPREFIX)gimp_tools_save \
-- -u $(SYMPREFIX)gimp_curve_map_pixels
-+ -Wl,-u,$(SYMPREFIX)xcf_init \
-+ -Wl,-u,$(SYMPREFIX)base_init \
-+ -Wl,-u,$(SYMPREFIX)internal_procs_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
-+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
-+ -Wl,-u,$(SYMPREFIX)gui_init \
-+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)actions_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \
-+ -Wl,-u,$(SYMPREFIX)menus_save \
-+ -Wl,-u,$(SYMPREFIX)gimp_tools_save \
-+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
-
- # Note that we have some duplicate entries here too to work around
- # circular dependencies and systems on the same architectural layer as
---- app/tests/Makefile.in
-+++ app/tests/Makefile.in
-@@ -1221,22 +1221,22 @@
- # We need this due to circular dependencies, see more detailed
- # comments about it in app/Makefile.am
- AM_LDFLAGS = \
-- -u $(SYMPREFIX)xcf_init \
-- -u $(SYMPREFIX)base_init \
-- -u $(SYMPREFIX)internal_procs_init \
-- -u $(SYMPREFIX)gimp_plug_in_manager_restore \
-- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \
-- -u $(SYMPREFIX)gui_init \
-- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-- -u $(SYMPREFIX)gimp_image_map_config_get_type \
-- -u $(SYMPREFIX)gimp_vectors_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-- -u $(SYMPREFIX)actions_init \
-- -u $(SYMPREFIX)gimp_error_dialog_new \
-- -u $(SYMPREFIX)menus_save \
-- -u $(SYMPREFIX)gimp_tools_save \
-- -u $(SYMPREFIX)gimp_curve_map_pixels
-+ -Wl,-u,$(SYMPREFIX)xcf_init \
-+ -Wl,-u,$(SYMPREFIX)base_init \
-+ -Wl,-u,$(SYMPREFIX)internal_procs_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
-+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
-+ -Wl,-u,$(SYMPREFIX)gui_init \
-+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \
-+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-+ -Wl,-u,$(SYMPREFIX)actions_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \
-+ -Wl,-u,$(SYMPREFIX)menus_save \
-+ -Wl,-u,$(SYMPREFIX)gimp_tools_save \
-+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
-
-
- # Note that we have some duplicate entries here too to work around
---- devel-docs/app/Makefile.am
-+++ devel-docs/app/Makefile.am
-@@ -62,10 +62,10 @@
- -UGTK_DISABLE_SINGLE_INCLUDES
-
- GTKDOC_LIBS = \
-- -u $(SYMPREFIX)xcf_init \
-- -u $(SYMPREFIX)internal_procs_init \
-- -u $(SYMPREFIX)gimp_coords_mix \
-- -u $(SYMPREFIX)gimp_plug_in_manager_restore \
-+ -Wl,-u,$(SYMPREFIX)xcf_init \
-+ -Wl,-u,$(SYMPREFIX)internal_procs_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \
-+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
- $(top_builddir)/app/app.o \
- $(top_builddir)/app/batch.o \
- $(top_builddir)/app/errors.o \
---- devel-docs/app/Makefile.in
-+++ devel-docs/app/Makefile.in
-@@ -511,10 +511,10 @@
- -UGTK_DISABLE_SINGLE_INCLUDES
-
- GTKDOC_LIBS = \
-- -u $(SYMPREFIX)xcf_init \
-- -u $(SYMPREFIX)internal_procs_init \
-- -u $(SYMPREFIX)gimp_coords_mix \
-- -u $(SYMPREFIX)gimp_plug_in_manager_restore \
-+ -Wl,-u,$(SYMPREFIX)xcf_init \
-+ -Wl,-u,$(SYMPREFIX)internal_procs_init \
-+ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \
-+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
- $(top_builddir)/app/app.o \
- $(top_builddir)/app/batch.o \
- $(top_builddir)/app/errors.o \
diff --git a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch b/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch
deleted file mode 100644
index eba04df59aa..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 97e55692ebad5897be334c81c133b6626b9b6920 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Wed, 26 Aug 2015 23:23:16 +0200
-Subject: app: the blend tool was rendering all gradients off-by-0.5
-
-When calculating the color of a pixel, we want to calculate the color
-at its center, not at its top-left corner. Found by Raymond Jennings.
-
-EDIT (by Sebastian Pipping <sping@gentoo.org>):
- Cut away patch chunk for app/operations/gimpoperationblend.c
- since 2.8.14 doesn't seem to have that file.
-
-diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c
-index af565d1..e4f92a1 100644
---- a/app/core/gimpdrawable-blend.c
-+++ b/app/core/gimpdrawable-blend.c
-@@ -628,6 +628,10 @@ gradient_render_pixel (gdouble x,
- RenderBlendData *rbd = render_data;
- gdouble factor;
-
-+ /* we want to calculate the color at the pixel's center */
-+ x += 0.5;
-+ y += 0.5;
-+
- /* Calculate blending factor */
-
- switch (rbd->gradient_type)
---
-cgit v0.10.2
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
deleted file mode 100644
index c7df330409f..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c57f9dcf1934a9ab0cd67650f2dea18cb0902270 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:25:32 +0100
-Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
- load_image.
-
-We were assuming the input name was well formed, hence was
-nul-terminated. As any data coming from external input, this has to be
-thorougly checked.
-Similar to commit 06d24a79af94837d615d0024916bb95a01bf3c59 but adapted
-to older gimp-2-8 code.
----
- plug-ins/common/file-gbr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
-index b028100..d3f01d9 100644
---- a/plug-ins/common/file-gbr.c
-+++ b/plug-ins/common/file-gbr.c
-@@ -443,7 +443,8 @@ load_image (const gchar *filename,
- {
- gchar *temp = g_new (gchar, bn_size);
-
-- if ((read (fd, temp, bn_size)) < bn_size)
-+ if ((read (fd, temp, bn_size)) < bn_size ||
-+ temp[bn_size - 1] != '\0')
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Error in GIMP brush file '%s'"),
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
deleted file mode 100644
index 1f77d36ec6c..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 1882bac996a20ab5c15c42b0c5e8f49033a1af54 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Sun, 29 Oct 2017 15:19:41 +0100
-Subject: Bug 739133 - (CVE-2017-17785) Heap overflow while parsing FLI files.
-
-It is possible to trigger a heap overflow while parsing FLI files. The
-RLE decoder is vulnerable to out of boundary writes due to lack of
-boundary checks.
-
-The variable "framebuf" points to a memory area which was allocated
-with fli_header->width * fli_header->height bytes. The RLE decoder
-therefore must never write beyond that limit.
-
-If an illegal frame is detected, the parser won't stop, which means
-that the next valid sequence is properly parsed again. This should
-allow GIMP to parse FLI files as good as possible even if they are
-broken by an attacker or by accident.
-
-While at it, I changed the variable xc to be of type size_t, because
-the multiplication of width and height could overflow a 16 bit type.
-
-Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
-(cherry picked from commit edb251a7ef1602d20a5afcbf23f24afb163de63b)
----
- plug-ins/file-fli/fli.c | 50 ++++++++++++++++++++++++++++++++++---------------
- 1 file changed, 35 insertions(+), 15 deletions(-)
-
-diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
-index 313efeb..ffb651e 100644
---- a/plug-ins/file-fli/fli.c
-+++ b/plug-ins/file-fli/fli.c
-@@ -25,6 +25,8 @@
-
- #include "config.h"
-
-+#include <glib/gstdio.h>
-+
- #include <string.h>
- #include <stdio.h>
-
-@@ -461,23 +463,27 @@ void fli_read_brun(FILE *f, s_fli_header *fli_header, unsigned char *framebuf)
- unsigned short yc;
- unsigned char *pos;
- for (yc=0; yc < fli_header->height; yc++) {
-- unsigned short xc, pc, pcnt;
-+ unsigned short pc, pcnt;
-+ size_t n, xc;
- pc=fli_read_char(f);
- xc=0;
- pos=framebuf+(fli_header->width * yc);
-+ n=(size_t)fli_header->width * (fli_header->height-yc);
- for (pcnt=pc; pcnt>0; pcnt--) {
- unsigned short ps;
- ps=fli_read_char(f);
- if (ps & 0x80) {
- unsigned short len;
-- for (len=-(signed char)ps; len>0; len--) {
-+ for (len=-(signed char)ps; len>0 && xc<n; len--) {
- pos[xc++]=fli_read_char(f);
- }
- } else {
- unsigned char val;
-+ size_t len;
-+ len=MIN(n-xc,ps);
- val=fli_read_char(f);
-- memset(&(pos[xc]), val, ps);
-- xc+=ps;
-+ memset(&(pos[xc]), val, len);
-+ xc+=len;
- }
- }
- }
-@@ -564,25 +570,34 @@ void fli_read_lc(FILE *f, s_fli_header *fli_header, unsigned char *old_framebuf,
- memcpy(framebuf, old_framebuf, fli_header->width * fli_header->height);
- firstline = fli_read_short(f);
- numline = fli_read_short(f);
-+ if (numline > fli_header->height || fli_header->height-numline < firstline)
-+ return;
-+
- for (yc=0; yc < numline; yc++) {
-- unsigned short xc, pc, pcnt;
-+ unsigned short pc, pcnt;
-+ size_t n, xc;
- pc=fli_read_char(f);
- xc=0;
- pos=framebuf+(fli_header->width * (firstline+yc));
-+ n=(size_t)fli_header->width * (fli_header->height-firstline-yc);
- for (pcnt=pc; pcnt>0; pcnt--) {
- unsigned short ps,skip;
- skip=fli_read_char(f);
- ps=fli_read_char(f);
-- xc+=skip;
-+ xc+=MIN(n-xc,skip);
- if (ps & 0x80) {
- unsigned char val;
-+ size_t len;
- ps=-(signed char)ps;
- val=fli_read_char(f);
-- memset(&(pos[xc]), val, ps);
-- xc+=ps;
-+ len=MIN(n-xc,ps);
-+ memset(&(pos[xc]), val, len);
-+ xc+=len;
- } else {
-- fread(&(pos[xc]), ps, 1, f);
-- xc+=ps;
-+ size_t len;
-+ len=MIN(n-xc,ps);
-+ fread(&(pos[xc]), len, 1, f);
-+ xc+=len;
- }
- }
- }
-@@ -689,7 +704,8 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
- yc=0;
- numline = fli_read_short(f);
- for (lc=0; lc < numline; lc++) {
-- unsigned short xc, pc, pcnt, lpf, lpn;
-+ unsigned short pc, pcnt, lpf, lpn;
-+ size_t n, xc;
- pc=fli_read_short(f);
- lpf=0; lpn=0;
- while (pc & 0x8000) {
-@@ -700,26 +716,30 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
- }
- pc=fli_read_short(f);
- }
-+ yc=MIN(yc, fli_header->height);
- xc=0;
- pos=framebuf+(fli_header->width * yc);
-+ n=(size_t)fli_header->width * (fli_header->height-yc);
- for (pcnt=pc; pcnt>0; pcnt--) {
- unsigned short ps,skip;
- skip=fli_read_char(f);
- ps=fli_read_char(f);
-- xc+=skip;
-+ xc+=MIN(n-xc,skip);
- if (ps & 0x80) {
- unsigned char v1,v2;
- ps=-(signed char)ps;
- v1=fli_read_char(f);
- v2=fli_read_char(f);
-- while (ps>0) {
-+ while (ps>0 && xc+1<n) {
- pos[xc++]=v1;
- pos[xc++]=v2;
- ps--;
- }
- } else {
-- fread(&(pos[xc]), ps, 2, f);
-- xc+=ps << 1;
-+ size_t len;
-+ len=MIN((n-xc)/2,ps);
-+ fread(&(pos[xc]), len, 2, f);
-+ xc+=len << 1;
- }
- }
- if (lpf) pos[xc]=lpn;
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
deleted file mode 100644
index 4047f7cb3c9..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ef9c821fff8b637a2178eab1c78cae6764c50e12 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 13:02:38 +0100
-Subject: Bug 739134 - (CVE-2017-17786) Out of bounds read / heap overflow
- in...
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... TGA importer.
-
-Be more thorough on valid TGA RGB and RGBA images.
-In particular current TGA plug-in can import RGBA as 32 bits (8 bits per
-channel) and 16 bits (5 bits per color channel and 1 bit for alpha), and
-RGB as 15 and 24 bits.
-Maybe there exist more variants, but if they do exist, we simply don't
-support them yet.
-
-Thanks to Hanno Böck for the report and a first patch attempt.
-
-(cherry picked from commit 674b62ad45b6579ec6d7923dc3cb1ef4e8b5498b)
----
- plug-ins/common/file-tga.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
-index aef9870..426acc2 100644
---- a/plug-ins/common/file-tga.c
-+++ b/plug-ins/common/file-tga.c
-@@ -564,12 +564,16 @@ load_image (const gchar *filename,
- }
- break;
- case TGA_TYPE_COLOR:
-- if (info.bpp != 15 && info.bpp != 16 &&
-- info.bpp != 24 && info.bpp != 32)
-+ if ((info.bpp != 15 && info.bpp != 16 &&
-+ info.bpp != 24 && info.bpp != 32) ||
-+ ((info.bpp == 15 || info.bpp == 24) &&
-+ info.alphaBits != 0) ||
-+ (info.bpp == 16 && info.alphaBits != 1) ||
-+ (info.bpp == 32 && info.alphaBits != 8))
- {
-- g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
-+ g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
- gimp_filename_to_utf8 (filename),
-- info.imageType, info.bpp);
-+ info.imageType, info.bpp, info.alphaBits);
- return -1;
- }
- break;
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
deleted file mode 100644
index 7177dd3c1f1..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 22e2571c25425f225abdb11a566cc281fca6f366 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 13:26:26 +0100
-Subject: plug-ins: TGA 16-bit RGB (without alpha bit) is also valid.
-
-According to some spec on the web, 16-bit RGB is also valid. In this
-case, the last bit is simply ignored (at least that's how it is
-implemented right now).
-
-(cherry picked from commit 8ea316667c8a3296bce2832b3986b58d0fdfc077)
----
- plug-ins/common/file-tga.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
-index 426acc2..eb14a1d 100644
---- a/plug-ins/common/file-tga.c
-+++ b/plug-ins/common/file-tga.c
-@@ -568,7 +568,8 @@ load_image (const gchar *filename,
- info.bpp != 24 && info.bpp != 32) ||
- ((info.bpp == 15 || info.bpp == 24) &&
- info.alphaBits != 0) ||
-- (info.bpp == 16 && info.alphaBits != 1) ||
-+ (info.bpp == 16 && info.alphaBits != 1 &&
-+ info.alphaBits != 0) ||
- (info.bpp == 32 && info.alphaBits != 8))
- {
- g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
deleted file mode 100644
index 654726388ea..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87ba505fff85989af795f4ab6a047713f4d9381d Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:49:41 +0100
-Subject: Bug 790853 - (CVE-2017-17787) heap overread in psp importer.
-
-As any external data, we have to check that strings being read at fixed
-length are properly nul-terminated.
-
-(cherry picked from commit eb2980683e6472aff35a3117587c4f814515c74d)
----
- plug-ins/common/file-psp.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
-index 4cbafe3..e350e4d 100644
---- a/plug-ins/common/file-psp.c
-+++ b/plug-ins/common/file-psp.c
-@@ -890,6 +890,12 @@ read_creator_block (FILE *f,
- g_free (string);
- return -1;
- }
-+ if (string[length - 1] != '\0')
-+ {
-+ g_message ("Creator keyword data not nul-terminated");
-+ g_free (string);
-+ return -1;
-+ }
- switch (keyword)
- {
- case PSP_CRTR_FLD_TITLE:
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
deleted file mode 100644
index 2bf16b85e60..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Hanno Boeck <hanno@hboeck.de>
-Date: Mon, 27 Nov 2017 00:37:29 +0100
-Subject: 790783 - buffer overread in XCF parser if version field...
-Origin: https://git.gnome.org/browse/GIMP/commit/?id=702c4227e8b6169f781e4bb5ae4b5733f51ab126
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17788
-Bug-Debian: https://bugs.debian.org/885347
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=790783
-
-...has no null terminator
-
-Check for the presence of '\0' before using atoi() on the version
-string. Patch slightly modified (mitch).
-[carnil: backport to gimp-2-8: affected code in xcf_load_invoker]
----
- app/xcf/xcf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/app/xcf/xcf.c
-+++ b/app/xcf/xcf.c
-@@ -318,7 +318,8 @@ xcf_load_invoker (GimpProcedure *pr
- {
- info.file_version = 0;
- }
-- else if (id[9] == 'v')
-+ else if (id[9] == 'v' &&
-+ id[13] == '\0')
- {
- info.file_version = atoi (id + 10);
- }
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
deleted file mode 100644
index 3d63694f679..00000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01898f10f87a094665a7fdcf7153990f4e511d3f Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 16:44:20 +0100
-Subject: Bug 790849 - (CVE-2017-17789) CVE-2017-17789 Heap buffer overflow...
-
-... in PSP importer.
-Check if declared block length is valid (i.e. within the actual file)
-before going further.
-Consider the file as broken otherwise and fail loading it.
-
-(cherry picked from commit 28e95fbeb5720e6005a088fa811f5bf3c1af48b8)
----
- plug-ins/common/file-psp.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
-index ac0fff7..4cbafe3 100644
---- a/plug-ins/common/file-psp.c
-+++ b/plug-ins/common/file-psp.c
-@@ -1771,6 +1771,15 @@ load_image (const gchar *filename,
- {
- block_start = ftell (f);
-
-+ if (block_start + block_total_len > st.st_size)
-+ {
-+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+ _("Could not open '%s' for reading: %s"),
-+ gimp_filename_to_utf8 (filename),
-+ _("invalid block size"));
-+ goto error;
-+ }
-+
- if (id == PSP_IMAGE_BLOCK)
- {
- if (block_number != 0)
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
deleted file mode 100644
index e46703d3d3d..00000000000
--- a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06d24a79af94837d615d0024916bb95a01bf3c59 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:15:34 +0100
-Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
- load_image.
-
-We were assuming the input name was well formed, hence was
-nul-terminated. As any data coming from external input, this has to be
-thorougly checked.
----
- plug-ins/common/file-gbr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
-index b8933e7..585e74a 100644
---- a/plug-ins/common/file-gbr.c
-+++ b/plug-ins/common/file-gbr.c
-@@ -456,7 +456,8 @@ load_image (GFile *file,
-
- if (! g_input_stream_read_all (input, temp, size,
- &bytes_read, NULL, error) ||
-- bytes_read != size)
-+ bytes_read != size ||
-+ temp[size - 1] != '\0')
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Error in GIMP brush file '%s'"),
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/gimp-2.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
deleted file mode 100644
index e8d8df39e9d..00000000000
--- a/media-gfx/gimp/gimp-2.8.22-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime ltprune multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
- >=dev-libs/atk-2.2.0
- >=x11-libs/gtk+-2.24.10:2
- >=x11-libs/gdk-pixbuf-2.24.1:2
- >=x11-libs/cairo-1.10.2
- >=x11-libs/pango-1.29.4
- xpm? ( x11-libs/libXpm )
- >=media-libs/freetype-2.1.7
- >=media-libs/fontconfig-2.2.0
- sys-libs/zlib
- dev-libs/libxml2
- dev-libs/libxslt
- x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.10
- >=media-libs/gegl-0.2.0:0
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- aqua? ( x11-libs/gtk-mac-integration )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
- gnome? ( gnome-base/gvfs )
- jpeg? ( virtual/jpeg:0 )
- exif? ( >=media-libs/libexif-0.6.15 )
- lcms? ( >=media-libs/lcms-2.2:2 )
- mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.4[cairo] )
- png? ( >=media-libs/libpng-1.2.37:0 )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
- ')
- )
- tiff? ( >=media-libs/tiff-3.5.7:0 )
- svg? ( >=gnome-base/librsvg-2.36.0:2 )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- x11-libs/libXcursor
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
- sys-apps/findutils
- virtual/pkgconfig
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- doc? ( >=dev-util/gtk-doc-1 )
- >=sys-devel/libtool-2.2
- >=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- $(use_with !aqua x) \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- $(use_with bzip2) \
- $(use_with curl libcurl) \
- $(use_with dbus) \
- $(use_with gnome gvfs) \
- --without-webkit \
- $(use_with jpeg libjpeg) \
- --without-libjasper \
- $(use_with exif libexif) \
- $(use_with lcms lcms lcms2) \
- $(use_with postscript gs) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_with mng libmng) \
- $(use_with pdf poppler) \
- $(use_with png libpng) \
- $(use_enable python) \
- $(use_enable smp mp) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with udev gudev) \
- $(use_with wmf) \
- --with-xmc \
- $(use_with xpm libxpm) \
- --without-xvfb-run"
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954
- epatch "${FILESDIR}"/${P}-cve-2017-17785.patch # bug 641954
- epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch # bug 641954
- epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch # bug 641954
- epatch "${FILESDIR}"/${P}-cve-2017-17787.patch # bug 641954
- epatch "${FILESDIR}"/${P}-cve-2017-17788.patch # bug 641954
- epatch "${FILESDIR}"/${P}-cve-2017-17789.patch # bug 641954
-
- epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch # bug 558878
- epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16
- epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
- gnome2_src_prepare
-}
-
-_clean_up_locales() {
- [[ -z ${LINGUAS+set} ]] && return
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- has ${lang} ${LINGUAS} && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- gnome2_src_install
-
- if use python; then
- python_optimize
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- prune_libtool_files --all
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(get_version_component_range 1-2)
- mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
deleted file mode 100644
index 1213fde7aff..00000000000
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 ltprune multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.40.0:2
- >=dev-libs/atk-2.2.0
- >=x11-libs/gtk+-2.24.10:2
- dev-util/gtk-update-icon-cache
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/cairo-1.12.2
- >=x11-libs/pango-1.29.4
- xpm? ( x11-libs/libXpm )
- >=media-libs/freetype-2.1.7
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/gexiv2-0.10.6
- >=media-libs/libmypaint-1.3.0[gegl]
- >=media-libs/fontconfig-2.2.0
- sys-libs/zlib
- dev-libs/libxml2
- dev-libs/libxslt
- x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.38
- >=media-libs/gegl-0.3.24:0.3[cairo]
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- aqua? ( x11-libs/gtk-mac-integration )
- gnome? ( gnome-base/gvfs )
- virtual/jpeg:0
- >=media-libs/lcms-2.8:2
- mng? ( media-libs/libmng )
- openexr? ( >=media-libs/openexr-1.6.1 )
- pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
- >=media-libs/libpng-1.6.25:0
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
- ')
- )
- >=media-libs/tiff-3.5.7:0
- >=gnome-base/librsvg-2.40.6:2
- webp? ( >=media-libs/libwebp-0.6.0 )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- net-libs/glib-networking[ssl]
- x11-libs/libXcursor
- sys-libs/zlib
- app-arch/bzip2
- >=app-arch/xz-utils-5.0.0
- postscript? ( app-text/ghostscript-gpl )
- udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
- sys-apps/findutils
- virtual/pkgconfig
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- doc? ( >=dev-util/gtk-doc-1 )
- >=sys-devel/libtool-2.2
- >=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-PATCHES=(
- "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954
- "${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch # bug 641954
- "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch # bug 641954
- "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch # bug 641954
- "${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch # bug 641954
- # NOTE: CVE-2017-17788 already fixed upstream
- "${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch # bug 641954
-)
-
-src_prepare() {
- # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
- sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
- -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
- gnome2_src_prepare
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
- eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-src_configure() {
- local myconf=(
- GEGL=${EPREFIX}/usr/bin/gegl-0.3
- GDBUS_CODEGEN=${EPREFIX}/bin/false
- --enable-default-binary
- $(use_with !aqua x)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_enable altivec)
- --with-appdata-test
- --without-webkit
- --without-libjasper
- $(use_with postscript gs)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with webp)
- $(use_with pdf poppler)
- $(use_enable python)
- $(use_enable smp mp)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_with udev gudev)
- $(use_with wmf)
- --with-xmc
- $(use_with xpm libxpm)
- $(use_enable vector-icons)
- --without-xvfb-run
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
- addwrite /dev/dri/ # bug #574038
- addwrite /dev/ati/ # bug 589198
- addwrite /proc/mtrr # bug 589198
-
- export XDG_DATA_DIRS=${EPREFIX}/usr/share # bug 587004
- gnome2_src_compile
-}
-
-_clean_up_locales() {
- [[ -z ${LINGUAS+set} ]] && return
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- has ${lang} ${LINGUAS} && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- if use python; then
- python_optimize
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- prune_libtool_files --all
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(get_version_component_range 1-2)
- mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 7d0fd04395e..88724f7e8aa 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -10,14 +10,7 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="smp">
- Enable support for multiprocessors
- </flag>
- <flag name="vector-icons">
- Enable support for vector icons (experimental)
- </flag>
- <flag name="heif">
- Enable support for ISO/IEC 23008-12:2017 HEIF files
- </flag>
+ <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
+ <flag name="vector-icons">Enable support for vector icons (experimental)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2022-03-15 4:20 John Helmert III
0 siblings, 0 replies; 8+ messages in thread
From: John Helmert III @ 2022-03-15 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 976d4d09d04c7e0beff62fa4aa821954226afaf1
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Mar 14 19:28:44 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 04:05:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976d4d09
media-gfx/gimp: drop <gimp-2.10.28, bump gegl-0.4.34 for gimp-2.10.28
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
media-gfx/gimp/Manifest | 2 -
.../gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch | 58 ------
media-gfx/gimp/gimp-2.10.22-r3.ebuild | 212 ---------------------
media-gfx/gimp/gimp-2.10.24-r1.ebuild | 211 --------------------
media-gfx/gimp/gimp-2.10.28-r1.ebuild | 2 +-
5 files changed, 1 insertion(+), 484 deletions(-)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d89a337aae83..0bbb26b7c61c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,3 @@
-DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
-DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
DIST gimp-2.10.28.tar.bz2 31675862 BLAKE2B b491b55d5adf08221feb7cee8b3adc1d8b090901e8f43b93a4d2c3d935ce1ca45072b0ccd6840e06b329fbfafc8fe5e3d6056381c5129203fa3c5e781cab0453 SHA512 587f6f46741672f0700fd642a5b779694d2d8bc8ad70e7677ccdbfc2266dc62203ed347d6aaffaa4b8e7d84a84a25f7d5a51507dfd64b21b4c05970856d3ab94
DIST gimp-2.10.30.tar.bz2 31731327 BLAKE2B 6d948e16fbf7bae7b514a60a44fc5eaac32bebb915de0dcb5120d10739501a01973cb1f5821699d94c4d4cc7ef86d0e5456674a87623b6996d9b276d83a6eb74 SHA512 02ca9e8846dc2ae856f720b92f3c6af69984cf0b3ce85ba5a67479e5c3c813315a0551b7d011dcf7a6c83dc771e550cc31041126bbea0be3fd483176e0eb2851
DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
diff --git a/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch b/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
deleted file mode 100644
index 732cd9381ae3..000000000000
--- a/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cebeb90a87105cd6e35bcb357d53cc04c828ca21 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 25 Oct 2020 18:09:21 +0000
-Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming
- autoconf-2.70
-
-Upcoming autoconf-2.70 exposes deficiency in configure.ac:
-
-```
-$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
-./configure: line 1430: 5: Bad file descriptor
-checking whether is declared... ./configure: line 1432: ${+y}: bad
-```
-
-It happens because macros are called with parameters using insufficient quoting.
-
-More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
-
-The fix only amends `--with-linux-input`. Other cases of underquoting
-will need to be handled separately.
-
-Fix-by: Zack Weinberg
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 96312f706e..63b85be07a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2135,15 +2135,14 @@ fi
- AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module])
-
- have_linux_input="no (linux input support disabled)"
--if test "x$with_linux_input" != "xno"; then
-- AC_CHECK_HEADER(linux/input.h,
-- AC_CHECK_DECL(KEY_OK,
-- have_linux_input=yes,
-- have_linux_input="no (needs Linux 2.6)",
-- [#include <linux/input.h>]))
--fi
--
--AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
-+AS_IF([test "x$with_linux_input" != "xno"],
-+ [AC_CHECK_HEADER([linux/input.h],
-+ [AC_CHECK_DECL([KEY_OK],
-+ [have_linux_input=yes],
-+ [have_linux_input="no (needs Linux 2.6)"],
-+ [#include <linux/input.h>])])])
-+
-+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
-
-
- ###############################
---
-GitLab
-
diff --git a/media-gfx/gimp/gimp-2.10.22-r3.ebuild b/media-gfx/gimp/gimp-2.10.22-r3.ebuild
deleted file mode 100644
index 1926eec2dcee..000000000000
--- a/media-gfx/gimp/gimp-2.10.22-r3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.2:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.78
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.26:0.4[cairo]
- <media-libs/gegl-0.4.28:0.4
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19:=
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.6.1:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
- x11-libs/libXcursor
- >=x11-libs/pango-1.29.4
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.3.2:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( dev-libs/libgudev:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
- dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
- "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
- "${FILESDIR}/${PN}-2.99.2_fix_autoconf-2.70.patch"
-)
-
-src_prepare() {
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
- gnome2_src_prepare # calls eautoreconf
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bugs #574038 and #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
- --enable-default-binary
-
- --disable-check-update
- --disable-python
- --enable-mp
- --with-appdata-test
- --with-bug-report-url=https://bugs.gentoo.org/
- --with-xmc
- --without-libbacktrace
- --without-webkit
- --without-xvfb-run
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable vector-icons)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_with !aqua x)
- $(use_with heif libheif)
- $(use_with jpeg2k jpeg2000)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with postscript gs)
- $(use_with udev gudev)
- $(use_with unwind libunwind)
- $(use_with webp)
- $(use_with wmf)
- $(use_with xpm libxpm)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
- einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
- local prepend=gimp-org-
- (
- cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
- for plugin_slash in $(ls -d1 */); do
- plugin=${plugin_slash%/}
- if [[ -f ${plugin}/${plugin} ]]; then
- # NOTE: Folder and file name need to match for Gimp to load that plug-in
- # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
- mv ${plugin}/{,${prepend}}${plugin} || die
- mv {,${prepend}}${plugin} || die
- fi
- done
- )
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(ver_cut 1-2)
- mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
- # Remove gimp devel-docs html files if user doesn't need it
- if ! use doc; then
- rm -r "${ED}"/usr/share/gtk-doc || die
- fi
-
- _rename_plugins || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.24-r1.ebuild b/media-gfx/gimp/gimp-2.10.24-r1.ebuild
deleted file mode 100644
index d0a03562d09b..000000000000
--- a/media-gfx/gimp/gimp-2.10.24-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.2:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.86
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.30:0.4[cairo]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19:=
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.6.1:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
- x11-libs/libXcursor
- >=x11-libs/pango-1.29.4
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.9.1:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( dev-libs/libgudev:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
- dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
- "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
- gnome2_src_prepare # calls eautoreconf
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bugs #574038 and #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
- --enable-default-binary
-
- --disable-check-update
- --disable-python
- --enable-mp
- --with-appdata-test
- --with-bug-report-url=https://bugs.gentoo.org/
- --with-xmc
- --without-libbacktrace
- --without-webkit
- --without-xvfb-run
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable debug)
- $(use_enable vector-icons)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_with !aqua x)
- $(use_with heif libheif)
- $(use_with jpeg2k jpeg2000)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with postscript gs)
- $(use_with udev gudev)
- $(use_with unwind libunwind)
- $(use_with webp)
- $(use_with wmf)
- $(use_with xpm libxpm)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
- einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
- local prepend=gimp-org-
- (
- cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
- for plugin_slash in $(ls -d1 */); do
- plugin=${plugin_slash%/}
- if [[ -f ${plugin}/${plugin} ]]; then
- # NOTE: Folder and file name need to match for Gimp to load that plug-in
- # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
- mv ${plugin}/{,${prepend}}${plugin} || die
- mv {,${prepend}}${plugin} || die
- fi
- done
- )
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(ver_cut 1-2)
- mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
- # Remove gimp devel-docs html files if user doesn't need it
- if ! use doc; then
- rm -r "${ED}"/usr/share/gtk-doc || die
- fi
-
- _rename_plugins || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.28-r1.ebuild b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
index fcd583b632bd..2937709c2d68 100644
--- a/media-gfx/gimp/gimp-2.10.28-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEPEND="
>=media-libs/babl-0.1.88
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.32:0.4[cairo]
+ >=media-libs/gegl-0.4.34:0.4[cairo]
>=media-libs/gexiv2-0.10.6
>=media-libs/harfbuzz-0.9.19:=
>=media-libs/lcms-2.8:2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2023-01-25 17:48 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-01-25 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 4d16797fc345be569c8f752c04068baa9c290186
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 21:22:18 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 17:45:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d16797f
media-gfx/gimp: drop 2.10.32-r3, 2.99.12-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/gimp/Manifest | 1 -
.../gimp-2.99.12_fix_libheif-1.13_build.patch | 78 -------
media-gfx/gimp/gimp-2.10.32-r3.ebuild | 212 -----------------
media-gfx/gimp/gimp-2.99.12-r3.ebuild | 251 ---------------------
4 files changed, 542 deletions(-)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5258bad42d5f..44369595d1ff 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,2 @@
DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
-DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204
diff --git a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
deleted file mode 100644
index 672a9ef7217e..000000000000
--- a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream issue: "GIMP fails to build with libheif >= 1.13.0"
-https://gitlab.gnome.org/GNOME/gimp/-/issues/8570
-
-From a61299ddb184babca015a846c72bf3e1a57faf2a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
-Date: Sat, 3 Sep 2022 13:19:33 +0200
-Subject: [PATCH] plug-ins: fix builing with libheif 1.13.0+
-
----
- plug-ins/common/file-heif.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
-index 76bc41f44d..36899bcf5f 100644
---- a/plug-ins/common/file-heif.c
-+++ b/plug-ins/common/file-heif.c
-@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat
- HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3
- } HeifpluginExportFormat;
-
--typedef struct _Heif Heif;
--typedef struct _HeifClass HeifClass;
-+typedef struct _GimpHeif GimpHeif;
-+typedef struct _GimpHeifClass GimpHeifClass;
-
--struct _Heif
-+struct _GimpHeif
- {
- GimpPlugIn parent_instance;
- };
-
--struct _HeifClass
-+struct _GimpHeifClass
- {
- GimpPlugInClass parent_class;
- };
-
-
--#define HEIF_TYPE (heif_get_type ())
--#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif))
-+#define GIMP_HEIF_TYPE (gimp_heif_get_type ())
-+#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif))
-
--GType heif_get_type (void) G_GNUC_CONST;
-+GType gimp_heif_get_type (void) G_GNUC_CONST;
-
- static GList * heif_init_procedures (GimpPlugIn *plug_in);
- static GimpProcedure * heif_create_procedure (GimpPlugIn *plug_in,
-@@ -123,14 +123,14 @@ static gboolean save_dialog (GimpProcedure *procedure,
- GimpImage *image);
-
-
--G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN)
-+G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN)
-
--GIMP_MAIN (HEIF_TYPE)
-+GIMP_MAIN (GIMP_HEIF_TYPE)
- DEFINE_STD_SET_I18N
-
-
- static void
--heif_class_init (HeifClass *klass)
-+gimp_heif_class_init (GimpHeifClass *klass)
- {
- GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
-
-@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass)
- }
-
- static void
--heif_init (Heif *heif)
-+gimp_heif_init (GimpHeif *heif)
- {
- }
-
---
-GitLab
-
diff --git a/media-gfx/gimp/gimp-2.10.32-r3.ebuild b/media-gfx/gimp/gimp-2.10.32-r3.ebuild
deleted file mode 100644
index c92649387961..000000000000
--- a/media-gfx/gimp/gimp-2.10.32-r3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.2:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.90
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.36:0.4[cairo]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19:=
- >=media-libs/lcms-2.8:2
- media-libs/libjpeg-turbo:=
- >=media-libs/libmypaint-1.6.1:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:=
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
- x11-libs/libXcursor
- >=x11-libs/pango-1.29.4
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.9.1:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- jpegxl? ( >=media-libs/libjxl-0.6.1:= )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- postscript? ( app-text/ghostscript-gpl:= )
- udev? ( dev-libs/libgudev:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
- dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
-)
-
-src_prepare() {
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
- gnome2_src_prepare # calls eautoreconf
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bugs #574038 and #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
- --enable-default-binary
-
- --disable-check-update
- --disable-python
- --enable-mp
- --with-appdata-test
- --with-bug-report-url=https://bugs.gentoo.org/
- --with-xmc
- --without-libbacktrace
- --without-webkit
- --without-xvfb-run
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable debug)
- $(use_enable vector-icons)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_with !aqua x)
- $(use_with heif libheif)
- $(use_with jpeg2k jpeg2000)
- $(use_with jpegxl)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with postscript gs)
- $(use_with udev gudev)
- $(use_with unwind libunwind)
- $(use_with webp)
- $(use_with wmf)
- $(use_with xpm libxpm)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
- einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
- local prename=gimp-org-
- (
- cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
- for plugin_slash in $(ls -d1 */); do
- plugin=${plugin_slash%/}
- if [[ -f ${plugin}/${plugin} ]]; then
- # NOTE: Folder and file name need to match for Gimp to load that plug-in
- # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
- mv ${plugin}/{,${prename}}${plugin} || die
- mv {,${prename}}${plugin} || die
- fi
- done
- )
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(ver_cut 1-2)
- mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
- # Remove gimp devel-docs html files if user doesn't need it
- if ! use doc; then
- rm -r "${ED}"/usr/share/gtk-doc || die
- fi
-
- _rename_plugins || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.99.12-r3.ebuild b/media-gfx/gimp/gimp-2.99.12-r3.ebuild
deleted file mode 100644
index 7957159ae91e..000000000000
--- a/media-gfx/gimp/gimp-2.99.12-r3.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-VALA_USE_DEPEND=vapigen
-
-inherit lua-single meson python-single-r1 vala xdg
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/3"
-
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
- >=app-text/poppler-0.90.1[cairo]
- >=app-text/poppler-data-0.4.9
- >=dev-libs/appstream-glib-0.7.16
- >=dev-libs/atk-2.34.1
- >=dev-libs/glib-2.68.0:2
- >=dev-libs/json-glib-1.4.4
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.21:2
- >=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.96[introspection,lcms,vala?]
- >=media-libs/fontconfig-2.12.6
- >=media-libs/freetype-2.10.2
- >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?]
- >=media-libs/gexiv2-0.14.0
- >=media-libs/harfbuzz-2.6.5:=
- >=media-libs/lcms-2.9:2
- media-libs/libjpeg-turbo
- >=media-libs/libmypaint-1.6.1:=
- >=media-libs/libpng-1.6.37:=
- >=media-libs/tiff-4.1.0:=
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- >=x11-libs/cairo-1.16.0
- >=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
- >=x11-libs/gtk+-3.24.16:3[introspection]
- >=x11-libs/pango-1.44.7
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- heif? ( >=media-libs/libheif-1.9.1:= )
- javascript? ( dev-libs/gjs )
- jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
- jpegxl? ( >=media-libs/libjxl-0.6.1:= )
- lua? (
- ${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/lgi[${LUA_USEDEP}]
- ')
- )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-2.3.0:= )
- postscript? ( app-text/ghostscript-gpl:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
- ')
- )
- udev? ( >=dev-libs/libgudev-167:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- X? ( x11-libs/libXcursor )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- test? ( x11-misc/xvfb-run )
- vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="
- >=dev-lang/perl-5.30.3
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.21
- doc? (
- app-text/yelp-tools
- dev-libs/gobject-introspection[doctool]
- dev-util/gi-docgen
- )
- virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
-
-PATCHES=( "${FILESDIR}/${P}_fix_libheif-1.13_build.patch" )
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
-
- # Fix (typo) MMX and SSE support detection
- sed -i -e "s/'-mmx'/'-mmmx'/" -e "s/'-sse'/'-msse'/" meson.build || die
-
- # Fix Gimp and GimpUI devel doc installation paths
- sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die
- sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die
-
- # Fix pygimp.interp python implementation path.
- # Meson @PYTHON_PATH@ use sandbox path e.g.:
- # '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3'
- sed -i -e 's:@PYTHON_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die
-}
-
-_adjust_sandbox() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bugs #574038 and #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- use vala && vala_setup
-
- local emesonargs=(
- -Denable-default-bin=true
-
- -Dcheck-update=no
- -Denable-multiproc=true
- -Dappdata-test=disabled
- -Dbug-report-url=https://bugs.gentoo.org/
- -Dlibbacktrace=false
- -Dwebkit-unmaintained=false
- $(meson_feature aalib aa)
- $(meson_feature alsa)
- $(meson_feature doc gi-docgen)
- $(meson_feature heif)
- $(meson_feature jpeg2k jpeg2000)
- $(meson_feature jpegxl jpeg-xl)
- $(meson_feature mng)
- $(meson_feature openexr)
- $(meson_feature postscript ghostscript)
- $(meson_feature test headless-tests)
- $(meson_feature udev gudev)
- $(meson_feature vala vala-plugins)
- $(meson_feature webp)
- $(meson_feature wmf)
- $(meson_feature X xcursor)
- $(meson_feature xpm)
- $(meson_use doc g-ir-doc)
- $(meson_use javascript)
- $(meson_use lua)
- $(meson_use python)
- $(meson_use unwind libunwind)
- $(meson_use vector-icons)
- )
-
- meson_src_configure
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- meson_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
- einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
- local prename=gimp-org-
- (
- cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
- for plugin_slash in $(ls -d1 */); do
- plugin=${plugin_slash%/}
- if [[ -f ${plugin}/${plugin} ]]; then
- # NOTE: Folder and file name need to match for Gimp to load that plug-in
- # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
- mv ${plugin}/{,${prename}}${plugin} || exit 1
- mv {,${prename}}${plugin} || exit 1
- fi
- done
- )
-}
-
-src_install() {
- meson_src_install
-
- if use python; then
- python_optimize
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
- # Create symlinks for Gimp exec in /usr/bin
- dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp
- dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console
- dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter
- dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard
- dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool
-
- _rename_plugins || die
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/
@ 2023-05-19 23:50 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-05-19 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 112d496fe7ec2fb77132ec98cb4aca7e483767ba
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu May 18 21:07:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 19 23:48:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112d496f
media-gfx/gimp: 2.10.34-r2 bump, fix 'execinfo.h' not found (musl)
Closes: https://bugs.gentoo.org/900148
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...mp-2.10_fix_musl_backtrace_backend_switch.patch | 15 ++
media-gfx/gimp/gimp-2.10.34-r2.ebuild | 213 +++++++++++++++++++++
2 files changed, 228 insertions(+)
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_musl_backtrace_backend_switch.patch b/media-gfx/gimp/files/gimp-2.10_fix_musl_backtrace_backend_switch.patch
new file mode 100644
index 000000000000..07f0266d0a30
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10_fix_musl_backtrace_backend_switch.patch
@@ -0,0 +1,15 @@
+Gentoo issue: https://bugs.gentoo.org/900148
+Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/9452
+
+diff -Naur a/app/core/gimpbacktrace-backend.h b/app/core/gimpbacktrace-backend.h
+--- a/app/core/gimpbacktrace-backend.h
++++ b/app/core/gimpbacktrace-backend.h
+@@ -22,7 +22,7 @@
+ #define __GIMP_BACKTRACE_BACKEND_H__
+
+
+-#ifdef __gnu_linux__
++#if defined (__gnu_linux__) && defined (__GLIBC__)
+ # define GIMP_BACKTRACE_BACKEND_LINUX
+ #elif defined (G_OS_WIN32) && defined (ARCH_X86)
+ # define GIMP_BACKTRACE_BACKEND_WINDOWS
diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild b/media-gfx/gimp/gimp-2.10.34-r2.ebuild
new file mode 100644
index 000000000000..f0bccadd7339
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.34-r2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0
+ >=app-text/poppler-0.50[cairo]
+ >=app-text/poppler-data-0.4.7
+ >=dev-libs/glib-2.56.2:2
+ >=dev-libs/json-glib-1.2.6
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.40.6:2
+ >=media-gfx/mypaint-brushes-2.0.2:=
+ >=media-libs/babl-0.1.98
+ >=media-libs/fontconfig-2.12.4
+ >=media-libs/freetype-2.1.7
+ >=media-libs/gegl-0.4.40:0.4[cairo]
+ >=media-libs/gexiv2-0.10.6
+ >=media-libs/harfbuzz-0.9.19:=
+ >=media-libs/lcms-2.8:2
+ media-libs/libjpeg-turbo:=
+ >=media-libs/libmypaint-1.6.1:=
+ >=media-libs/libpng-1.6.25:0=
+ >=media-libs/tiff-3.5.7:=
+ net-libs/glib-networking[ssl]
+ sys-libs/zlib
+ >=x11-libs/cairo-1.12.2
+ >=x11-libs/gdk-pixbuf-2.31:2
+ >=x11-libs/gtk+-2.24.32:2
+ x11-libs/libXcursor
+ >=x11-libs/pango-1.29.4
+ aalib? ( media-libs/aalib )
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+ heif? ( >=media-libs/libheif-1.9.1:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ postscript? ( app-text/ghostscript-gpl:= )
+ udev? ( dev-libs/libgudev:= )
+ unwind? ( >=sys-libs/libunwind-1.1.0:= )
+ webp? ( >=media-libs/libwebp-0.6.0:= )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-themes/hicolor-icon-theme
+ gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ >=dev-lang/perl-5.10.0
+ dev-libs/appstream-glib
+ dev-util/gtk-update-icon-cache
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.19
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+ "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
+)
+
+src_prepare() {
+ sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+ sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+ sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+
+ gnome2_src_prepare # calls eautoreconf
+
+ sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
+ grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+ export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+ # Bugs #569738 and #591214
+ local nv
+ for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+ # We do not check for existence as they may show up later
+ # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+ addwrite "${nv}"
+ done
+
+ addwrite /dev/dri/ # bugs #574038 and #684886
+ addwrite /dev/ati/ # bug #589198
+ addwrite /proc/mtrr # bug #589198
+}
+
+src_configure() {
+ _adjust_sandbox
+
+ local myconf=(
+ GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+ GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+ --enable-default-binary
+
+ --disable-check-update
+ --disable-python
+ --enable-mp
+ --with-appdata-test
+ --with-bug-report-url=https://bugs.gentoo.org/
+ --with-xmc
+ --without-libbacktrace
+ --without-webkit
+ --without-xvfb-run
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable debug)
+ $(use_enable vector-icons)
+ $(use_with aalib aa)
+ $(use_with alsa)
+ $(use_with !aqua x)
+ $(use_with heif libheif)
+ $(use_with jpeg2k jpeg2000)
+ $(use_with jpegxl)
+ $(use_with mng libmng)
+ $(use_with openexr)
+ $(use_with postscript gs)
+ $(use_with udev gudev)
+ $(use_with unwind libunwind)
+ $(use_with webp)
+ $(use_with wmf)
+ $(use_with xpm libxpm)
+ )
+
+ gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
+ gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+ einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+ local prename=gimp-org-
+ (
+ cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+ for plugin_slash in $(ls -d1 */); do
+ plugin=${plugin_slash%/}
+ if [[ -f ${plugin}/${plugin} ]]; then
+ # NOTE: Folder and file name need to match for Gimp to load that plug-in
+ # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+ mv ${plugin}/{,${prename}}${plugin} || die
+ mv {,${prename}}${plugin} || die
+ fi
+ done
+ )
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ find "${D}" -name '*.la' -type f -delete || die
+
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ local gimp_app_version=$(ver_cut 1-2)
+ mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+ # Remove gimp devel-docs html files if user doesn't need it
+ if ! use doc; then
+ rm -r "${ED}"/usr/share/gtk-doc || die
+ fi
+
+ _rename_plugins || die
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-05-19 23:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-18 16:18 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/files/, media-gfx/gimp/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2023-05-19 23:50 Sam James
2023-01-25 17:48 Andreas Sturmlechner
2022-03-15 4:20 John Helmert III
2020-08-22 16:07 Andreas Sturmlechner
2019-12-01 3:18 Andreas Sturmlechner
2018-01-03 3:21 Sebastian Pipping
2015-12-05 1:42 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox