| 1 |
commit: bd78c96a0f8b4b391e0667b019af74f2051b7319 |
| 2 |
Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 12 16:20:34 2017 +0000 |
| 4 |
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 16:55:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd78c96a |
| 7 |
|
| 8 |
x11-libs/libcompizconfig: revbump, fixes bug #602286 |
| 9 |
|
| 10 |
* backport patch to fix compilation bug |
| 11 |
* EAPI bump |
| 12 |
|
| 13 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602286 |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 16 |
|
| 17 |
...fig-0.8.8-avoid-using-templates-in-c-code.patch | 35 ++++++++++++++++++++++ |
| 18 |
....8.8.ebuild => libcompizconfig-0.8.8-r1.ebuild} | 7 +++-- |
| 19 |
2 files changed, 40 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch |
| 22 |
new file mode 100644 |
| 23 |
index 0000000000..498a4bfa4d |
| 24 |
--- /dev/null |
| 25 |
+++ b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch |
| 26 |
@@ -0,0 +1,35 @@ |
| 27 |
+From 1e42ea0e629d6a013e6e7ad7f5d1bbfd2ea11338 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Scott Moreau <oreaus@×××××.com> |
| 29 |
+Date: Wed, 9 Dec 2015 12:51:12 -0700 |
| 30 |
+Subject: [PATCH] Avoid using templates in C code |
| 31 |
+ |
| 32 |
+libxslt uses templates and we cannot use templates in C code. Move the headers |
| 33 |
+using templates outside extern "C" clause. |
| 34 |
+--- |
| 35 |
+ src/compiz.cpp | 6 +++--- |
| 36 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/src/compiz.cpp b/src/compiz.cpp |
| 39 |
+index 43da02f..e5aba0f 100644 |
| 40 |
+--- a/src/compiz.cpp |
| 41 |
++++ b/src/compiz.cpp |
| 42 |
+@@ -23,6 +23,9 @@ |
| 43 |
+ #include <google/protobuf/io/zero_copy_stream_impl.h> |
| 44 |
+ #endif |
| 45 |
+ |
| 46 |
++#include <libxslt/transform.h> |
| 47 |
++#include <libxslt/xsltutils.h> |
| 48 |
++ |
| 49 |
+ extern "C" |
| 50 |
+ { |
| 51 |
+ #ifdef HAVE_CONFIG_H |
| 52 |
+@@ -36,9 +39,6 @@ extern "C" |
| 53 |
+ #include <sys/stat.h> |
| 54 |
+ #include <errno.h> |
| 55 |
+ |
| 56 |
+-#include <libxslt/transform.h> |
| 57 |
+-#include <libxslt/xsltutils.h> |
| 58 |
+- |
| 59 |
+ #include <locale.h> |
| 60 |
+ |
| 61 |
+ #include <compiz-core.h> |
| 62 |
|
| 63 |
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild |
| 64 |
similarity index 83% |
| 65 |
rename from x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild |
| 66 |
rename to x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild |
| 67 |
index ce55678d2d..fbc67240c0 100644 |
| 68 |
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild |
| 69 |
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild |
| 70 |
@@ -1,8 +1,8 @@ |
| 71 |
-# Copyright 1999-2012 Gentoo Foundation |
| 72 |
+# Copyright 1999-2017 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
# $Id$ |
| 75 |
|
| 76 |
-EAPI=4 |
| 77 |
+EAPI=6 |
| 78 |
inherit eutils |
| 79 |
|
| 80 |
DESCRIPTION="Compiz Configuration System" |
| 81 |
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND} |
| 82 |
|
| 83 |
RESTRICT="test" |
| 84 |
|
| 85 |
+#602286 |
| 86 |
+PATCHES=( "${FILESDIR}/${P}-avoid-using-templates-in-c-code.patch" ) |
| 87 |
+ |
| 88 |
src_configure() { |
| 89 |
econf \ |
| 90 |
--enable-fast-install \ |
Archives