From da74b38339e7d0ce09aba69c71830c7f9dd56408 Mon Sep 17 00:00:00 2001 From: zlice Date: Mon, 19 Aug 2024 16:20:41 -0400 Subject: [PATCH] shotcut: update to 24.06.26. --- srcpkgs/shotcut/patches/qt6.6-timeline.patch | 73 -------------------- srcpkgs/shotcut/template | 8 +-- 2 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 srcpkgs/shotcut/patches/qt6.6-timeline.patch diff --git a/srcpkgs/shotcut/patches/qt6.6-timeline.patch b/srcpkgs/shotcut/patches/qt6.6-timeline.patch deleted file mode 100644 index 96a8541c995..00000000000 --- a/srcpkgs/shotcut/patches/qt6.6-timeline.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 4f92e2c3f4dc562fd92d631239a3203555c8ae52 Mon Sep 17 00:00:00 2001 -From: "Jason E. Hale" -Date: Thu, 19 Oct 2023 21:09:40 -0400 -Subject: [PATCH] Don't shadow FINAL properties. Fixes #1479 (#1481) - ---- - .../views/timeline/CornerSelectionShadow.qml | 4 ++-- - src/qml/views/timeline/timeline.qml | 18 +++++++++--------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/src/qml/views/timeline/CornerSelectionShadow.qml b/src/qml/views/timeline/CornerSelectionShadow.qml -index 348fa780f6..2b3c8102f4 100644 ---- a/src/qml/views/timeline/CornerSelectionShadow.qml -+++ b/src/qml/views/timeline/CornerSelectionShadow.qml -@@ -19,11 +19,11 @@ import QtQuick - Item { - id: root - -- property Item clip -+ property Item clipN - property bool mirrorGradient: false - - width: 100 -- height: clip ? clip.height : 0 -+ height: clipN ? clipN.height : 0 - - Rectangle { - id: shadowGradient -diff --git a/src/qml/views/timeline/timeline.qml b/src/qml/views/timeline/timeline.qml -index 98dbff27e1..bd2c60a049 100644 ---- a/src/qml/views/timeline/timeline.qml -+++ b/src/qml/views/timeline/timeline.qml -@@ -534,16 +534,16 @@ Rectangle { - model: timeline.selection - - Rectangle { -- property var clip: trackAt(modelData.y).clipAt(modelData.x) -- property var track: typeof clip !== 'undefined' && typeof dragDelta !== 'undefined' ? trackAt(clip.trackIndex + dragDelta.y) : 0 -+ property var clipN: trackAt(modelData.y).clipAt(modelData.x) -+ property var track: typeof clipN !== 'undefined' && typeof dragDelta !== 'undefined' ? trackAt(clipN.trackIndex + dragDelta.y) : 0 - -- x: clip && typeof dragDelta !== 'undefined' ? clip.x + dragDelta.x : 0 -+ x: clipN && typeof dragDelta !== 'undefined' ? clipN.x + dragDelta.x : 0 - y: track ? track.y : 0 -- width: clip ? clip.width : 0 -+ width: clipN ? clipN.width : 0 - height: track ? track.height : 0 - color: 'transparent' - border.color: 'red' -- visible: clip && !clip.Drag.active && clip.trackIndex === clip.originalTrackIndex -+ visible: clipN && !clipN.Drag.active && clipN.trackIndex === clipN.originalTrackIndex - } - } - } -@@ -574,14 +574,14 @@ Rectangle { - - CornerSelectionShadow { - y: tracksRepeater.count ? tracksRepeater.itemAt(timeline.currentTrack).y + ruler.height - tracksFlickable.contentY : 0 -- clip: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[0].y).clipAt(timeline.selection[0].x) : null -- opacity: clip && clip.x + clip.width < tracksFlickable.contentX ? 1 : 0 -+ clipN: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[0].y).clipAt(timeline.selection[0].x) : null -+ opacity: clipN && clipN.x + clipN.width < tracksFlickable.contentX ? 1 : 0 - } - - CornerSelectionShadow { - y: tracksRepeater.count ? tracksRepeater.itemAt(timeline.currentTrack).y + ruler.height - tracksFlickable.contentY : 0 -- clip: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[timeline.selection.length - 1].y).clipAt(timeline.selection[timeline.selection.length - 1].x) : null -- opacity: clip && clip.x > tracksFlickable.contentX + tracksFlickable.width ? 1 : 0 -+ clipN: timeline.selection.length ? tracksRepeater.itemAt(timeline.selection[timeline.selection.length - 1].y).clipAt(timeline.selection[timeline.selection.length - 1].x) : null -+ opacity: clipN && clipN.x > tracksFlickable.contentX + tracksFlickable.width ? 1 : 0 - anchors.right: parent.right - mirrorGradient: true - } diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template index 5c9ae4e1847..5ab3aecdbbd 100644 --- a/srcpkgs/shotcut/template +++ b/srcpkgs/shotcut/template @@ -1,13 +1,13 @@ # Template file for 'shotcut' pkgname=shotcut -version=23.09.29 -revision=3 +version=24.06.26 +revision=1 build_style=cmake configure_args="-DSHOTCUT_VERSION=${version}" hostmakedepends="pkg-config qt6-base qt6-tools" makedepends="mlt7-devel qt6-declarative-devel qt6-multimedia-devel qt6-websockets-devel qt6-plugin-mysql qt6-plugin-odbc - qt6-plugin-pgsql qt6-plugin-sqlite" + qt6-plugin-pgsql qt6-plugin-sqlite qt6-charts-devel" depends="ffmpeg6 frei0r-plugins qt6-declarative" short_desc="Free, open source, cross-platform video editor" maintainer="John " @@ -15,6 +15,6 @@ license="GPL-3.0-or-later" homepage="https://www.shotcut.org" changelog="https://github.com/mltframework/shotcut/releases" distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz" -checksum=c76ee1b85bac4bf5e601601e85b4e3d3e2c8579c40ad923d39f2e34f6034a975 +checksum=cd7a90228df954ad1e706940795abf9aff657c7686ce82092f009f9befec7e0b CXXFLAGS="-DHAVE_LOCALE_H=1 -DSHOTCUT_NOUPGRADE"