shotcut, bump version, still crashes on launch (#8968)

media-video/shotcut/patches/shotcut-23.06.14.patchset

@@ -1,14 +1,14 @@
-From a1705efaa30d6f1c677a5b29ae2e6a45a5a92d64 Mon Sep 17 00:00:00 2001
+From 2db13fa56889ec77ab1ac9e8ff48d429c82d277e Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Tue, 18 Apr 2023 13:13:07 +0200
 Subject: Haiku build fixes
 
 
 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 2f58f75..0ea9b9b 100644
+index c784a2a..e810489 100644
 --- a/src/mainwindow.cpp
 +++ b/src/mainwindow.cpp
-@@ -133,7 +133,7 @@ MainWindow::MainWindow()
+@@ -135,7 +135,7 @@ MainWindow::MainWindow()
      , m_upgradeUrl("https://www.shotcut.org/download/")
      , m_keyframesDock(0)
  {
@@ -78,19 +78,19 @@ index 3bceef7..bdce17e 100644
 2.37.3
 
 
-From 409c50bf19e09c39876daaa52559927ed2b2a7d3 Mon Sep 17 00:00:00 2001
+From cb7d9bba2fcac2a3da819339b4fb835345d28bd7 Mon Sep 17 00:00:00 2001
 From: TURX <turx2003@gmail.com>
 Date: Mon, 20 Jan 2020 01:32:19 +0800
 Subject: fix Haiku support
 
 
 diff --git a/src/main.cpp b/src/main.cpp
-index 0c4b8cf..7c43871 100644
+index 7c15047..44c89be 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -52,6 +52,10 @@ static const char *kDefaultScaleRoundPolicy = "PassThrough";
- static const char *kDefaultScaleRoundPolicy = "Round";
- #endif
+@@ -48,6 +48,10 @@ extern "C"
+ 
+ static const int kMaxCacheCount = 5000;
  
 +#ifdef Q_OS_HAIKU
 +#include <FindDirectory.h>
@@ -99,7 +99,7 @@ index 0c4b8cf..7c43871 100644
  static void mlt_log_handler(void *service, int mlt_level, const char *format, va_list args)
  {
      if (mlt_level > mlt_log_get_level())
-@@ -203,7 +207,14 @@ public:
+@@ -193,7 +197,14 @@ public:
              resourceArg = parser.positionalArguments();
  
          // Startup logging.
@@ -115,7 +115,7 @@ index 0c4b8cf..7c43871 100644
          const QString logFileName = dir.filePath("shotcut-log.txt");
          QFile::remove(logFileName);
 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 0ea9b9b..ddc354e 100644
+index e810489..d358edd 100644
 --- a/src/mainwindow.cpp
 +++ b/src/mainwindow.cpp
 @@ -103,6 +103,10 @@
@@ -126,10 +126,10 @@ index 0ea9b9b..ddc354e 100644
 +#include <FindDirectory.h>
 +#endif
 +
+ #define SHOTCUT_THEME
+ 
  static bool eventDebugCallback(void **data)
- {
-     QEvent *event = reinterpret_cast<QEvent *>(data[1]);
-@@ -3761,7 +3765,15 @@ void MainWindow::onDrawingMethodTriggered(QAction *action)
+@@ -3742,7 +3746,15 @@ void MainWindow::onDrawingMethodTriggered(QAction *action)
  void MainWindow::on_actionApplicationLog_triggered()
  {
      TextViewerDialog dialog(this);

media-video/shotcut/shotcut-23.06.14.recipe

@@ -5,7 +5,7 @@ COPYRIGHT="2011-2019 by Meltytech, LLC."
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/mltframework/shotcut/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1b9a4f87b16a9751f9cb41588f22af4c00f085105d82cf21d095d9f3c280bc86"
+CHECKSUM_SHA256="d342c6a0224d13daa06f99123fdeb7aa5f899e06e886f12e5bd6ecad98a345d6"
 PATCHES="shotcut-$portVersion.patchset"
 
 ARCHITECTURES="?all !x86_gcc2"
@@ -13,7 +13,7 @@ SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	shotcut$secondaryArchSuffix = $portVersion
- 	app:shotcut
+ 	app:Shotcut
  	lib:libcutelogger$secondaryArchSuffix
 	"
 REQUIRES="
@@ -26,16 +26,17 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	lib:libmlt++_7$secondaryArchSuffix
 	lib:libmlt_7$secondaryArchSuffix
-	lib:libQt5$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Designer$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5Quick$secondaryArchSuffix
-	lib:libQt5Sql$secondaryArchSuffix
-	lib:libQt5Test$secondaryArchSuffix
-	lib:libQt5WebKitWidgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
+	lib:libopenal$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Multimedia$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6OpenGL$secondaryArchSuffix
+	lib:libQt6Qml$secondaryArchSuffix
+	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Sql$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libwebm$secondaryArchSuffix
@@ -50,16 +51,19 @@ BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	devel:libmlt++_7$secondaryArchSuffix
 	devel:libmlt_7$secondaryArchSuffix
-	devel:libQt5$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Designer$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5Quick$secondaryArchSuffix
-	devel:libQt5Sql$secondaryArchSuffix
-	devel:libQt5Test$secondaryArchSuffix
-	devel:libQt5WebKitWidgets$secondaryArchSuffix
-	devel:libQt5Xml$secondaryArchSuffix
+	devel:libopenal$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6DBus$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Multimedia$secondaryArchSuffix
+	devel:libQt6Network$secondaryArchSuffix
+	devel:libQt6OpenGL$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
+	devel:libQt6Quick$secondaryArchSuffix
+	devel:libQt6Sql$secondaryArchSuffix
+	devel:libqt6uitools$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
+	devel:libQt6Xml$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libwebm$secondaryArchSuffix
 	devel:libx264$secondaryArchSuffix
@@ -71,13 +75,15 @@ BUILD_PREREQUIRES="
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
+	cmd:qmake6$secondaryArchSuffix
 	"
 
 BUILD()
 {
+	export CXXFLAGS+=" -DSHOTCUT_NOUPGRADE"
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		$cmakeDirArgs
+		$cmakeDirArgs \
+		-DSHOTCUT_VERSION=$portVersion
 	make -C build $jobArgs
 }
 
@@ -85,8 +91,10 @@ INSTALL()
 {
 	make -C build install
 
-	mkdir -p $appsDir
+	rm -rf $dataDir/{applications,icons,metainfo}
 
+	mkdir -p $appsDir
 	mv $binDir/shotcut $appsDir/Shotcut
+
 	addAppDeskbarSymlink $appsDir/Shotcut
 }