| 1 |
commit: bb37b61c77a952cb43f7adb7cfae53d4fdf54098 |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 11:00:43 2016 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 11:00:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb37b61c |
| 7 |
|
| 8 |
x11-wm/emerald: revision bump |
| 9 |
|
| 10 |
Bump EAPI to 6, fix crash in cairo processing with some UTF-8 symbols |
| 11 |
in windows title - backported from compiz-reloaded project. |
| 12 |
Drop old revision |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.28 |
| 15 |
|
| 16 |
.../{emerald-0.8.8.ebuild => emerald-0.8.8-r1.ebuild} | 11 ++++++----- |
| 17 |
x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch | 12 ++++++++++++ |
| 18 |
x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch | 4 ++-- |
| 19 |
3 files changed, 20 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-wm/emerald/emerald-0.8.8.ebuild b/x11-wm/emerald/emerald-0.8.8-r1.ebuild |
| 22 |
similarity index 81% |
| 23 |
rename from x11-wm/emerald/emerald-0.8.8.ebuild |
| 24 |
rename to x11-wm/emerald/emerald-0.8.8-r1.ebuild |
| 25 |
index 921726a..be388ba 100644 |
| 26 |
--- a/x11-wm/emerald/emerald-0.8.8.ebuild |
| 27 |
+++ b/x11-wm/emerald/emerald-0.8.8-r1.ebuild |
| 28 |
@@ -1,8 +1,8 @@ |
| 29 |
-# Copyright 1999-2013 Gentoo Foundation |
| 30 |
+# Copyright 1999-2016 Gentoo Foundation |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
# $Id$ |
| 33 |
|
| 34 |
-EAPI="4" |
| 35 |
+EAPI=6 |
| 36 |
|
| 37 |
inherit eutils flag-o-matic |
| 38 |
|
| 39 |
@@ -15,7 +15,6 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2" |
| 40 |
LICENSE="GPL-2" |
| 41 |
SLOT="0" |
| 42 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 43 |
-IUSE="" |
| 44 |
|
| 45 |
PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}" |
| 46 |
|
| 47 |
@@ -35,14 +34,16 @@ DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO ) |
| 48 |
|
| 49 |
src_prepare() { |
| 50 |
# Fix pkg-config file pollution wrt #380197 |
| 51 |
- epatch "${FILESDIR}"/${P}-pkgconfig-pollution.patch |
| 52 |
+ eapply "${FILESDIR}/${P}-pkgconfig-pollution.patch" |
| 53 |
+ # Fix crashes with some UTF-8 characters in window title |
| 54 |
+ eapply "${FILESDIR}/${P}-fix-cairo-crash.patch" |
| 55 |
# fix build with gtk+-2.22 - bug 341143 |
| 56 |
sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \ |
| 57 |
include/emerald.h || die |
| 58 |
# Fix underlinking |
| 59 |
append-libs -ldl -lm |
| 60 |
|
| 61 |
- epatch_user |
| 62 |
+ eapply_user |
| 63 |
} |
| 64 |
|
| 65 |
src_configure() { |
| 66 |
|
| 67 |
diff --git a/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch b/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch |
| 68 |
new file mode 100644 |
| 69 |
index 00000000..34ba358 |
| 70 |
--- /dev/null |
| 71 |
+++ b/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch |
| 72 |
@@ -0,0 +1,12 @@ |
| 73 |
+https://github.com/compiz-reloaded/emerald/commit/7f712c5f4fb2dbc8bbe298acc8fef239815aea08 |
| 74 |
+ |
| 75 |
+--- a/src/main.c 2011-04-21 16:06:20.000000000 +0400 |
| 76 |
++++ b/src/main.c 2016-09-01 14:35:08.142020100 +0300 |
| 77 |
+@@ -1644,6 +1644,7 @@ |
| 78 |
+ |
| 79 |
+ /* ===================active text colors */ |
| 80 |
+ cairo_set_source_alpha_color(cr, &fs->text_halo); |
| 81 |
++ pango_cairo_update_layout(cr, d->layout); |
| 82 |
+ pango_cairo_layout_path(cr, d->layout); |
| 83 |
+ cairo_stroke(cr); |
| 84 |
+ |
| 85 |
|
| 86 |
diff --git a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch b/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch |
| 87 |
index 047d8df..7d8a784 100644 |
| 88 |
--- a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch |
| 89 |
+++ b/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch |
| 90 |
@@ -1,5 +1,5 @@ |
| 91 |
---- libengine/emeraldengine.pc.in |
| 92 |
-+++ libengine/emeraldengine.pc.in |
| 93 |
+--- a/libengine/emeraldengine.pc.in |
| 94 |
++++ b/libengine/emeraldengine.pc.in |
| 95 |
@@ -7,6 +7,7 @@ |
| 96 |
Description: Library for Emerald Engines |
| 97 |
Version: @VERSION@ |
Archives