From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4DC513832E for ; Mon, 18 Jul 2016 14:13:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 368E4E0818; Mon, 18 Jul 2016 14:13:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 853A2E0818 for ; Mon, 18 Jul 2016 14:13:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 035A83407B8 for ; Mon, 18 Jul 2016 14:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 062E0E6B for ; Mon, 18 Jul 2016 14:13:16 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1468851136.7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/, media-gfx/gimp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch media-gfx/gimp/gimp-2.9.2-r2.ebuild X-VCS-Directories: media-gfx/gimp/ media-gfx/gimp/files/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95 X-VCS-Branch: master Date: Mon, 18 Jul 2016 14:13:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 07916cc6-2c5d-4133-8b24-26ced8954d4d X-Archives-Hash: 475464fcbab4b53886fb54f689186fc1 commit: 7e54bfe7a05b4361faa58a4df5ade8a4d05d2b95 Author: Sebastian Pipping gentoo org> AuthorDate: Mon Jul 18 14:11:16 2016 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jul 18 14:12:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e54bfe7 media-gfx/gimp: Support gegl 0.3.8 (bug #586828) Patch backport by and thanks to: Lars Wendler Package-Manager: portage-2.2.28 media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch | 54 ++++++++ media-gfx/gimp/gimp-2.9.2-r2.ebuild | 169 +++++++++++++++++++++++ 2 files changed, 223 insertions(+) diff --git a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch new file mode 100644 index 0000000..a3aa236 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/586828 + +Backported from: +https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b + +--- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c ++++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c +@@ -66,23 +66,11 @@ + } + else + { +- + copy = g_param_spec_string (pspec->name, + g_param_spec_get_nick (pspec), + g_param_spec_get_blurb (pspec), + spec->default_value, + flags); +- +- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) +- { +- static GQuark multiline_quark = 0; +- +- if (! multiline_quark) +- multiline_quark = g_quark_from_static_string ("multiline"); +- +- g_param_spec_set_qdata (copy, multiline_quark, +- GINT_TO_POINTER (TRUE)); +- } + } + } + else if (G_IS_PARAM_SPEC_BOOLEAN (pspec)) +--- gimp-2.9.2/app/widgets/gimppropgui.c ++++ gimp-2.9.2/app/widgets/gimppropgui.c +@@ -227,11 +227,6 @@ + } + else if (G_IS_PARAM_SPEC_STRING (pspec)) + { +- static GQuark multiline_quark = 0; +- +- if (! multiline_quark) +- multiline_quark = g_quark_from_static_string ("multiline"); +- + if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec)) + { + widget = +@@ -239,7 +234,7 @@ + g_param_spec_get_nick (pspec), + GTK_FILE_CHOOSER_ACTION_OPEN); + } +- else if (g_param_spec_get_qdata (pspec, multiline_quark)) ++ else if (HAS_KEY (pspec, "multiline", "true")) + { + GtkTextBuffer *buffer; + GtkWidget *view; diff --git a/media-gfx/gimp/gimp-2.9.2-r2.ebuild b/media-gfx/gimp/gimp-2.9.2-r2.ebuild new file mode 100644 index 0000000..8b53311 --- /dev/null +++ b/media-gfx/gimp/gimp-2.9.2-r2.ebuild @@ -0,0 +1,169 @@ +# 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="~alpha ~amd64 ~arm ~hppa ~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.6: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}] + ) + 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 + epatch "${FILESDIR}"/${PN}-2.9.2-gegl-0.3.8.patch # bug 586828 + epatch "${FILESDIR}"/${P}-CVE-2016-4994.patch # bug 586666 + + 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 +}