| 1 |
commit: 7de1e4b63e45169100547609744aa4cd32ccdfb4 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 00:10:50 2017 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 00:14:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de1e4b6 |
| 7 |
|
| 8 |
x11-libs/cairo: Drop USE=xlib-xcb flag from unstable versions. |
| 9 |
|
| 10 |
Has caused no end of problems. See bugs 441878, 476306, 477444, 477530, |
| 11 |
508232. |
| 12 |
|
| 13 |
x11-libs/cairo/cairo-1.14.8.ebuild | 17 ++--------------- |
| 14 |
x11-libs/cairo/cairo-9999.ebuild | 17 ++--------------- |
| 15 |
2 files changed, 4 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild |
| 18 |
index acdfced63d..023f08cfa8 100644 |
| 19 |
--- a/x11-libs/cairo/cairo-1.14.8.ebuild |
| 20 |
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild |
| 21 |
@@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" |
| 22 |
HOMEPAGE="http://cairographics.org/" |
| 23 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
| 24 |
SLOT="0" |
| 25 |
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb" |
| 26 |
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb" |
| 27 |
# gtk-doc regeneration doesn't seem to work with out-of-source builds |
| 28 |
#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate |
| 29 |
|
| 30 |
@@ -63,7 +63,6 @@ DEPEND="${RDEPEND} |
| 31 |
|
| 32 |
REQUIRED_USE=" |
| 33 |
gles2? ( !opengl ) |
| 34 |
- xlib-xcb? ( xcb ) |
| 35 |
" |
| 36 |
|
| 37 |
MULTILIB_WRAPPED_HEADERS=( |
| 38 |
@@ -133,7 +132,6 @@ multilib_src_configure() { |
| 39 |
$(use_enable valgrind) \ |
| 40 |
$(use_enable xcb) \ |
| 41 |
$(use_enable xcb xcb-shm) \ |
| 42 |
- $(use_enable xlib-xcb) \ |
| 43 |
--enable-ft \ |
| 44 |
--enable-pdf \ |
| 45 |
--enable-png \ |
| 46 |
@@ -142,6 +140,7 @@ multilib_src_configure() { |
| 47 |
--disable-gallium \ |
| 48 |
--disable-qt \ |
| 49 |
--disable-vg \ |
| 50 |
+ --disable-xlib-xcb \ |
| 51 |
${myopts} |
| 52 |
} |
| 53 |
|
| 54 |
@@ -149,15 +148,3 @@ multilib_src_install_all() { |
| 55 |
prune_libtool_files --all |
| 56 |
einstalldocs |
| 57 |
} |
| 58 |
- |
| 59 |
-pkg_postinst() { |
| 60 |
- if use !xlib-xcb; then |
| 61 |
- if has_version net-misc/nxserver-freenx \ |
| 62 |
- || has_version net-misc/x2goserver; then |
| 63 |
- ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers." |
| 64 |
- ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+" |
| 65 |
- ewarn "applications that are running inside NX sessions. For details, see" |
| 66 |
- ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173" |
| 67 |
- fi |
| 68 |
- fi |
| 69 |
-} |
| 70 |
|
| 71 |
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild |
| 72 |
index 7ec16d48f5..39c733894b 100644 |
| 73 |
--- a/x11-libs/cairo/cairo-9999.ebuild |
| 74 |
+++ b/x11-libs/cairo/cairo-9999.ebuild |
| 75 |
@@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" |
| 76 |
HOMEPAGE="http://cairographics.org/" |
| 77 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
| 78 |
SLOT="0" |
| 79 |
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg utils valgrind xcb xlib-xcb" |
| 80 |
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg utils valgrind xcb" |
| 81 |
# gtk-doc regeneration doesn't seem to work with out-of-source builds |
| 82 |
#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate |
| 83 |
|
| 84 |
@@ -64,7 +64,6 @@ DEPEND="${RDEPEND} |
| 85 |
|
| 86 |
REQUIRED_USE=" |
| 87 |
gles2? ( !opengl ) |
| 88 |
- xlib-xcb? ( xcb ) |
| 89 |
" |
| 90 |
|
| 91 |
MULTILIB_WRAPPED_HEADERS=( |
| 92 |
@@ -136,7 +135,6 @@ multilib_src_configure() { |
| 93 |
$(use_enable valgrind) \ |
| 94 |
$(use_enable xcb) \ |
| 95 |
$(use_enable xcb xcb-shm) \ |
| 96 |
- $(use_enable xlib-xcb) \ |
| 97 |
--enable-ft \ |
| 98 |
--enable-pdf \ |
| 99 |
--enable-png \ |
| 100 |
@@ -145,6 +143,7 @@ multilib_src_configure() { |
| 101 |
--disable-gallium \ |
| 102 |
--disable-qt \ |
| 103 |
--disable-vg \ |
| 104 |
+ --disable-xlib-xcb \ |
| 105 |
${myopts} |
| 106 |
} |
| 107 |
|
| 108 |
@@ -152,15 +151,3 @@ multilib_src_install_all() { |
| 109 |
prune_libtool_files --all |
| 110 |
einstalldocs |
| 111 |
} |
| 112 |
- |
| 113 |
-pkg_postinst() { |
| 114 |
- if use !xlib-xcb; then |
| 115 |
- if has_version net-misc/nxserver-freenx \ |
| 116 |
- || has_version net-misc/x2goserver; then |
| 117 |
- ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers." |
| 118 |
- ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+" |
| 119 |
- ewarn "applications that are running inside NX sessions. For details, see" |
| 120 |
- ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173" |
| 121 |
- fi |
| 122 |
- fi |
| 123 |
-} |
Archives