commit 64e6c2e34e2cda93f0befd272ae631177cd449f9 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Tue Oct 2 15:19:04 2018 +0200 Update to 18.10.01 .gitignore | 1 + mlt_path.patch | 11 --------- shotcut-noupdatecheck.patch | 58 +++++++++++++++++++++------------------------ shotcut.spec | 9 ++++--- sources | 2 +- 5 files changed, 35 insertions(+), 46 deletions(-) --- diff --git a/.gitignore b/.gitignore index 83e0837..51d6cf2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /shotcut-18.08.11.tar.gz /shotcut-18.08.14.tar.gz /shotcut-18.09.16.tar.gz +/shotcut-18.10.01.tar.gz diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch index ece9d01..98c6d25 100644 --- a/shotcut-noupdatecheck.patch +++ b/shotcut-noupdatecheck.patch @@ -1,39 +1,35 @@ -Index: src/mainwindow.cpp -=================================================================== ---- src/mainwindow.cpp.orig 2018-08-07 12:45:29.676332067 +0200 -+++ src/mainwindow.cpp 2018-08-07 12:49:38.808610634 +0200 -@@ -2650,9 +2650,9 @@ - - void MainWindow::showUpgradePrompt() - { -- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0); -- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered())); -- showStatusMessage(action, 15 /* seconds */); -+ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0); -+ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered())); -+ //showStatusMessage(action, 15 /* seconds */); +--- src/mainwindow.cpp.orig 2018-10-02 13:48:27.170388091 +0200 ++++ src/mainwindow.cpp 2018-10-02 13:49:59.172328038 +0200 +@@ -2790,9 +2790,9 @@ + showStatusMessage("Checking for upgrade..."); + m_network.get(QNetworkRequest(QUrl("http://check.shotcut.org/version...; + } else { +- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0); +- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered())); +- showStatusMessage(action, 15 /* seconds */); ++ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0); ++ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered())); ++ //showStatusMessage(action, 15 /* seconds */); + } } - void MainWindow::on_actionRealtime_triggered(bool checked) -@@ -3204,7 +3204,7 @@ +@@ -3375,7 +3375,7 @@ m_upgradeUrl = json.object().value("url").toString(); - showStatusMessage(action, 10 /* seconds */); + showStatusMessage(action, 15 /* seconds */); } else { - showStatusMessage(tr("You are running the latest version of Shotcut.")); -+ showStatusMessage(tr("Use dnf for updates.")); ++ showStatusMessage(tr("Use dnf for updates.")); } reply->deleteLater(); return; -Index: src/src.pro -=================================================================== ---- src/src.pro.orig 2018-08-07 12:50:08.762042822 +0200 -+++ src/src.pro 2018-08-07 12:52:31.858330244 +0200 -@@ -294,7 +294,7 @@ - LIBS += -lCuteLogger - - isEmpty(SHOTCUT_VERSION) { -- !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d") -+ !win32:SHOTCUT_VERSION = $$_VSTRING - win32:SHOTCUT_VERSION = adhoc - } - DEFINES += SHOTCUT_VERSION=\\\"$$SHOTCUT_VERSION\\\" +--- src/src.pro.orig 2018-10-02 13:52:58.638721580 +0200 ++++ src/src.pro 2018-10-02 13:53:27.064761829 +0200 +@@ -300,7 +300,7 @@ + LIBS += -lCuteLogger + + isEmpty(SHOTCUT_VERSION) { +- !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d") ++ !win32:SHOTCUT_VERSION = $$_VSTRING + win32:SHOTCUT_VERSION = adhoc + } + DEFINES += SHOTCUT_VERSION=\\\"$$SHOTCUT_VERSION\\\" diff --git a/shotcut.spec b/shotcut.spec index df4badf..27aa72a 100644 --- a/shotcut.spec +++ b/shotcut.spec @@ -3,8 +3,8 @@ %define _vstring %(echo %{version} |tr -d ".") Name: shotcut -Version: 18.09.16 -Release: 1%{dist} +Version: 18.10.01 +Release: 0.1.beta1%{dist} Summary: A free, open source, cross-platform video editor # The entire source code is GPLv3+ except mvcp/ which is LGPLv2+ License: GPLv3+ and LGPLv2+ @@ -13,7 +13,7 @@ Source0: https://github.com/mltframework/shotcut/archive/v%{version}.tar. # https://forum.shotcut.org/t/appdata-xml-file-for-gnome-software-center/2742 Source1: %{name}.appdata.xml # Melt patch /usr/bin/mlt-melt -Patch0: mlt_path.patch +####Patch0: mlt_path.patch # shotcut-noupdatecheck.patch -- Disable automatic update check Patch1: shotcut-noupdatecheck.patch @@ -181,6 +181,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.%{na %doc doc %changelog +* Tue Oct 02 2018 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 18.10.01-1 +- Update to 18.10.01 + * Tue Oct 02 2018 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 18.09.16-1 - Update to 18.09.16 diff --git a/sources b/sources index e6abf10..445cad5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86985903021db929984fd02f08cc4a9b shotcut-18.09.16.tar.gz +55d33327179ab3531663223cfb45d961 shotcut-18.10.01.tar.gz