[shotcut/f26] Update to 17.11

commit a87aa50b8fa2d05ded988cd2f1d4d599b7dc5808 Author: martinkg(a)fedoraproject.org <martinkg(a)fedoraproject.org&gt; Date: Thu Nov 16 15:39:56 2017 +0100 Update to 17.11 .gitignore | 1 + shotcut-noupdatecheck.patch | 43 ++++++++++++++++++++++--------------------- shotcut.spec | 17 ++++++++++------- sources | 2 +- 4 files changed, 34 insertions(+), 29 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7ce2d7c..5858a60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /shotcut-17.10.tar.gz +/shotcut-17.11.tar.gz diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch index fb4031d..c06a704 100644 --- a/shotcut-noupdatecheck.patch +++ b/shotcut-noupdatecheck.patch @@ -1,44 +1,45 @@ Index: src/mainwindow.cpp =================================================================== ---- src/mainwindow.cpp.orig 2017-09-27 16:35:35.513234656 +0200 -+++ src/mainwindow.cpp 2017-09-27 16:39:58.954253733 +0200 -@@ -1882,9 +1882,9 @@ - windowHandle()->installEventFilter(this); - - if (!Settings.noUpgrade() && !qApp->property("noupgrade").toBool()) { -- 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, 10 /* 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, 10 /* seconds */); - } +--- src/mainwindow.cpp.orig 2017-11-04 16:11:25.163538614 +0100 ++++ src/mainwindow.cpp 2017-11-04 16:17:17.798846928 +0100 +@@ -2547,9 +2547,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, 30 /* 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, 30 /* seconds */); } - -@@ -2890,7 +2890,7 @@ + + void MainWindow::on_actionRealtime_triggered(bool checked) +@@ -2908,7 +2908,7 @@ void MainWindow::on_actionUpgrade_triggered() { showStatusMessage("Checking for upgrade..."); - m_network.get(QNetworkRequest(QUrl("http://check.shotcut.org/version...; + m_network.get(QNetworkRequest(QUrl("file:///usr/share/shotcut/version.json"))); } - + void MainWindow::on_actionOpenXML_triggered() -@@ -3022,7 +3022,7 @@ +@@ -3040,7 +3040,8 @@ m_upgradeUrl = json.object().value("url").toString(); showStatusMessage(action, 10 /* seconds */); } else { - showStatusMessage(tr("You are running the latest version of Shotcut.")); + showStatusMessage(tr("Use dnf for updates.")); ++ } reply->deleteLater(); return; Index: src/src.pro =================================================================== ---- src/src.pro.orig 2017-08-02 07:41:40.000000000 +0200 -+++ src/src.pro 2017-08-05 06:23:17.818576703 +0200 -@@ -324,7 +324,7 @@ debug_and_release { - LIBS += -lLogger -lmvcp -lpthread +--- src/src.pro.orig 2017-11-04 16:22:22.359946204 +0100 ++++ src/src.pro 2017-11-04 16:25:41.796318201 +0100 +@@ -326,7 +326,7 @@ + LIBS += -lCuteLogger -lmvcp -lpthread isEmpty(SHOTCUT_VERSION) { - !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d") diff --git a/shotcut.spec b/shotcut.spec index f5084a0..07f6242 100644 --- a/shotcut.spec +++ b/shotcut.spec @@ -3,7 +3,7 @@ %define _vstring %(echo %{version} |tr -d ".") Name: shotcut -Version: 17.10 +Version: 17.11 Release: 1%{dist} Summary: A free, open source, cross-platform video editor # The entire source code is GPLv3+ except mvcp/ which is LGPLv2+ @@ -24,7 +24,7 @@ BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: libappstream-glib BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) >= 5.9.2 +BuildRequires: pkgconfig(Qt5Core) >= 5.9.1 BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Network) @@ -114,8 +114,8 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ # Create version.json from current version echo "{" > version.json -echo " \"version_number\": %{_vstring}02," >> version.json -echo " \"version_string\": \"%{version}.02\"," >> version.json +echo " \"version_number\": %{_vstring}04," >> version.json +echo " \"version_string\": \"%{version}.04\"," >> version.json echo " \"url\": \"https://shotcut.org/blog/new-release-%{_vstring}/\"" >> version.json echo "}" >> version.json echo "" >> version.json @@ -124,8 +124,8 @@ echo "" >> version.json rm -rf drmingw %build -export _VSTRING="%{version}.02" -%{qmake_qt5} _VSTRING="%{version}.02" \ +export _VSTRING="%{version}.04" +%{qmake_qt5} _VSTRING="%{version}.04" \ PREFIX=%{buildroot}%{_prefix} %make_build @@ -137,7 +137,7 @@ doxygen CuteLogger/Doxyfile %install %make_install install -D icons/%{name}-logo-64.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png -install -Dm644 %{S:1} %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml +install -Dm644 %{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml install -Dm644 snap/gui/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop chmod a+x %{buildroot}/%{_datadir}/shotcut/qml/export-edl/rebuild.sh @@ -191,6 +191,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a %doc doc %changelog +* Sat Nov 04 2017 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 17.11-1 +- Update to 17.11 + * Sat Oct 14 2017 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 17.10-1 - Update to 17.10 - pkgconfig(Qt5Core) >= 5.9.2 is required diff --git a/sources b/sources index 0019d42..d2f6174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5a27b2b4bfaf150aaa746d7959fc8a1 shotcut-17.10.tar.gz +9cb3b6a9a534dd7d616698748b75cac8 shotcut-17.11.tar.gz