| 1 |
commit: ff788eb0c53b5631b87f01c91b20ce066005811b |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 25 18:08:56 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 25 18:08:56 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ff788eb0 |
| 7 |
|
| 8 |
media-libs/libcanberra: drop unneeded patch, fix multiple docdir install |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/libcanberra-0.28-underlinking.patch | 44 -------------------- |
| 12 |
media-libs/libcanberra/libcanberra-0.30.ebuild | 1 + |
| 13 |
2 files changed, 1 insertions(+), 44 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch b/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index aa48439..0000000 |
| 18 |
--- a/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,44 +0,0 @@ |
| 21 |
-From 14504663805b9cdc5e514cacdadb7c137a06d6e1 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com> |
| 23 |
-Date: Sun, 15 May 2011 15:02:34 +0200 |
| 24 |
-Subject: [PATCH] build-sys: link gtk and gtk3 modules to libX11 as well as |
| 25 |
- Gtk itself. |
| 26 |
-MIME-Version: 1.0 |
| 27 |
-Content-Type: text/plain; charset=UTF-8 |
| 28 |
-Content-Transfer-Encoding: 8bit |
| 29 |
- |
| 30 |
-Both of the modules use the XFree/XGetWindowProperty functions which are |
| 31 |
-exposed by libX11; without this change, the modules would be |
| 32 |
-underlinked, which causes some link editors to refuse the link (including |
| 33 |
-GNU gold). |
| 34 |
- |
| 35 |
-Signed-off-by: Diego Elio Pettenò <flameeyes@×××××.com> |
| 36 |
---- |
| 37 |
- configure.ac | 4 ++-- |
| 38 |
- 1 files changed, 2 insertions(+), 2 deletions(-) |
| 39 |
- |
| 40 |
-diff --git a/configure.ac b/configure.ac |
| 41 |
-index 98102cc..2aaa51f 100644 |
| 42 |
---- a/configure.ac |
| 43 |
-+++ b/configure.ac |
| 44 |
-@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gtk], |
| 45 |
- |
| 46 |
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) |
| 47 |
- if test "x${gtk}" != xno ; then |
| 48 |
-- PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ], |
| 49 |
-+ PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 x11 ], |
| 50 |
- [ |
| 51 |
- HAVE_GTK=1 |
| 52 |
- AC_DEFINE([HAVE_GTK], 1, [Have GTK?]) |
| 53 |
-@@ -422,7 +422,7 @@ AC_ARG_ENABLE([gtk3], |
| 54 |
- [gtk3=auto]) |
| 55 |
- |
| 56 |
- if test "x${gtk3}" != xno ; then |
| 57 |
-- PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ], |
| 58 |
-+ PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 x11 ], |
| 59 |
- [ |
| 60 |
- HAVE_GTK3=1 |
| 61 |
- AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?]) |
| 62 |
--- |
| 63 |
-1.7.5.rc3 |
| 64 |
- |
| 65 |
|
| 66 |
diff --git a/media-libs/libcanberra/libcanberra-0.30.ebuild b/media-libs/libcanberra/libcanberra-0.30.ebuild |
| 67 |
index fdfcc8d..6176dd1 100644 |
| 68 |
--- a/media-libs/libcanberra/libcanberra-0.30.ebuild |
| 69 |
+++ b/media-libs/libcanberra/libcanberra-0.30.ebuild |
| 70 |
@@ -41,6 +41,7 @@ REQUIRED_USE="udev? ( alsa )" |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
econf \ |
| 74 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 75 |
$(use_enable alsa) \ |
| 76 |
$(use_enable oss) \ |
| 77 |
$(use_enable pulseaudio pulse) \ |
Archives