| 1 |
commit: f96504daab52bd8c531d1c859d5dd935fc97c607 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 1 08:47:29 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 1 08:48:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96504da |
| 7 |
|
| 8 |
media-sound/drumstick: Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
media-sound/drumstick/drumstick-0.5.0.ebuild | 22 +++++++++--------- |
| 13 |
.../drumstick/files/0.5.0-gcc6-narrowing.patch | 26 ++++++++++++++++++++++ |
| 14 |
.../drumstick/files/0.5.0-underlinking.patch | 4 ++-- |
| 15 |
3 files changed, 38 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild |
| 18 |
index ccd46d95d56..23e0adbaad1 100644 |
| 19 |
--- a/media-sound/drumstick/drumstick-0.5.0.ebuild |
| 20 |
+++ b/media-sound/drumstick/drumstick-0.5.0.ebuild |
| 21 |
@@ -1,9 +1,9 @@ |
| 22 |
-# Copyright 1999-2013 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=4 |
| 27 |
+EAPI=6 |
| 28 |
|
| 29 |
-inherit base cmake-utils fdo-mime gnome2-utils |
| 30 |
+inherit fdo-mime gnome2-utils cmake-utils |
| 31 |
|
| 32 |
DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer" |
| 33 |
HOMEPAGE="http://drumstick.sourceforge.net/" |
| 34 |
@@ -14,7 +14,8 @@ SLOT="0" |
| 35 |
KEYWORDS="amd64 x86" |
| 36 |
IUSE="dbus doc" |
| 37 |
|
| 38 |
-RDEPEND="media-libs/alsa-lib |
| 39 |
+RDEPEND=" |
| 40 |
+ media-libs/alsa-lib |
| 41 |
dev-qt/qtgui:4 |
| 42 |
dev-qt/qtsvg:4 |
| 43 |
x11-misc/shared-mime-info |
| 44 |
@@ -25,29 +26,26 @@ DEPEND="${RDEPEND} |
| 45 |
app-doc/doxygen |
| 46 |
app-text/docbook-xsl-stylesheets |
| 47 |
dev-libs/libxslt |
| 48 |
- ) |
| 49 |
-" |
| 50 |
- |
| 51 |
-DOCS=( AUTHORS ChangeLog NEWS README TODO ) |
| 52 |
+ )" |
| 53 |
|
| 54 |
PATCHES=( |
| 55 |
"${FILESDIR}"/${PV}-doc_automagicness.patch |
| 56 |
"${FILESDIR}"/${PV}-underlinking.patch |
| 57 |
+ "${FILESDIR}"/${PV}-gcc6-narrowing.patch |
| 58 |
) |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
sed -i \ |
| 62 |
-e '/CMAKE_EXE_LINKER_FLAGS/d' \ |
| 63 |
CMakeLists.txt || die |
| 64 |
- base_src_prepare |
| 65 |
+ cmake-utils_src_prepare |
| 66 |
} |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
local mycmakeargs=( |
| 70 |
- $(cmake-utils_use_use dbus) |
| 71 |
- $(cmake-utils_use_with doc) |
| 72 |
+ -DUSE_DBUS=$(usex dbus) |
| 73 |
+ -DWITH_DOC=$(usex doc) |
| 74 |
) |
| 75 |
- |
| 76 |
cmake-utils_src_configure |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
diff --git a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch |
| 81 |
new file mode 100644 |
| 82 |
index 00000000000..165db470592 |
| 83 |
--- /dev/null |
| 84 |
+++ b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch |
| 85 |
@@ -0,0 +1,26 @@ |
| 86 |
+Fix GCC 6 failures caused by -Wnarrowing |
| 87 |
+ |
| 88 |
+--- a/utils/buildsmf/buildsmf.cpp |
| 89 |
++++ b/utils/buildsmf/buildsmf.cpp |
| 90 |
+@@ -53,8 +53,8 @@ |
| 91 |
+ m_engine->writeKeySignature(0, 2, major_mode); // D major (2 sharps) |
| 92 |
+ |
| 93 |
+ // system exclusive event |
| 94 |
+- static char gsreset[] = { 0xf0, 0x41, 0x10, 0x42, 0x12, |
| 95 |
+- 0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7 }; |
| 96 |
++ static char gsreset[] = { (char)0xf0, 0x41, 0x10, 0x42, 0x12, |
| 97 |
++ 0x40, 0x00, 0x7f, 0x00, 0x41, (char)0xf7 }; |
| 98 |
+ m_engine->writeMidiEvent(0, system_exclusive, sizeof(gsreset), gsreset); |
| 99 |
+ |
| 100 |
+ // some note events |
| 101 |
+--- a/utils/testevents/testevents.cpp |
| 102 |
++++ b/utils/testevents/testevents.cpp |
| 103 |
+@@ -262,7 +262,7 @@ |
| 104 |
+ dumpEvent(new KeyPressEvent(5, 60, 124)); |
| 105 |
+ dumpEvent(new ChanPressEvent(6, 111)); |
| 106 |
+ dumpEvent(new PitchBendEvent(7, 1234)); |
| 107 |
+- char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7}; |
| 108 |
++ char sysex[] = {(char)0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, (char)0xf7}; |
| 109 |
+ dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex)))); |
| 110 |
+ QString text = "This can be a copyright, song name, instrument, lyric..."; |
| 111 |
+ TextEvent te(text, 3); |
| 112 |
|
| 113 |
diff --git a/media-sound/drumstick/files/0.5.0-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch |
| 114 |
index 1bb5ae7da3b..1ec4fd18602 100644 |
| 115 |
--- a/media-sound/drumstick/files/0.5.0-underlinking.patch |
| 116 |
+++ b/media-sound/drumstick/files/0.5.0-underlinking.patch |
| 117 |
@@ -1,5 +1,5 @@ |
| 118 |
---- utils/vpiano/CMakeLists.txt |
| 119 |
-+++ utils/vpiano/CMakeLists.txt |
| 120 |
+--- a/utils/vpiano/CMakeLists.txt |
| 121 |
++++ b/utils/vpiano/CMakeLists.txt |
| 122 |
@@ -1,3 +1,5 @@ |
| 123 |
+find_package(X11 REQUIRED) |
| 124 |
+ |
Archives