Refresh patches

diff --git a/debian/changelog b/debian/changelog
index 8781ffa98fc46d76d2c065f6addfe53c9e6f7bef..bca320185d06d661d9e97cac2247f70c23303a24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 minitube (2.9-1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * Refresh patches
 
  -- Jakob Haufe <sur5r@sur5r.net>  Sat, 11 Aug 2018 17:28:13 +0000
 

diff --git a/debian/patches/disable-update-check b/debian/patches/disable-update-check
index 93bd0c527522cb98ba036065b990fe8da8a227c5..fe4b5677c12b94eabcea8f60c9868e87a2f0a207 100644 (file)
--- a/debian/patches/disable-update-check
+++ b/debian/patches/disable-update-check
@@ -1,11 +1,11 @@
 Description: Disable update check as it's useless for a packaged version
 Author: Jakob Haufe <sur5r@sur5r.net>
 
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 4375716..e0aa901 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -232,7 +232,7 @@ void MainWindow::lazyInit() {
+Index: minitube/src/mainwindow.cpp
+===================================================================
+--- minitube.orig/src/mainwindow.cpp
++++ minitube/src/mainwindow.cpp
+@@ -218,7 +218,7 @@ void MainWindow::lazyInit() {
  
      ChannelAggregator::instance()->start();
  

diff --git a/debian/patches/proper-tempfiles b/debian/patches/proper-tempfiles
index f36b48b645f2b3b41bb1ed80584fa6e4e6616a0f..88268c53f424cd535e3b4d2576dcbb999bd948c8 100644 (file)
--- a/debian/patches/proper-tempfiles
+++ b/debian/patches/proper-tempfiles
@@ -5,15 +5,15 @@ Description: Do proper temporary file creation
 Author: Jakob Haufe <sur5r@sur5r.net>
 Bug-Debian: http://bugs.debian.org/644935
 
-diff --git a/src/temporary.cpp b/src/temporary.cpp
-index 913d244..3e5e89f 100644
---- a/src/temporary.cpp
-+++ b/src/temporary.cpp
-@@ -22,51 +22,26 @@ $END_LICENSE */
+Index: minitube/src/temporary.cpp
+===================================================================
+--- minitube.orig/src/temporary.cpp
++++ minitube/src/temporary.cpp
+@@ -21,51 +21,26 @@ $END_LICENSE */
+ #include "temporary.h"
  #include "constants.h"
- #include "compatibility/pathsservice.h"
  
--static QList<QString> paths;
+-static QVector<QString> paths;
 -#ifdef APP_LINUX
 -static QString userName;
 -#endif
@@ -22,7 +22,7 @@ index 913d244..3e5e89f 100644
  Temporary::Temporary() { }
  
  QString Temporary::filename() {
--    static const QString tempDir = Paths::getTempLocation();
+-    static const QString tempDir = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
 +    QTemporaryFile *tempfile = new QTemporaryFile(QDir::tempPath() + "/" + Constants::UNIX_NAME + "-XXXXXX");
 +    tempfiles += tempfile;
  
@@ -72,11 +72,10 @@ index 913d244..3e5e89f 100644
 +        delete tempfile;
      }
  }
-
-diff --git a/src/temporary.h b/src/temporary.h
-index de5e24d..b8fbba9 100644
---- a/src/temporary.h
-+++ b/src/temporary.h
+Index: minitube/src/temporary.h
+===================================================================
+--- minitube.orig/src/temporary.h
++++ minitube/src/temporary.h
 @@ -23,6 +23,7 @@ $END_LICENSE */
  
  #include <QtCore>