[shotcut/f26] Rebuild
commit 9f1a0d92c3d398502401755b72d32e5fb4388b55
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sat Dec 9 16:05:31 2017 +0100
Rebuild
shotcut-noupdatecheck.patch | 28 ----------------------------
1 file changed, 28 deletions(-)
---
diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch
index e5ae26c..f4e34ad 100644
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@ -1,29 +1,13 @@
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()));
@@ -32,7 +16,6 @@ Index: src/mainwindow.cpp
void MainWindow::on_actionRealtime_triggered(bool checked)
@@ -2909,7 +2909,6 @@
->>>>>>> master
void MainWindow::on_actionUpgrade_triggered()
{
showStatusMessage("Checking for upgrade...");
@@ -40,31 +23,20 @@ Index: src/mainwindow.cpp
}
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 {
- showStatusMessage(tr("You are running the latest version of
Shotcut."));
+ showStatusMessage(tr("Use dnf for updates."));
-+
}
reply->deleteLater();
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) {