summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Förster <Dessa@gmake.de>2016-10-22 04:08:54 +0200
committerDavid Seifert <soap@gentoo.org>2016-10-22 13:24:07 +0200
commit2a56222bddc768a4ac73fb7109b48d55eb0989b0 (patch)
treea6c4cf82820a95163962e562a8c5f45ebec2d9b3 /media-sound/murmur
parentdev-libs/Ice: version bump (diff)
downloadgentoo-2a56222bddc768a4ac73fb7109b48d55eb0989b0.tar.gz
gentoo-2a56222bddc768a4ac73fb7109b48d55eb0989b0.tar.bz2
gentoo-2a56222bddc768a4ac73fb7109b48d55eb0989b0.zip
media-sound/murmur: fix build with Ice-3.6.3, add subslot dep
Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/2628 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-sound/murmur')
-rw-r--r--media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch11
-rw-r--r--media-sound/murmur/murmur-1.2.17.ebuild5
2 files changed, 13 insertions, 3 deletions
diff --git a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
new file mode 100644
index 00000000000..a8ad91e4493
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
@@ -0,0 +1,11 @@
+--- mumble-1.2.17/src/murmur/murmur.pro 2016-09-24 14:37:47.000000000 +0200
++++ mumble-1.2.17.new/src/murmur/murmur.pro 2016-10-21 13:52:31.470049513 +0200
+@@ -74,7 +74,7 @@
+ win32 {
+ slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
+ } else {
+- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
++ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.1/slice/ -I/usr/share/Ice-3.6.3/slice/ ${QMAKE_FILE_NAME}
+ }
+ slice.input = SLICEFILES
+ slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/murmur-1.2.17.ebuild b/media-sound/murmur/murmur-1.2.17.ebuild
index 7ac04b7b495..4cfe62097f0 100644
--- a/media-sound/murmur/murmur-1.2.17.ebuild
+++ b/media-sound/murmur/murmur-1.2.17.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/openssl-1.0.0b:0=
|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
dev-qt/qtxmlpatterns:4
dbus? ( dev-qt/qtdbus:4 )
- ice? ( dev-libs/Ice )
+ ice? ( dev-libs/Ice:= )
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
DEPEND="${RDEPEND}
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
PATCHES=(
- "${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
- "${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-compat.patch
+ "${FILESDIR}"/${P}-ice-3.6.3-compat.patch
)
DOC_CONTENTS="