lmms: Update to 1.2.0-rc6+

This version builds with Qt 5.11 properly

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-06-05 18:46:34 +02:00
parent f692289c03
commit 7f756fe3b7
2 changed files with 5 additions and 5 deletions

View File

@@ -32,8 +32,8 @@ index 154ff4f..4ceddf6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,7 @@ SET(lmms_EMBEDDED_RESOURCES
"${CMAKE_SOURCE_DIR}/LICENSE.txt"
"${CMAKE_SOURCE_DIR}/doc/CONTRIBUTORS")
SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/doc/AUTHORS" "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CONTRIBUTORS}")
SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
-ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res)
+ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "bin2res" ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res)

View File

@@ -3,7 +3,7 @@ HOMEPAGE = "https://lmms.io"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe"
SRC_URI = "gitsm://github.com/LMMS/${BPN}.git"
SRCREV = "481cb2e88928f04b8d52bed5014586805bde938c"
SRC_URI = "gitsm://github.com/LMMS/${BPN}.git;branch=stable-1.2"
SRCREV = "2f19fa11c886374adcc74990e52d3ed0473fbf08"
S = "${WORKDIR}/git"
PV = "1.2.0-rc5"
PV = "1.2.0-rc6+git${SRCPV}"