From 4055cc0f10419571a0f095dff32e5ca059a58572 Mon Sep 17 00:00:00 2001
From: TURX <turx2003@gmail.com>
Date: Mon, 16 Dec 2019 16:11:42 +0800
Subject: [PATCH] musescore: fix directory issue

---
 .../musescore/musescore-3.0.0_git.recipe      |  9 ++++--
 media-sound/musescore/musescore-3.2.3.recipe  | 12 ++++----
 .../patches/musescore-3.0.0_git.patchset      | 29 +++++++++++++++++++
 .../patches/musescore-3.2.3.patchset          | 29 +++++++++++++++++++
 4 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/media-sound/musescore/musescore-3.0.0_git.recipe b/media-sound/musescore/musescore-3.0.0_git.recipe
index 004637a4f..8f9f81250 100644
--- a/media-sound/musescore/musescore-3.0.0_git.recipe
+++ b/media-sound/musescore/musescore-3.0.0_git.recipe
@@ -62,11 +62,14 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make release PREFIX=$prefix UPDATE_CACHE=FALSE
+	mkdir -p $appsDir
+	make release PREFIX=$appsDir/MuseScore UPDATE_CACHE=FALSE
 }
 
 INSTALL()
 {
-	make install PREFIX=$prefix UPDATE_CACHE=FALSE
-	mv $prefix/share $prefix/data
+	make install PREFIX=$appsDir/MuseScore UPDATE_CACHE=FALSE
+	mv $appsDir/MuseScore/share $appsDir/MuseScore/data
+	ln -s $binDir/mscore $appsDir/MuseScore
+	addAppDeskbarSymlink $appsDir/Musescore
 }
diff --git a/media-sound/musescore/musescore-3.2.3.recipe b/media-sound/musescore/musescore-3.2.3.recipe
index 473d091ea..3c37bbc6f 100644
--- a/media-sound/musescore/musescore-3.2.3.recipe
+++ b/media-sound/musescore/musescore-3.2.3.recipe
@@ -65,17 +65,19 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make release PREFIX=$prefix UPDATE_CACHE=FALSE BUILD_PULSEAUDIO=OFF \
+	mkdir -p $appsDir
+	make release PREFIX=$appsDir/MuseScore UPDATE_CACHE=FALSE BUILD_PULSEAUDIO=OFF \
 		BUILD_JACK=OFF BUILD_PORTAUDIO=OFF BUILD_WEBENGINE=OFF \
 		USE_SYSTEM_FREETYPE=ON DOWNLOAD_SOUNDFONT=OFF BUILD_ALSA=OFF
 }
 
 INSTALL()
 {
-	make install PREFIX=$prefix UPDATE_CACHE=FALSE BUILD_PULSEAUDIO=OFF \
+	make install PREFIX=$appsDir/MuseScore UPDATE_CACHE=FALSE BUILD_PULSEAUDIO=OFF \
 		BUILD_JACK=OFF BUILD_PORTAUDIO=OFF BUILD_WEBENGINE=OFF \
 		USE_SYSTEM_FREETYPE=ON DOWNLOAD_SOUNDFONT=OFF BUILD_ALSA=OFF
-	rm -rf $prefix/share/icons $prefix/share/applications/mscore.desktop
-	mv $prefix/share $prefix/data
-	addAppDeskbarSymlink $binDir/musescore Musescore
+	rm -rf $appsDir/MuseScore/share/icons $appsDir/MuseScore/share/applications/mscore.desktop
+	mv $appsDir/MuseScore/share $appsDir/MuseScore/data
+	ln -s $binDir/mscore $appsDir/MuseScore
+	addAppDeskbarSymlink $appsDir/Musescore
 }
diff --git a/media-sound/musescore/patches/musescore-3.0.0_git.patchset b/media-sound/musescore/patches/musescore-3.0.0_git.patchset
index 0a3ab3b32..5309f85de 100644
--- a/media-sound/musescore/patches/musescore-3.0.0_git.patchset
+++ b/media-sound/musescore/patches/musescore-3.0.0_git.patchset
@@ -196,3 +196,32 @@ index bd71a62..eea59b1 100644
 -- 
 2.7.0
 
+
+From 5ee1bb6c08ba39e6aeb494b14fe1601664ef752f Mon Sep 17 00:00:00 2001
+From: TURX <turx2003@gmail.com>
+Date: Sun, 22 Dec 2019 17:00:00 +0800
+Subject: Fix compilation error
+
+
+diff --git a/all.h b/all.h
+index 3c0cdd715..b9a1b72d3 100644
+--- a/all.h
++++ b/all.h
+@@ -103,7 +103,6 @@
+ #include <QTextBlock>
+ #include <QTextList>
+ #include <QClipboard>
+-#include <QPlainTextEdit>
+ #include <QStyledItemDelegate>
+
+ #include <QDateTimeEdit>
+@@ -121,6 +120,7 @@
+ #include <QPrintDialog>
+ #include <QPrinter>
+ #endif
++#include <QPlainTextEdit>
+ #include <QColorDialog>
+ #include <QDockWidget>
+ #include <QStackedWidget>
+--
+2.7.0
diff --git a/media-sound/musescore/patches/musescore-3.2.3.patchset b/media-sound/musescore/patches/musescore-3.2.3.patchset
index 1a8bde9da..fc710f14e 100644
--- a/media-sound/musescore/patches/musescore-3.2.3.patchset
+++ b/media-sound/musescore/patches/musescore-3.2.3.patchset
@@ -49,3 +49,32 @@ index 8033b35..5a8c314 100644
 -- 
 2.23.0
 
+
+From 5ee1bb6c08ba39e6aeb494b14fe1601664ef752f Mon Sep 17 00:00:00 2001
+From: TURX <turx2003@gmail.com>
+Date: Sun, 22 Dec 2019 17:00:00 +0800
+Subject: Fix compilation error
+
+
+diff --git a/all.h b/all.h
+index 3c0cdd715..b9a1b72d3 100644
+--- a/all.h
++++ b/all.h
+@@ -103,7 +103,6 @@
+ #include <QTextBlock>
+ #include <QTextList>
+ #include <QClipboard>
+-#include <QPlainTextEdit>
+ #include <QStyledItemDelegate>
+
+ #include <QDateTimeEdit>
+@@ -121,6 +120,7 @@
+ #include <QPrintDialog>
+ #include <QPrinter>
+ #endif
++#include <QPlainTextEdit>
+ #include <QColorDialog>
+ #include <QDockWidget>
+ #include <QStackedWidget>
+--
+2.23.0