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 5A68C139694 for ; Sat, 20 May 2017 22:23:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5F5E21C04E; Sat, 20 May 2017 22:23:47 +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 AAA1C21C04E for ; Sat, 20 May 2017 22:23:47 +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 61BAD3416D0 for ; Sat, 20 May 2017 22:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C80D77441 for ; Sat, 20 May 2017 22:23:44 +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: <1495318935.3980d9be8a48e5aa8c5b47416f9c31ab171a981b.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch media-libs/gegl/gegl-0.3.14.ebuild X-VCS-Directories: media-libs/gegl/ media-libs/gegl/files/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 3980d9be8a48e5aa8c5b47416f9c31ab171a981b X-VCS-Branch: master Date: Sat, 20 May 2017 22:23:44 +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: 1d810997-7177-4b3a-9d8b-db10a5f74ab4 X-Archives-Hash: 0d6b3d31e09678481121be5d2025c851 commit: 3980d9be8a48e5aa8c5b47416f9c31ab171a981b Author: Sebastian Pipping gentoo org> AuthorDate: Sat May 20 22:21:02 2017 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sat May 20 22:22:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3980d9be media-libs/gegl: Fix USE=introspection compilation (bug #617618) Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../gegl/files/gegl-0.3.14-g_log_domain.patch | 47 ++++++++++++++++++++++ media-libs/gegl/gegl-0.3.14.ebuild | 3 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch new file mode 100644 index 00000000000..4fb81a2b2bb --- /dev/null +++ b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch @@ -0,0 +1,47 @@ +From 81fb956b221e4b1f919788d8a5f6a3a5462b86ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= +Date: Thu, 23 Mar 2017 14:59:28 +0100 +Subject: build: move G_LOG_DOMAIN define to a Makefile.am as suggested in glib + docs... + +--- + configure.ac | 2 -- + gegl/Makefile.am | 2 ++ + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 41ed17e..36e8e2a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,8 +1269,6 @@ done + # We should support this at some point if possible + #LDFLAGS="-Wl,-z,defs" + +-CFLAGS="$CFLAGS -DG_LOG_DOMAIN=\\\"GEGL\\\"" +- + dnl bin/node-editors/Makefile + AC_CONFIG_FILES([ + Makefile +diff --git a/gegl/Makefile.am b/gegl/Makefile.am +index 2030ebb..b5f70d8 100644 +--- a/gegl/Makefile.am ++++ b/gegl/Makefile.am +@@ -12,6 +12,7 @@ endif + + SUBDIRS = buffer graph module operation process property-types opencl + ++ + CLEANFILES = + + AM_CPPFLAGS = \ +@@ -31,6 +32,7 @@ AM_CPPFLAGS = \ + -I$(top_builddir)/gegl/property-types \ + -I$(top_srcdir)/gegl/property-types \ + -DLIBDIR=\""$(libdir)"\" \ ++ -DG_LOG_DOMAIN=\"GEGL\" \ + -DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\" + + AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) +-- +cgit v0.12 + diff --git a/media-libs/gegl/gegl-0.3.14.ebuild b/media-libs/gegl/gegl-0.3.14.ebuild index f9b15ae02a4..7a50c447bbf 100644 --- a/media-libs/gegl/gegl-0.3.14.ebuild +++ b/media-libs/gegl/gegl-0.3.14.ebuild @@ -86,7 +86,8 @@ src_prepare() { sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi - #epatch "${FILESDIR}"/${P}-g_log_domain.patch + # https://bugs.gentoo.org/show_bug.cgi?id=617618 + epatch "${FILESDIR}"/${P}-g_log_domain.patch # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \