hydrogen: Update to latest git / fix configuration for Qt 5.11

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-06-03 18:30:05 +02:00
parent 2d0c0e1d70
commit 03e8f9d162
4 changed files with 39 additions and 6 deletions

View File

@@ -0,0 +1,31 @@
From 2363281ce7bc2919fdef7c4ce2d9862f1a84460d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 3 Jun 2018 17:29:00 +0200
Subject: [PATCH] remove qt5_use_modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* it is not necessary - all libs are linked
* was removed in Qt 5.11
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/gui/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index b753c26a..c800445c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -54,7 +54,6 @@ TARGET_LINK_LIBRARIES(hydrogen
hydrogen-core-${VERSION}
Qt5::Widgets
)
-qt5_use_modules(hydrogen Widgets)
ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
--
2.14.3

View File

@@ -14,13 +14,13 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/hydrogen.default.conf b/data/hydrogen.default.conf
index a5c201ef..d6d2b6c3 100644
index d57ea8d4..136cbdf0 100644
--- a/data/hydrogen.default.conf
+++ b/data/hydrogen.default.conf
@@ -15,7 +15,7 @@
<useTimeLine>false</useTimeLine>
<maxBars>400</maxBars>
@@ -23,7 +23,7 @@
<useTheRubberbandBpmChangeEvent>false</useTheRubberbandBpmChangeEvent>
<preDelete>0</preDelete>
<postDelete>0</postDelete>
- <showDevelWarning>true</showDevelWarning>
+ <showDevelWarning>false</showDevelWarning>
<hearNewNotes>true</hearNewNotes>

View File

@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
# 'listplugins' tool.
DEPENDS += " \
qttools-native \
qtbase \
qtxmlpatterns \
libtar \
@@ -32,8 +33,9 @@ DEPENDS += " \
SRC_URI = " \
git://github.com/hydrogen-music/hydrogen.git \
file://0001-Fix-man-installation-path.patch \
file://0001-remove-qt5_use_modules.patch \
file://0002-hydrogen.default.conf-do-not-show-developer-warnings.patch \
file://0003-Fix-man-installation-path.patch \
\
http://hydrogen-music.org/drumkits/Audiophob.h2drumkit;downloadfilename=Audiophob.tar.gz;name=Audiophob;subdir=drumkits \
http://hydrogen-music.org/drumkits/belofilms_GuitarStrums.h2drumkit;downloadfilename=belofilms_GuitarStrums.tar.gz;name=belofilms_GuitarStrums;subdir=drumkits \
@@ -76,7 +78,7 @@ SRC_URI = " \
https://downloads.sourceforge.net/hydrogen/TR808909.h2drumkit;downloadfilename=TR808909.tar.gz;name=TR808909;subdir=drumkits \
https://downloads.sourceforge.net/hydrogen/VariBreaks.h2drumkit;downloadfilename=VariBreaks.tar.gz;name=VariBreaks;subdir=drumkits \
"
SRCREV = "21a833317a2e6ac23873e6ed056a691ff0988660"
SRCREV = "2cbb04f85d84bddb5a8a1caf614837cbe5323292"
PV ="0.9.7+git${SRCPV}"
S = "${WORKDIR}/git"