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 E9D71139694 for ; Tue, 4 Apr 2017 15:42:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FC0821C097; Tue, 4 Apr 2017 15:42:27 +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 024AF21C097 for ; Tue, 4 Apr 2017 15:42:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D3B03406B7 for ; Tue, 4 Apr 2017 15:42:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0606A73F1 for ; Tue, 4 Apr 2017 15:42:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1491320487.d2edd6edf8547ceb157094dba0fff6d2b08588b2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/, media-gfx/ufraw/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/ufraw/files/ufraw-0.22-crashfix.patch media-gfx/ufraw/ufraw-0.22-r1.ebuild X-VCS-Directories: media-gfx/ufraw/ media-gfx/ufraw/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d2edd6edf8547ceb157094dba0fff6d2b08588b2 X-VCS-Branch: master Date: Tue, 4 Apr 2017 15:42:24 +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: 5b86689b-6a8f-4688-b5b8-78589c107a64 X-Archives-Hash: 256cabb426a9f86ad5bea4c5743679ae commit: d2edd6edf8547ceb157094dba0fff6d2b08588b2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 4 15:19:34 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 4 15:41:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2edd6ed media-gfx/ufraw: Fix runtime crash Gentoo-bug: 608100 Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-gfx/ufraw/files/ufraw-0.22-crashfix.patch | 15 +++++ media-gfx/ufraw/ufraw-0.22-r1.ebuild | 87 +++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch new file mode 100644 index 00000000000..76fe83fa8f2 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.22-crashfix.patch @@ -0,0 +1,15 @@ +--- a/ufraw_ufraw.c 2015-06-16 04:58:38.000000000 +0100 ++++ b/ufraw_ufraw.c 2016-12-18 00:55:45.794466747 +0000 +@@ -767,8 +767,10 @@ void ufraw_close(ufraw_data *uf) + g_free(uf->displayProfile); + g_free(uf->RawHistogram); + #ifdef HAVE_LENSFUN +- lf_modifier_destroy(uf->TCAmodifier); +- lf_modifier_destroy(uf->modifier); ++ if (uf->TCAmodifier != NULL) ++ lf_modifier_destroy(uf->TCAmodifier); ++ if (uf->modifier != NULL) ++ lf_modifier_destroy(uf->modifier); + #endif + ufobject_delete(uf->conf->ufobject); + g_free(uf->conf); diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild new file mode 100644 index 00000000000..7f16fe8192f --- /dev/null +++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools fdo-mime gnome2-utils toolchain-funcs + +DESCRIPTION="RAW Image format viewer and GIMP plugin" +HOMEPAGE="http://ufraw.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="contrast fits gimp gnome gtk openmp timezone" + +REQUIRED_USE="gimp? ( gtk )" + +RDEPEND=" + dev-libs/glib:2= + >=media-gfx/exiv2-0.11:0= + media-libs/lcms:2= + >=media-libs/lensfun-0.2.5:= + media-libs/libpng:0= + media-libs/tiff:0= + virtual/jpeg:0= + fits? ( sci-libs/cfitsio:0= ) + gimp? ( >=media-gfx/gimp-2 ) + gnome? ( >=gnome-base/gconf-2 ) + gtk? ( + >=media-gfx/gtkimageview-1.5 + >=x11-libs/gtk+-2.6:2 + ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch + "${FILESDIR}"/${P}-crashfix.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable contrast) \ + $(use_with fits cfitsio) \ + $(use_with gimp) \ + $(use_enable gnome mime) \ + $(use_with gtk) \ + $(use_enable openmp) \ + $(use_enable timezone dst-correction) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install + einstalldocs +} + +pkg_preinst() { + if use gnome; then + gnome2_gconf_savelist + fi +} + +pkg_postinst() { + if use gnome; then + fdo-mime_mime_database_update + fdo-mime_desktop_database_update + gnome2_gconf_install + fi +} + +pkg_postrm() { + if use gnome; then + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + fi +}