[shotcut/f26: 2/2] Update to 7.12
commit 6b1bde98f8e5985d58646aac956ab51c26704ccc
Merge: a87aa50 1eb8a0a
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:34:51 2017 +0100
Update to 7.12
.gitignore | 4 ++++
shotcut-noupdatecheck.patch | 28 +++++++++++++++++++++++++++-
shotcut.spec | 5 ++++-
sources | 4 ++++
4 files changed, 39 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 5858a60,364d3da..4025d64
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,6 @@@
/shotcut-17.10.tar.gz
++<<<<<<< HEAD
+/shotcut-17.11.tar.gz
++=======
+ /shotcut-17.12.tar.gz
++>>>>>>> master
diff --cc shotcut-noupdatecheck.patch
index c06a704,f4e34ad..e5ae26c
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@@ -1,21 -1,21 +1,38 @@@
Index: src/mainwindow.cpp
===================================================================
++<<<<<<< HEAD
+--- 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 @@
++=======
+ --- 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 @@
++>>>>>>> master
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()));
++<<<<<<< HEAD
+- 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 */);
+ }
+
+ void MainWindow::on_actionRealtime_triggered(bool checked)
+@@ -2908,7 +2908,7 @@
++=======
+ - 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)
+ @@ -2909,7 +2909,6 @@
++>>>>>>> master
void MainWindow::on_actionUpgrade_triggered()
{
showStatusMessage("Checking for upgrade...");
@@@ -23,8 -23,7 +40,11 @@@
}
void MainWindow::on_actionOpenXML_triggered()
++<<<<<<< HEAD
+@@ -3040,7 +3040,8 @@
++=======
+ @@ -3041,7 +3040,7 @@
++>>>>>>> master
m_upgradeUrl = json.object().value("url").toString();
showStatusMessage(action, 10 /* seconds */);
} else {
@@@ -36,9 -34,9 +56,15 @@@
return;
Index: src/src.pro
===================================================================
++<<<<<<< HEAD
+--- 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 @@
++=======
+ --- 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 @@
++>>>>>>> master
LIBS += -lCuteLogger -lmvcp -lpthread
isEmpty(SHOTCUT_VERSION) {
diff --cc sources
index d2f6174,8625384..1de741a
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+9cb3b6a9a534dd7d616698748b75cac8 shotcut-17.11.tar.gz
++=======
+ f2d1b4bacdee13bb6b21ee9d38c2e7fc shotcut-17.12.tar.gz
++>>>>>>> master