diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-03-12 10:03:32 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-03-12 10:03:32 +0000 |
| commit | b25e090b9f1c40e0bc7863d0a2d9a895d4253fae (patch) | |
| tree | de4a8a0f9c0c1f6fa9541f796c06383437dcdc57 /sonic-pi | |
| parent | 3f40efe4eeb0931a3fd1a1d36a8caa6d5307918d (diff) | |
| download | asb-b25e090b9f1c40e0bc7863d0a2d9a895d4253fae.tar.gz asb-b25e090b9f1c40e0bc7863d0a2d9a895d4253fae.tar.xz | |
sonic-pi: refreshed patch for QScintilla
Diffstat (limited to 'sonic-pi')
| -rw-r--r-- | sonic-pi/build/patches/sonic-pi_system_qscintilla.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sonic-pi/build/patches/sonic-pi_system_qscintilla.patch b/sonic-pi/build/patches/sonic-pi_system_qscintilla.patch index 4f7a1725..1fc45ee9 100644 --- a/sonic-pi/build/patches/sonic-pi_system_qscintilla.patch +++ b/sonic-pi/build/patches/sonic-pi_system_qscintilla.patch @@ -1,23 +1,23 @@ -diff -ruN a/app/gui/qt/CMakeLists.txt c/app/gui/qt/CMakeLists.txt ---- a/app/gui/qt/CMakeLists.txt 2020-02-25 01:23:45.000000000 +0100 -+++ c/app/gui/qt/CMakeLists.txt 2020-03-08 16:54:34.158555996 +0100 -@@ -38,9 +38,7 @@ - +--- sonic-pi-3.3.1/app/gui/qt/CMakeLists.txt.orig 2021-03-11 22:34:49.761821221 +0100 ++++ sonic-pi-3.3.1/app/gui/qt/CMakeLists.txt 2021-03-11 22:41:35.636665024 +0100 +@@ -51,9 +51,8 @@ find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED) find_package(Threads REQUIRED) -- --# We build scintilla as part of the main project to make it easy to debug/fix --add_subdirectory(external/QScintilla-2.11.4) + +-# We build QScintilla as part of the main project to make it easy to debug/fix +-# It is not built as part of externals +-add_subdirectory(QScintilla-2.11.6) +find_library(QSCINTILLA_QT5 qscintilla2_qt5) ++ set(APP_NAME sonic-pi) - -@@ -129,7 +127,7 @@ - + set(MACOS_APP_NAME "Sonic Pi") +@@ -212,7 +211,7 @@ target_link_libraries(${APP_NAME} PRIVATE + SonicPi::SonicPiAPI - QScintilla + ${QSCINTILLA_QT5} - Qt5::Core - Qt5::Gui + Qt5::Core + Qt5::Gui Qt5::Widgets |