haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 15:08:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

musescore: adjust patches

Browse Source 
remove old recipe.
This commit is contained in:
Jerome Duval
2019-12-31 15:41:45 +01:00
parent 4055cc0f10
commit 58b5896631
3 changed files with 12 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
media-sound/musescore/patches/musescore-3.2.3.patchset
View File

@@ -1,18 +1,18 @@
From 9e7431905e99d10a34107f5fbdb0cff79223f2ff Mon Sep 17 00:00:00 2001
From b12353d0d8e93bbf261acd8bc78a7811e6ffad90 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.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93eaafa..6f116e2 100644
index 93eaafa..b19aa24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,6 +114,13 @@ if (APPLE)
option(BUILD_ALSA ${MAC_NOT_AVAIL} OFF)
endif (APPLE)
+# Disable components not supported on Mac
+# Disable components not supported on Haiku
+if (HAIKU)
+ set(HAIKU_NOT_AVAIL "Not available on Haiku")
+ option(BUILD_PULSEAUDIO ${HAIKU_NOT_AVAIL} OFF)
@@ -23,58 +23,31 @@ index 93eaafa..6f116e2 100644
if (NOT APPLE AND NOT MINGW AND NOT MSVC)
set(NIX_NOT_AVAIL "Not available on Linux/BSD")
diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
index 8033b35..5a8c314 100644
index 8033b35..b87b241 100644
--- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt
@@ -768,8 +768,6 @@ else (MINGW)
@@ -768,8 +768,8 @@ else (MINGW)
if (APPLE)
target_link_libraries(mscore ${OsxFrameworks})
- else (APPLE)
- target_link_libraries(mscore rt)
+ elseif (NOT HAIKU)
+ target_link_libraries(mscore rt)
endif (APPLE)
# 'gold' does not use indirect shared libraries for symbol resolution, Linux only
@@ -777,7 +775,9 @@ else (MINGW)
@@ -777,7 +777,9 @@ else (MINGW)
if(USE_JACK)
target_link_libraries(mscore ${CMAKE_DL_LIBS})
endif(USE_JACK)
- target_link_libraries(mscore rt)
+ if (NOT HAIKU)
+ target_link_libraries(mscore rt)
+ endif(NOT HAIKU)
+ if (NOT HAIKU)
+ target_link_libraries(mscore rt)
+ endif(NOT HAIKU)
endif (NOT APPLE)
if (APPLE)
--
2.23.0
2.24.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