11:16 a.m.
commit a8950ea96f2e61a3f3433e5991886a73c1b14887
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Aug 7 13:15:43 2018 +0200
Update to 18.08
.gitignore | 1 +
shotcut-noupdatecheck.patch | 24 ++++++++----------------
shotcut.spec | 13 +++++--------
sources | 2 +-
4 files changed, 15 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abbc928..1e62e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/shotcut-18.05.08.tar.gz
/shotcut-18.06.02.tar.gz
/shotcut-18.07.tar.gz
+/shotcut-18.08.tar.gz
diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch
index f4e34ad..ece9d01 100644
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@ -1,8 +1,8 @@
Index: src/mainwindow.cpp
===================================================================
---- src/mainwindow.cpp.orig 2017-12-08 13:38:56.944162254 +0100
-+++ src/mainwindow.cpp 2017-12-08 13:42:07.385176045 +0100
-@@ -2548,9 +2548,9 @@
+--- 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()
{
@@ -15,15 +15,7 @@ Index: src/mainwindow.cpp
}
void MainWindow::on_actionRealtime_triggered(bool checked)
-@@ -2909,7 +2909,6 @@
- void MainWindow::on_actionUpgrade_triggered()
- {
- showStatusMessage("Checking for upgrade...");
--
m_network.get(QNetworkRequest(QUrl("http://check.shotcut.org/version...;
- }
-
- void MainWindow::on_actionOpenXML_triggered()
-@@ -3041,7 +3040,7 @@
+@@ -3204,7 +3204,7 @@
m_upgradeUrl = json.object().value("url").toString();
showStatusMessage(action, 10 /* seconds */);
} else {
@@ -34,10 +26,10 @@ Index: src/mainwindow.cpp
return;
Index: src/src.pro
===================================================================
---- src/src.pro.orig 2017-12-08 13:42:45.581178811 +0100
-+++ src/src.pro 2017-12-08 13:44:10.984184995 +0100
-@@ -329,7 +329,7 @@
- LIBS += -lCuteLogger -lmvcp -lpthread
+--- 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")
diff --git a/shotcut.spec b/shotcut.spec
index 65dbf68..3626448 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,8 +3,8 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 18.07
-Release: 2%{dist}
+Version: 18.08
+Release: 1%{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+
@@ -161,12 +161,6 @@ cp -v version.json %{buildroot}%{_datadir}/%{name}
chmod a-x
%{buildroot}%{_datadir}/%{name}/qml/filters/webvfx_ruttetraizer/ruttetraizer.html
chmod a-x %{buildroot}%{_datadir}/%{name}/qml/filters/webvfx_ruttetraizer/three.js
-# fixes E: wrong-script-end-of-line-encoding
-sed -i 's/\r$//' src/mvcp/{qconsole.h,qconsole.cpp}
-
-# fixes W: spurious-executable-perm
-chmod a-x src/mvcp/{qconsole.cpp,qconsole.h}
-
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.%{name}.Shotcut.desktop
appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/metainfo/org.%{name}.Shotcut.appdata.xml
@@ -187,6 +181,9 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/metainfo/org.%{na
%doc doc
%changelog
+* Tue Aug 07 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.08-1
+- Update to 18.08
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
18.07-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index a3ed68e..c315604 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e48a3bd74e3a5b6519edc7a9cc6a2187 shotcut-18.07.tar.gz
+e771a4249b7f1b0403cc7b24f9ba6d1d shotcut-18.08.tar.gz