From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1101877-garchives=archives.gentoo.org@lists.gentoo.org>
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 52828138334
for <garchives@archives.gentoo.org>; Fri, 26 Jul 2019 14:09:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8A092E081B;
Fri, 26 Jul 2019 14:09:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5B910E081B
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Jul 2019 14:09:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 7FEE3348BC7
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Jul 2019 14:09:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DF7C1BA
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Jul 2019 14:09:45 +0000 (UTC)
From: "Thomas Beierlein" <tomjbe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" <tomjbe@gentoo.org>
Message-ID: <1564150006.93a4241e7cb9e23bed3025dd678f654ad6e9a98a.tomjbe@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff media-radio/xastir/xastir-2.0.8-r1.ebuild
X-VCS-Directories: media-radio/xastir/files/ media-radio/xastir/
X-VCS-Committer: tomjbe
X-VCS-Committer-Name: Thomas Beierlein
X-VCS-Revision: 93a4241e7cb9e23bed3025dd678f654ad6e9a98a
X-VCS-Branch: master
Date: Fri, 26 Jul 2019 14:09:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3739c895-d725-47eb-b689-97553f31866c
X-Archives-Hash: 0d6429ff1ba31bf4413be4137454a7f1
commit: 93a4241e7cb9e23bed3025dd678f654ad6e9a98a
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 14:06:46 2019 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 14:06:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a4241e
media-radio/xastir: Fix for compile error with newer Graphicsmagick
Backport from xastir-2.1.4 for stable version
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
.../files/xastir-2.0.8-fix-graphicsmagick.diff | 32 ++++++++++++++++++++++
media-radio/xastir/xastir-2.0.8-r1.ebuild | 5 +++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
new file mode 100644
index 00000000000..8919239fbfd
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
@@ -0,0 +1,32 @@
+# backported from xastir-2.1.4 (see bug #688444)
+--- a/src/map_geo.c 2019-07-26 15:54:19.534488550 +0200
++++ b/src/map_geo.c 2019-07-26 15:56:47.779713950 +0200
+@@ -125,20 +125,7 @@
+ #undef PACKAGE_TARNAME
+ #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
+ #undef PACKAGE_VERSION
+-#ifdef HAVE_GRAPHICSMAGICK
+-/*#include <GraphicsMagick/magick/api.h>*/
+-/* Define MAGICK_IMPLEMENTATION to access private interfaces
+- * such as DestroyImagePixels(). This may not be a good thing,
+- * but DestroyImagePixels() has been in this code for a long
+- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
+- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
+- * OpenSuSE-11.3)
+- */
+-#define MAGICK_IMPLEMENTATION
+ #include <magick/api.h>
+-#else // HAVE_GRAPHICSMAGICK
+-#include <magick/api.h>
+-#endif // HAVE_GRAPHICSMAGICK
+ #undef PACKAGE_BUGREPORT
+ #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
+ #undef XASTIR_PACKAGE_BUGREPORT
+@@ -2030,7 +2017,6 @@
+ if (!SyncImagePixels(image))
+ fprintf(stderr, "SyncImagePixels Failed....\n");
+ }
+- DestroyImagePixels(image);
+ }
+
+ // If were are drawing to a low bpp display (typically < 8bpp)
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
index d4421c5da9b..c16d857f5d6 100644
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -45,6 +45,9 @@ src_prepare() {
# do not filter duplicate flags (see bug 411095)
epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+ # fix compile problem with newer graphicsmagic
+ epatch "${FILESDIR}"/${PN}-2.0.8-fix-graphicsmagick.diff
+
eautoreconf
}