From 9f627e649828cbe90f17d7ff064329e36673d0e3 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sat, 20 Oct 2018 23:49:17 -0300
Subject: [PATCH] clipgrab: update to 3.7.1.

---
 srcpkgs/clipgrab/patches/clipgrab-qt5.patch | 140 +++++++++-----------
 srcpkgs/clipgrab/template                   |   6 +-
 2 files changed, 67 insertions(+), 79 deletions(-)

diff --git a/srcpkgs/clipgrab/patches/clipgrab-qt5.patch b/srcpkgs/clipgrab/patches/clipgrab-qt5.patch
index 5098cbc1a45..95977218789 100644
--- a/srcpkgs/clipgrab/patches/clipgrab-qt5.patch
+++ b/srcpkgs/clipgrab/patches/clipgrab-qt5.patch
@@ -1,6 +1,6 @@
 diff -Naur -x '.git*' clipgrab-main/clipgrab.cpp clipgrab-qt5/clipgrab.cpp
---- clipgrab-main/clipgrab.cpp	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/clipgrab.cpp	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/clipgrab.cpp	2018-10-10 11:45:58.383957000 +0200
++++ clipgrab-qt5/clipgrab.cpp	2018-10-10 09:41:24.146033000 +0200
 @@ -23,6 +23,13 @@
  
  #include "clipgrab.h"
@@ -43,8 +43,8 @@ diff -Naur -x '.git*' clipgrab-main/clipgrab.cpp clipgrab-qt5/clipgrab.cpp
      updateInfoNAM->get(updateInfoRequest);
      connect(updateInfoNAM, SIGNAL(finished(QNetworkReply*)), this, SLOT(parseUpdateInfo(QNetworkReply*)));
 diff -Naur -x '.git*' clipgrab-main/clipgrab.h clipgrab-qt5/clipgrab.h
---- clipgrab-main/clipgrab.h	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/clipgrab.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/clipgrab.h	2018-10-10 11:45:58.384140000 +0200
++++ clipgrab-qt5/clipgrab.h	2018-10-10 09:41:24.146276000 +0200
 @@ -29,6 +29,10 @@
  #include <QtXml>
  #include <QtDebug>
@@ -57,8 +57,8 @@ diff -Naur -x '.git*' clipgrab-main/clipgrab.h clipgrab-qt5/clipgrab.h
  #include "video_youtube.h"
  #include "video_vimeo.h"
 diff -Naur -x '.git*' clipgrab-main/clipgrab.pro clipgrab-qt5/clipgrab.pro
---- clipgrab-main/clipgrab.pro	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/clipgrab.pro	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/clipgrab.pro	2018-10-10 11:47:49.068510000 +0200
++++ clipgrab-qt5/clipgrab.pro	2018-10-10 11:47:00.926979000 +0200
 @@ -1,16 +1,24 @@
  # #####################################################################
  # Automatically generated by qmake (2.01a) Mo 26. Okt 18:26:00 2009
@@ -111,8 +111,8 @@ diff -Naur -x '.git*' clipgrab-main/clipgrab.pro clipgrab-qt5/clipgrab.pro
  win32:RC_FILE = windows_icon.rc
  macx { 
 diff -Naur -x '.git*' clipgrab-main/http_handler.cpp clipgrab-qt5/http_handler.cpp
---- clipgrab-main/http_handler.cpp	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/http_handler.cpp	2018-08-22 10:14:16.973435822 +0200
+--- clipgrab-main/http_handler.cpp	2018-10-10 11:45:58.384600000 +0200
++++ clipgrab-qt5/http_handler.cpp	2018-06-05 15:47:16.000000000 +0200
 @@ -45,14 +45,22 @@
  QNetworkReply* http_handler::addDownload(QString url, bool chunked, QByteArray postData, QStringList segments)
  {
@@ -190,8 +190,8 @@ diff -Naur -x '.git*' clipgrab-main/http_handler.cpp clipgrab-qt5/http_handler.c
          {
              cookies.append(parsedCookies.at(j));
 diff -Naur -x '.git*' clipgrab-main/main.cpp clipgrab-qt5/main.cpp
---- clipgrab-main/main.cpp	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/main.cpp	2018-08-22 10:14:17.113440024 +0200
+--- clipgrab-main/main.cpp	2018-10-10 11:45:58.384773000 +0200
++++ clipgrab-qt5/main.cpp	2018-06-05 15:47:16.000000000 +0200
 @@ -19,9 +19,14 @@
      along with ClipGrab.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -246,8 +246,8 @@ diff -Naur -x '.git*' clipgrab-main/main.cpp clipgrab-qt5/main.cpp
      return app.exec();
  }
 diff -Naur -x '.git*' clipgrab-main/mainwindow.cpp clipgrab-qt5/mainwindow.cpp
---- clipgrab-main/mainwindow.cpp	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/mainwindow.cpp	2018-08-22 10:14:17.163441526 +0200
+--- clipgrab-main/mainwindow.cpp	2018-10-10 11:45:58.385273000 +0200
++++ clipgrab-qt5/mainwindow.cpp	2018-10-10 09:41:24.147874000 +0200
 @@ -23,7 +23,23 @@
  
  #include "mainwindow.h"
@@ -362,8 +362,8 @@ diff -Naur -x '.git*' clipgrab-main/mainwindow.cpp clipgrab-qt5/mainwindow.cpp
          setWindowTitle("ClipGrab - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " %");
      }
 diff -Naur -x '.git*' clipgrab-main/mainwindow.h clipgrab-qt5/mainwindow.h
---- clipgrab-main/mainwindow.h	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/mainwindow.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/mainwindow.h	2018-10-10 11:45:58.385468000 +0200
++++ clipgrab-qt5/mainwindow.h	2018-10-10 09:41:24.148113000 +0200
 @@ -24,10 +24,14 @@
  #ifndef MAINWINDOW_H
  #define MAINWINDOW_H
@@ -393,8 +393,8 @@ diff -Naur -x '.git*' clipgrab-main/mainwindow.h clipgrab-qt5/mainwindow.h
      void init();
  
 diff -Naur -x '.git*' clipgrab-main/message_dialog.h clipgrab-qt5/message_dialog.h
---- clipgrab-main/message_dialog.h	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/message_dialog.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/message_dialog.h	2018-10-10 11:45:58.385612000 +0200
++++ clipgrab-qt5/message_dialog.h	2018-06-05 15:47:16.000000000 +0200
 @@ -1,9 +1,14 @@
  #ifndef MESSAGE_DIALOG_H
  #define MESSAGE_DIALOG_H
@@ -412,8 +412,8 @@ diff -Naur -x '.git*' clipgrab-main/message_dialog.h clipgrab-qt5/message_dialog
  namespace Ui {
  class messageDialog;
 diff -Naur -x '.git*' clipgrab-main/notifications.h clipgrab-qt5/notifications.h
---- clipgrab-main/notifications.h	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/notifications.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/notifications.h	2018-10-10 11:45:58.385983000 +0200
++++ clipgrab-qt5/notifications.h	2018-06-05 15:47:16.000000000 +0200
 @@ -25,6 +25,11 @@
  #define FOO_H
  
@@ -426,24 +426,9 @@ diff -Naur -x '.git*' clipgrab-main/notifications.h clipgrab-qt5/notifications.h
  
  #ifdef Q_WS_MAC64
  #include "notifications_mac.h"
-diff -Naur -x '.git*' clipgrab-main/video.cpp clipgrab-qt5/video.cpp
---- clipgrab-main/video.cpp	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video.cpp	2018-08-22 10:14:16.973435822 +0200
-@@ -195,7 +195,11 @@
-             this->_progressBar->setFormat("%p%");
-             this->_progressBar->setMaximum(bytesTotal);
-             this->_progressBar->setValue(bytesReceived);
-+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-             setToolTip("<strong>" + tr("Downloading ...") + "</strong><br />" + QString::number((double)(bytesReceived)/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)bytesTotal/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB"));
-+#else
-+            setToolTip("<strong>" + tr("Downloading ...") + "</strong><br />" + QString::number((double)(bytesReceived)/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)bytesTotal/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB"));
-+#endif
-         }
-     }
-     else
 diff -Naur -x '.git*' clipgrab-main/video_dailymotion.cpp clipgrab-qt5/video_dailymotion.cpp
---- clipgrab-main/video_dailymotion.cpp	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video_dailymotion.cpp	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/video_dailymotion.cpp	2018-10-10 11:47:49.068974000 +0200
++++ clipgrab-qt5/video_dailymotion.cpp	2018-10-10 11:47:00.927165000 +0200
 @@ -22,6 +22,9 @@
  
  
@@ -454,21 +439,9 @@ diff -Naur -x '.git*' clipgrab-main/video_dailymotion.cpp clipgrab-qt5/video_dai
  
  video_dailymotion::video_dailymotion()
  {
-@@ -73,7 +76,11 @@
-         _title = QString(expression.cap(1));
-         _title = _title.replace(QRegExp("- Dailymotion$"), "");
- 
-+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-         html = QUrl::fromEncoded(html.toAscii()).toString(QUrl::None);
-+#else
-+        html = QUrl::fromEncoded(html.toLatin1()).toString(QUrl::None);
-+#endif
-         expression = QRegExp("var __PLAYER_CONFIG__\\s*=\\s*(\\{.+\\});");
-         expression.setMinimal(true);
- 
 diff -Naur -x '.git*' clipgrab-main/video_dailymotion.h clipgrab-qt5/video_dailymotion.h
---- clipgrab-main/video_dailymotion.h	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video_dailymotion.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/video_dailymotion.h	2018-10-10 11:47:49.069372000 +0200
++++ clipgrab-qt5/video_dailymotion.h	2018-10-10 11:47:00.927336000 +0200
 @@ -23,8 +23,9 @@
  
  #ifndef VIDEO_DAILYMOTION_H
@@ -481,8 +454,8 @@ diff -Naur -x '.git*' clipgrab-main/video_dailymotion.h clipgrab-qt5/video_daily
  struct dailymotion_quality
  {
 diff -Naur -x '.git*' clipgrab-main/video_facebook.cpp clipgrab-qt5/video_facebook.cpp
---- clipgrab-main/video_facebook.cpp	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/video_facebook.cpp	2018-08-22 13:41:58.258554815 +0200
+--- clipgrab-main/video_facebook.cpp	2018-10-10 11:45:58.387121000 +0200
++++ clipgrab-qt5/video_facebook.cpp	2018-10-10 09:41:24.148378000 +0200
 @@ -22,6 +22,10 @@
  
  
@@ -519,8 +492,8 @@ diff -Naur -x '.git*' clipgrab-main/video_facebook.cpp clipgrab-qt5/video_facebo
      }
  
 diff -Naur -x '.git*' clipgrab-main/video_facebook.h clipgrab-qt5/video_facebook.h
---- clipgrab-main/video_facebook.h	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video_facebook.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/video_facebook.h	2018-10-10 11:45:58.387308000 +0200
++++ clipgrab-qt5/video_facebook.h	2018-06-05 15:47:16.000000000 +0200
 @@ -24,9 +24,9 @@
  #ifndef VIDEO_FACEBOOK_H
  #define VIDEO_FACEBOOK_H
@@ -532,23 +505,9 @@ diff -Naur -x '.git*' clipgrab-main/video_facebook.h clipgrab-qt5/video_facebook
  
  class video_facebook : public video
  {
-diff -Naur -x '.git*' clipgrab-main/video.h clipgrab-qt5/video.h
---- clipgrab-main/video.h	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video.h	2018-08-22 10:14:17.063438522 +0200
-@@ -26,6 +26,10 @@
- 
- #include <QtGui>
- #include <QtNetwork>
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include <QtWidgets/QTreeWidgetItem>
-+#include <QtWidgets/QProgressBar>
-+#endif
- #include "converter.h"
- #include "converter_ffmpeg.h"
- #include "http_handler.h"
 diff -Naur -x '.git*' clipgrab-main/video_heuristic.cpp clipgrab-qt5/video_heuristic.cpp
---- clipgrab-main/video_heuristic.cpp	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video_heuristic.cpp	2018-08-22 10:14:16.973435822 +0200
+--- clipgrab-main/video_heuristic.cpp	2018-10-10 11:45:58.387486000 +0200
++++ clipgrab-qt5/video_heuristic.cpp	2018-06-05 15:47:16.000000000 +0200
 @@ -124,7 +124,11 @@
          {
              videoQuality newQuality;
@@ -574,8 +533,8 @@ diff -Naur -x '.git*' clipgrab-main/video_heuristic.cpp clipgrab-qt5/video_heuri
              _supportedQualities.append(newQuality);
              emit analysingFinished();
 diff -Naur -x '.git*' clipgrab-main/video_vimeo.h clipgrab-qt5/video_vimeo.h
---- clipgrab-main/video_vimeo.h	2018-08-22 10:18:56.932534696 +0200
-+++ clipgrab-qt5/video_vimeo.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/video_vimeo.h	2018-10-10 11:45:58.387671000 +0200
++++ clipgrab-qt5/video_vimeo.h	2018-06-05 15:47:16.000000000 +0200
 @@ -24,10 +24,15 @@
  #ifndef video_vimeo_H
  #define video_vimeo_H
@@ -596,8 +555,8 @@ diff -Naur -x '.git*' clipgrab-main/video_vimeo.h clipgrab-qt5/video_vimeo.h
  
  class video_vimeo : public video
 diff -Naur -x '.git*' clipgrab-main/video_youtube.cpp clipgrab-qt5/video_youtube.cpp
---- clipgrab-main/video_youtube.cpp	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/video_youtube.cpp	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/video_youtube.cpp	2018-10-10 11:47:49.070132000 +0200
++++ clipgrab-qt5/video_youtube.cpp	2018-10-10 11:47:00.927690000 +0200
 @@ -22,7 +22,11 @@
  
  
@@ -622,7 +581,7 @@ diff -Naur -x '.git*' clipgrab-main/video_youtube.cpp clipgrab-qt5/video_youtube
  
          QRegExp sigExpression;
          sigExpression = QRegExp("(?:^|[^a-zA-Z])[,]?s(ig)?=([^,]+)");
-@@ -665,7 +673,11 @@
+@@ -674,7 +682,11 @@
              {
                  videoQuality newQuality;
                  newQuality.quality = tr("normal");
@@ -635,8 +594,8 @@ diff -Naur -x '.git*' clipgrab-main/video_youtube.cpp clipgrab-qt5/video_youtube
              }
              else
 diff -Naur -x '.git*' clipgrab-main/video_youtube.h clipgrab-qt5/video_youtube.h
---- clipgrab-main/video_youtube.h	2018-08-22 10:19:07.672906746 +0200
-+++ clipgrab-qt5/video_youtube.h	2018-08-22 10:14:17.063438522 +0200
+--- clipgrab-main/video_youtube.h	2018-10-10 11:45:58.388234000 +0200
++++ clipgrab-qt5/video_youtube.h	2018-10-10 09:41:24.149013000 +0200
 @@ -24,13 +24,17 @@
  #ifndef video_YOUTUBE_H
  #define video_YOUTUBE_H
@@ -660,4 +619,33 @@ diff -Naur -x '.git*' clipgrab-main/video_youtube.h clipgrab-qt5/video_youtube.h
  
  struct fmtQuality
  {
+diff -Naur -x '.git*' clipgrab-main/video.cpp clipgrab-qt5/video.cpp
+--- clipgrab-main/video.cpp	2018-10-10 11:45:58.386216000 +0200
++++ clipgrab-qt5/video.cpp	2018-06-05 15:47:16.000000000 +0200
+@@ -195,7 +195,11 @@
+             this->_progressBar->setFormat("%p%");
+             this->_progressBar->setMaximum(bytesTotal);
+             this->_progressBar->setValue(bytesReceived);
++#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+             setToolTip("<strong>" + tr("Downloading ...") + "</strong><br />" + QString::number((double)(bytesReceived)/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)bytesTotal/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB"));
++#else
++            setToolTip("<strong>" + tr("Downloading ...") + "</strong><br />" + QString::number((double)(bytesReceived)/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)bytesTotal/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB"));
++#endif
+         }
+     }
+     else
+diff -Naur -x '.git*' clipgrab-main/video.h clipgrab-qt5/video.h
+--- clipgrab-main/video.h	2018-10-10 11:45:58.386404000 +0200
++++ clipgrab-qt5/video.h	2018-06-05 15:47:16.000000000 +0200
+@@ -26,6 +26,10 @@
+ 
+ #include <QtGui>
+ #include <QtNetwork>
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include <QtWidgets/QTreeWidgetItem>
++#include <QtWidgets/QProgressBar>
++#endif
+ #include "converter.h"
+ #include "converter_ffmpeg.h"
+ #include "http_handler.h"
 
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index e3f37a76e27..33779904278 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,7 +1,7 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.7.0
-revision=2
+version=3.7.1
+revision=1
 patch_args="-Np1"
 build_style=qmake
 configure_args=clipgrab.pro
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3.0-or-later"
 homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=6445a5ef7d3e2f6ffe6c4a18e489d3b451c4b5ebb5ea3efe11d0788f8210a167
+checksum=addf58c027f8f0e01acb0d1d6cdb9fd17c356d4fe5e2d768b94e531b599d1f2e
 
 do_install() {
 	vbin clipgrab