From f65e77f1871ae466b9bea7bc71f964bcc57ec936 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 7 Jan 2020 14:06:26 +1000
Subject: [PATCH] MuseScore: add application icon * disable Fusion style for
 Haiku * disable ASLR for build

---
 media-sound/musescore/musescore-3.3.4.recipe  | 19 +++++++++-
 .../patches/musescore-3.3.4.patchset          | 37 ++++++++++++++++---
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/media-sound/musescore/musescore-3.3.4.recipe b/media-sound/musescore/musescore-3.3.4.recipe
index e1527b2f6..a64841a1f 100644
--- a/media-sound/musescore/musescore-3.3.4.recipe
+++ b/media-sound/musescore/musescore-3.3.4.recipe
@@ -3,11 +3,12 @@ DESCRIPTION="This application is used for creating, playing and printing beautif
 HOMEPAGE="https://musescore.org/"
 COPYRIGHT="2002-2019 Werner Schweer and others"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/musescore/MuseScore/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="ab8bade6c7eec6a9ae03f435cad65e79c4ca031d19020aa6e2a4da2868f49a2a"
 SOURCE_DIR="MuseScore-$portVersion"
 PATCHES="musescore-$portVersion.patchset"
+ADDITIONAL_FILES="musescore.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86"
@@ -65,6 +66,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	export DISABLE_ASLR=1
 	mkdir -p $appsDir
 	make release PREFIX=$appsDir/MuseScore UPDATE_CACHE=FALSE BUILD_PULSEAUDIO=OFF \
 		BUILD_JACK=OFF BUILD_PORTAUDIO=OFF BUILD_WEBENGINE=OFF \
@@ -76,5 +78,20 @@ INSTALL()
 	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
+
+	local APP_SIGNATURE="application/x-vnd.musescore"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/musescore.rdef.in > musescore.rdef
+
+	addResourcesToBinaries musescore.rdef "$appsDir"/MuseScore/bin/musescore
 	addAppDeskbarSymlink "$appsDir"/MuseScore/bin/musescore MuseScore
 }
diff --git a/media-sound/musescore/patches/musescore-3.3.4.patchset b/media-sound/musescore/patches/musescore-3.3.4.patchset
index 729e53c43..428994674 100644
--- a/media-sound/musescore/patches/musescore-3.3.4.patchset
+++ b/media-sound/musescore/patches/musescore-3.3.4.patchset
@@ -1,4 +1,4 @@
-From 98e0b44f5b2348bf808e1258480b30278745bf7f Mon Sep 17 00:00:00 2001
+From 455108e41eba42ee6ce2efaf21bf3113eeeb4c74 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 17 Sep 2019 19:09:55 +0200
 Subject: Import still relevant part of Haiku patches.
@@ -49,10 +49,10 @@ index 1b85ed9..6710878 100644
  
        if (APPLE)
 -- 
-2.24.0
+2.24.1
 
 
-From facf2821a4cd181412237e357df253a216912fb8 Mon Sep 17 00:00:00 2001
+From 2f60f112b794565e392ba2d05aacdcb9f4916271 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 31 Dec 2019 17:39:34 +0100
 Subject: Specializes template routines.
@@ -124,10 +124,10 @@ index 913498c..ed6b892 100644
     public:
        virtual void visit(QString key, IntPreference*) = 0;
 -- 
-2.24.0
+2.24.1
 
 
-From 2ac0ba08a1211abaf53d8ac4abb1a0345b0d07e5 Mon Sep 17 00:00:00 2001
+From 91dd54e1acd841387367a9795103b3de68ae1829 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 31 Dec 2019 17:42:04 +0100
 Subject: fix warnings: replace QString::null, with QString()
@@ -257,5 +257,30 @@ index 41fdd40..d32b1b2 100644
        }
  
 -- 
-2.24.0
+2.24.1
+
+
+From 87421462327190651ce298453cae9f425defaca4 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Tue, 7 Jan 2020 13:31:47 +1000
+Subject: Don't set Fusion style for Haiku
+
+
+diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
+index 4ded5a9..ef7e788 100644
+--- a/mscore/musescore.cpp
++++ b/mscore/musescore.cpp
+@@ -7181,8 +7181,9 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+ void MuseScore::updateUiStyleAndTheme()
+       {
+       // set UI Theme
++#ifndef __HAIKU__
+       QApplication::setStyle(QStyleFactory::create("Fusion"));
+-
++#endif
+       QString wd      = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).arg(QCoreApplication::applicationName());
+       // set UI Color Palette
+       QPalette p(QApplication::palette());
+-- 
+2.24.1