summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-08-21 22:09:18 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-08-21 23:23:02 +0200
commit425bf47e3a1a50bca7ddda6f95b77d68cf2fb4d1 (patch)
tree3849e2e3b637526d62c0859b517e7b8a7e81505a /media-sound/musescore/files
parentmedia-sound/musescore: Switch to https, add newline at end of file (diff)
downloadgentoo-425bf47e3a1a50bca7ddda6f95b77d68cf2fb4d1.tar.gz
gentoo-425bf47e3a1a50bca7ddda6f95b77d68cf2fb4d1.tar.bz2
gentoo-425bf47e3a1a50bca7ddda6f95b77d68cf2fb4d1.zip
media-sound/musescore: Set USE_SYSTEM_QTSINGLEAPPLICATION=ON
Bug: https://bugs.gentoo.org/489144 Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'media-sound/musescore/files')
-rw-r--r--media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
new file mode 100644
index 000000000000..1e362dd3298a
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
@@ -0,0 +1,28 @@
+From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Wed, 8 Aug 2018 09:16:54 +0200
+Subject: [PATCH] Fix #52106: fails to compile with
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a30c03d63..be6a50578a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -537,8 +537,13 @@ endif(APPLE)
+ ##
+
+ if (USE_SYSTEM_QTSINGLEAPPLICATION)
++ if (USE_PATH_WITH_EXPLICIT_QT_VERSION)
++ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
++ find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
++ else (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
++ endif (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+ else(USE_SYSTEM_QTSINGLEAPPLICATION)
+ subdirs (thirdparty/singleapp)
+ set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)