summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-12-03 07:40:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-12-03 07:40:56 +0000
commit4f80e171d8997f09c8d31b112ef6e56201912bba (patch)
tree484cb4a7899f85a78399dfcabdd6140e0bef9451 /media-sound
parentRemove legacy references to USE="hwdb keymap" for virtual/udev and co. (diff)
downloadgentoo-2-4f80e171d8997f09c8d31b112ef6e56201912bba.tar.gz
gentoo-2-4f80e171d8997f09c8d31b112ef6e56201912bba.tar.bz2
gentoo-2-4f80e171d8997f09c8d31b112ef6e56201912bba.zip
Fix libX11 underlinking wrt #367855 by Michael Palimaka and Diego Elio Pettenò
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/drumstick/ChangeLog6
-rw-r--r--media-sound/drumstick/drumstick-0.5.0.ebuild3
-rw-r--r--media-sound/drumstick/files/0.5.0-underlinking.patch17
3 files changed, 24 insertions, 2 deletions
diff --git a/media-sound/drumstick/ChangeLog b/media-sound/drumstick/ChangeLog
index 035ed7ce848e..5ba0b0ea06cc 100644
--- a/media-sound/drumstick/ChangeLog
+++ b/media-sound/drumstick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/drumstick
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.13 2013/03/02 21:54:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.14 2013/12/03 07:40:56 ssuominen Exp $
+
+ 03 Dec 2013; Samuli Suominen <ssuominen@gentoo.org>
+ +files/0.5.0-underlinking.patch, drumstick-0.5.0.ebuild:
+ Fix libX11 underlinking wrt #367855 by Michael Palimaka and Diego Elio Pettenò
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> drumstick-0.5.0.ebuild:
Move Qt dependencies to the new category
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild
index add770bd490e..e6758d2ddd00 100644
--- a/media-sound/drumstick/drumstick-0.5.0.ebuild
+++ b/media-sound/drumstick/drumstick-0.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.5.0.ebuild,v 1.7 2013/03/02 21:54:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.5.0.ebuild,v 1.8 2013/12/03 07:40:56 ssuominen Exp $
EAPI=4
@@ -33,6 +33,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
PATCHES=(
"${FILESDIR}"/${PV}-doc_automagicness.patch
+ "${FILESDIR}"/${PV}-underlinking.patch
)
src_prepare() {
diff --git a/media-sound/drumstick/files/0.5.0-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch
new file mode 100644
index 000000000000..1bb5ae7da3bf
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-underlinking.patch
@@ -0,0 +1,17 @@
+--- utils/vpiano/CMakeLists.txt
++++ utils/vpiano/CMakeLists.txt
+@@ -1,3 +1,5 @@
++find_package(X11 REQUIRED)
++
+ SET(vpiano_forms_SRCS
+ vpianoabout.ui
+ connections.ui
+@@ -52,7 +54,7 @@
+ TARGET_LINK_LIBRARIES(drumstick-vpiano
+ ${QT_LIBRARIES}
+ ${ALSA_LIBS}
+- ${QT_X11_X11_LIBRARY}
++ ${X11_X11_LIB}
+ drumstick-common
+ drumstick-alsa
+ )