sonic-pi/trunk/sonic-pi-3.3.1-devendor_qscintilla-qt5.patch

   1 diff -ruN a/app/gui/qt/CMakeLists.txt b/app/gui/qt/CMakeLists.txt
   2 --- a/app/gui/qt/CMakeLists.txt 2021-02-01 12:10:30.000000000 +0100
   3 +++ b/app/gui/qt/CMakeLists.txt 2021-09-20 00:27:46.749611996 +0200
   4 @@ -51,9 +51,7 @@
   5  find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED)
   6  find_package(Threads REQUIRED)
   7
   8 -# We build QScintilla as part of the main project to make it easy to debug/fix
   9 -# It is not built as part of externals
  10 -add_subdirectory(QScintilla-2.11.6)
  11 +find_library(QSCINTILLA_QT5 qscintilla2_qt5)
  12
  13  set(APP_NAME sonic-pi)
  14  set(MACOS_APP_NAME "Sonic Pi")
  15 @@ -212,7 +210,7 @@
  16  target_link_libraries(${APP_NAME}
  17      PRIVATE
  18      SonicPi::SonicPiAPI
  19 -    QScintilla
  20 +    ${QSCINTILLA_QT5}
  21      Qt5::Core
  22      Qt5::Gui
  23      Qt5::Widgets