Hello community,
here is the log from the commit of package clipgrab for openSUSE:Factory checked in at 2018-12-28 12:35:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clipgrab (Old)
and /work/SRC/openSUSE:Factory/.clipgrab.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clipgrab"
Fri Dec 28 12:35:00 2018 rev:6 rq:661442 version:3.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/clipgrab/clipgrab.changes 2018-10-29 14:58:57.306023372 +0100
+++ /work/SRC/openSUSE:Factory/.clipgrab.new.28833/clipgrab.changes 2018-12-28 12:35:15.703966003 +0100
@@ -1,0 +2,7 @@
+Tue Dec 25 23:36:13 UTC 2018 - Luigi Baldoni
+
+- Update to version 3.7.2 (no changelog supplied)
+- Fix build with Qt 5.12
+- Refreshed clipgrab-qt5.patch
+
+-------------------------------------------------------------------
Old:
----
clipgrab-3.7.1.tar.gz
New:
----
clipgrab-3.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clipgrab.spec ++++++
--- /var/tmp/diff_new_pack.a5gxwZ/_old 2018-12-28 12:35:16.191965663 +0100
+++ /var/tmp/diff_new_pack.a5gxwZ/_new 2018-12-28 12:35:16.191965663 +0100
@@ -18,7 +18,7 @@
Name: clipgrab
-Version: 3.7.1
+Version: 3.7.2
Release: 0
Summary: Video downloader
License: GPL-3.0-or-later
@@ -46,6 +46,9 @@
%setup -q
%patch0 -p1
chmod 0644 COPYING
+%if 0%{?suse_version} > 1500
+sed -i 's|QtWebKit/QWebView|QtWebKitWidgets/QWebView|' mainwindow.ui
+%endif
%build
# none too clean, but it beats depending on icns-utils which has problems on non-x86 archs
++++++ clipgrab-3.7.1.tar.gz -> clipgrab-3.7.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/ClipGrab.plist new/clipgrab-3.7.2/ClipGrab.plist
--- old/clipgrab-3.7.1/ClipGrab.plist 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/ClipGrab.plist 2018-11-16 23:22:10.000000000 +0100
@@ -17,6 +17,6 @@
<key>NSHighResolutionCapable</key>
<string>True</string>
<key>CFBundleVersion</key>
- <string>3.7.1</string>
+ <string>3.7.2</string>
</dict>
</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/README new/clipgrab-3.7.2/README
--- old/clipgrab-3.7.1/README 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/README 2018-11-16 23:22:10.000000000 +0100
@@ -1,10 +1,21 @@
-Compiling ClipGrab is really easy.
+#Compiling ClipGrab
-You will only need the Qt4 developer libraries in order to compile the program.
-In addition, ffmpeg (no developer libs necessary) needs to be installed.
+Pre-compiled packages for ClipGrab are available on https://clipgrab.org
+But compiling ClipGrab is really easy!
+
+##Prerequisites
+
+You need to install the Qt4 developer libraries in order to compile the program.
+On Ubuntu and Debian-based system, you can install the necessary libraries like this:
+sudo apt install libqt4-dev libqt4-bin libqtwebkit-dev
+
+Other Linux distributions might have slightly different package names. Packages for Windows and macOS can be downloaded here: https://download.qt.io/archive/qt/4.8/4.8.7/
+
+In addition, ffmpeg (no developer libs necessary) needs to be installed.
-To compile ClipGrab, simply execute
+##Compiling
+To compile ClipGrab, simply execute the following command:
qmake clipgrab.pro && make
-This will create an executable "clipgrab" that you can start via ./clipgrab.
\ No newline at end of file
+This will create an executable "clipgrab" that you can start via ./clipgrab.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/clipgrab.pro new/clipgrab-3.7.2/clipgrab.pro
--- old/clipgrab-3.7.1/clipgrab.pro 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/clipgrab.pro 2018-11-16 23:22:10.000000000 +0100
@@ -94,5 +94,5 @@
OBJECTIVE_SOURCES += savedialog_mac.mm
LIBS += -framework AppKit -framework Foundation
}
-VERSION = 3.7.1
+VERSION = 3.7.2
DEFINES += CLIPGRAB_VERSION=$$VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/mainwindow.cpp new/clipgrab-3.7.2/mainwindow.cpp
--- old/clipgrab-3.7.1/mainwindow.cpp 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/mainwindow.cpp 2018-11-16 23:22:10.000000000 +0100
@@ -280,7 +280,7 @@
if (cg->settings.value("saveLastPath", true) == true)
{
QString targetDir = target;
- targetDir.remove(targetDir.split("/", QString::SkipEmptyParts).last()).replace(QRegExp("/+"), "/");
+ targetDir.remove(targetDir.split("/", QString::SkipEmptyParts).last()).replace(QRegExp("/+$"), "/");
ui.settingsSavedPath->setText(targetDir);
}
currentVideo->setTargetPath(target);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/video.cpp new/clipgrab-3.7.2/video.cpp
--- old/clipgrab-3.7.1/video.cpp 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/video.cpp 2018-11-16 23:22:10.000000000 +0100
@@ -334,7 +334,7 @@
if (title.size() > 0)
{
QStringList charsToBeRemoved;
- charsToBeRemoved << "\\" << "/" << ":" << "*" << "?" << "<" << ">" << "|" << "'" << "\"" << """;
+ charsToBeRemoved << "\\" << "/" << ":" << "*" << "?" << "<" << ">" << "|" << "'" << "\"" << """ << "~" << "^";
title = title.simplified();
if (title[0] == QChar('.'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/video_dailymotion.cpp new/clipgrab-3.7.2/video_dailymotion.cpp
--- old/clipgrab-3.7.1/video_dailymotion.cpp 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/video_dailymotion.cpp 2018-11-16 23:22:10.000000000 +0100
@@ -44,7 +44,7 @@
{
_originalUrl = url;
- for (uint i = 0; i < this->_urlRegExp.length(); i++)
+ for (int i = 0; i < this->_urlRegExp.length(); i++)
{
if (this->_urlRegExp.at(i).indexIn((url)) == -1)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clipgrab-3.7.1/video_youtube.cpp new/clipgrab-3.7.2/video_youtube.cpp
--- old/clipgrab-3.7.1/video_youtube.cpp 2018-10-03 08:13:44.000000000 +0200
+++ new/clipgrab-3.7.2/video_youtube.cpp 2018-11-16 23:22:10.000000000 +0100
@@ -98,10 +98,10 @@
QString video_youtube::getUrlFromFmtLink(QString link)
{
- QRegExp urlExpression;
- urlExpression = QRegExp("(http[s]?[^,]+)");
+ QRegExp clen0 = QRegExp("clen=0");
+ QRegExp urlExpression = QRegExp("(http[s]?[^,]+)");
- if (urlExpression.indexIn(link) > -1)
+ if (clen0.indexIn(link) == -1 && urlExpression.indexIn(link) > -1)
{
QString url = QUrl::fromEncoded(QUrl::fromEncoded(urlExpression.cap(1).toAscii()).toString().toAscii()).toString();
@@ -537,7 +537,6 @@
}
//Extract links
- bool videoIsFmt = true, audioIsFmt = true;
QString videoLink = getFmtLink(qualityLinks, q.video);
QString audioLink = !q.audio.isEmpty() ? getFmtLink(qualityLinks, q.audio) : "";
QStringList videoLinkSegments, audioLinkSegments;
@@ -555,6 +554,13 @@
}
}
+ if (!videoLink.isEmpty()) {
+ videoLink = getUrlFromFmtLink(videoLink);
+ }
+ if (!audioLink.isEmpty()) {
+ audioLink = getUrlFromFmtLink(audioLink);
+ }
+
//Try MPEG-Dash if Fmt link wasn’t found
if (videoLink.isEmpty() || (!q.audio.isEmpty() && audioLink.isEmpty()))
{
@@ -571,14 +577,12 @@
videoLink = dashQualityLinks.at(j).at(0);
videoLinkSegments = QStringList(dashQualityLinks.at(j));
videoLinkSegments.removeFirst();
- videoIsFmt = false;
}
else if (audioLink.isEmpty() && itagExpression.cap(1) == q.audio)
{
audioLink = dashQualityLinks.at(j).at(0);
audioLinkSegments = QStringList(dashQualityLinks.at(j));
audioLinkSegments.removeFirst();
- audioIsFmt = false;
}
}
@@ -595,7 +599,6 @@
audioLink = dashQualityLinks.at(j).at(0);
audioLinkSegments = QStringList(dashQualityLinks.at(j));
audioLinkSegments.removeFirst();
- audioIsFmt = false;
}
}
@@ -624,23 +627,19 @@
}
}
- if (videoIsFmt)
- {
- newQuality.videoUrl = getUrlFromFmtLink(videoLink);
- }
- else
+ newQuality.videoUrl = videoLink;
+ if (!videoLinkSegments.isEmpty())
{
- newQuality.videoUrl = videoLink;
newQuality.videoSegments = videoLinkSegments;
}
- if (!audioLink.isEmpty() && audioIsFmt)
+ if (!audioLink.isEmpty())
{
- newQuality.audioUrl = getUrlFromFmtLink(audioLink);
- }
- else if (!audioLink.isEmpty()) {
newQuality.audioUrl = audioLink;
- newQuality.audioSegments = audioLinkSegments;
+ if (!audioLinkSegments.isEmpty())
+ {
+ newQuality.audioSegments = audioLinkSegments;
+ }
}
++++++ clipgrab-qt5.patch ++++++
--- /var/tmp/diff_new_pack.a5gxwZ/_old 2018-12-28 12:35:16.295965590 +0100
+++ /var/tmp/diff_new_pack.a5gxwZ/_new 2018-12-28 12:35:16.299965586 +0100
@@ -15,9 +15,10 @@
from the Arch AUR project.
---
-diff -udp clipgrab-3.7.1.orig/clipgrab.cpp clipgrab-3.7.1/clipgrab.cpp
---- clipgrab-3.7.1.orig/clipgrab.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/clipgrab.cpp 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/clipgrab.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/clipgrab.cpp
++++ clipgrab-3.7.2/clipgrab.cpp
@@ -23,6 +23,13 @@
#include "clipgrab.h"
@@ -59,9 +60,10 @@
QNetworkAccessManager* updateInfoNAM = new QNetworkAccessManager;
updateInfoNAM->get(updateInfoRequest);
connect(updateInfoNAM, SIGNAL(finished(QNetworkReply*)), this, SLOT(parseUpdateInfo(QNetworkReply*)));
-diff -udp clipgrab-3.7.1.orig/clipgrab.h clipgrab-3.7.1/clipgrab.h
---- clipgrab-3.7.1.orig/clipgrab.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/clipgrab.h 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/clipgrab.h
+===================================================================
+--- clipgrab-3.7.2.orig/clipgrab.h
++++ clipgrab-3.7.2/clipgrab.h
@@ -29,6 +29,10 @@
#include <QtXml>
#include <QtDebug>
@@ -73,9 +75,10 @@
#include "video.h"
#include "video_youtube.h"
#include "video_vimeo.h"
-diff -udp clipgrab-3.7.1.orig/clipgrab.pro clipgrab-3.7.1/clipgrab.pro
---- clipgrab-3.7.1.orig/clipgrab.pro 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/clipgrab.pro 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/clipgrab.pro
+===================================================================
+--- clipgrab-3.7.2.orig/clipgrab.pro
++++ clipgrab-3.7.2/clipgrab.pro
@@ -1,16 +1,24 @@
# #####################################################################
# Automatically generated by qmake (2.01a) Mo 26. Okt 18:26:00 2009
@@ -127,9 +130,10 @@
CODECFORTR = UTF-8
win32:RC_FILE = windows_icon.rc
macx {
-diff -udp clipgrab-3.7.1.orig/http_handler.cpp clipgrab-3.7.1/http_handler.cpp
---- clipgrab-3.7.1.orig/http_handler.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/http_handler.cpp 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/http_handler.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/http_handler.cpp
++++ clipgrab-3.7.2/http_handler.cpp
@@ -45,14 +45,22 @@ QNetworkRequest http_handler::createRequ
QNetworkReply* http_handler::addDownload(QString url, bool chunked, QByteArray postData, QStringList segments)
{
@@ -206,9 +210,10 @@
for (int j = 0; j < parsedCookies.length(); j++)
{
cookies.append(parsedCookies.at(j));
-diff -udp clipgrab-3.7.1.orig/main.cpp clipgrab-3.7.1/main.cpp
---- clipgrab-3.7.1.orig/main.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/main.cpp 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/main.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/main.cpp
++++ clipgrab-3.7.2/main.cpp
@@ -19,9 +19,14 @@
along with ClipGrab. If not, see http://www.gnu.org/licenses/.
*/
@@ -262,9 +267,10 @@
cg.getUpdateInfo();
return app.exec();
}
-diff -udp clipgrab-3.7.1.orig/mainwindow.cpp clipgrab-3.7.1/mainwindow.cpp
---- clipgrab-3.7.1.orig/mainwindow.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/mainwindow.cpp 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/mainwindow.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/mainwindow.cpp
++++ clipgrab-3.7.2/mainwindow.cpp
@@ -23,7 +23,23 @@
#include "mainwindow.h"
@@ -378,9 +384,10 @@
#endif
setWindowTitle("ClipGrab - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " %");
}
-diff -udp clipgrab-3.7.1.orig/mainwindow.h clipgrab-3.7.1/mainwindow.h
---- clipgrab-3.7.1.orig/mainwindow.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/mainwindow.h 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/mainwindow.h
+===================================================================
+--- clipgrab-3.7.2.orig/mainwindow.h
++++ clipgrab-3.7.2/mainwindow.h
@@ -24,10 +24,14 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
@@ -409,9 +416,10 @@
~MainWindow();
void init();
-diff -udp clipgrab-3.7.1.orig/message_dialog.h clipgrab-3.7.1/message_dialog.h
---- clipgrab-3.7.1.orig/message_dialog.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/message_dialog.h 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/message_dialog.h
+===================================================================
+--- clipgrab-3.7.2.orig/message_dialog.h
++++ clipgrab-3.7.2/message_dialog.h
@@ -1,9 +1,14 @@
#ifndef MESSAGE_DIALOG_H
#define MESSAGE_DIALOG_H
@@ -428,9 +436,10 @@
namespace Ui {
class messageDialog;
-diff -udp clipgrab-3.7.1.orig/notifications.h clipgrab-3.7.1/notifications.h
---- clipgrab-3.7.1.orig/notifications.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/notifications.h 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/notifications.h
+===================================================================
+--- clipgrab-3.7.2.orig/notifications.h
++++ clipgrab-3.7.2/notifications.h
@@ -25,6 +25,11 @@
#define FOO_H
@@ -443,9 +452,10 @@
#ifdef Q_WS_MAC64
#include "notifications_mac.h"
-diff -udp clipgrab-3.7.1.orig/video.cpp clipgrab-3.7.1/video.cpp
---- clipgrab-3.7.1.orig/video.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video.cpp 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/video.cpp
++++ clipgrab-3.7.2/video.cpp
@@ -195,7 +195,11 @@ void video::changeProgress(qint64 bytesR
this->_progressBar->setFormat("%p%");
this->_progressBar->setMaximum(bytesTotal);
@@ -458,9 +468,10 @@
}
}
else
-diff -udp clipgrab-3.7.1.orig/video_dailymotion.cpp clipgrab-3.7.1/video_dailymotion.cpp
---- clipgrab-3.7.1.orig/video_dailymotion.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_dailymotion.cpp 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/video_dailymotion.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/video_dailymotion.cpp
++++ clipgrab-3.7.2/video_dailymotion.cpp
@@ -22,6 +22,9 @@
@@ -471,9 +482,10 @@
video_dailymotion::video_dailymotion()
{
-diff -udp clipgrab-3.7.1.orig/video_dailymotion.h clipgrab-3.7.1/video_dailymotion.h
---- clipgrab-3.7.1.orig/video_dailymotion.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_dailymotion.h 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/video_dailymotion.h
+===================================================================
+--- clipgrab-3.7.2.orig/video_dailymotion.h
++++ clipgrab-3.7.2/video_dailymotion.h
@@ -23,8 +23,9 @@
#ifndef VIDEO_DAILYMOTION_H
@@ -485,9 +497,10 @@
struct dailymotion_quality
{
-diff -udp clipgrab-3.7.1.orig/video_facebook.cpp clipgrab-3.7.1/video_facebook.cpp
---- clipgrab-3.7.1.orig/video_facebook.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_facebook.cpp 2018-10-27 20:16:12.351022193 +0200
+Index: clipgrab-3.7.2/video_facebook.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/video_facebook.cpp
++++ clipgrab-3.7.2/video_facebook.cpp
@@ -22,6 +22,10 @@
@@ -523,9 +536,10 @@
return;
}
-diff -udp clipgrab-3.7.1.orig/video_facebook.h clipgrab-3.7.1/video_facebook.h
---- clipgrab-3.7.1.orig/video_facebook.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_facebook.h 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video_facebook.h
+===================================================================
+--- clipgrab-3.7.2.orig/video_facebook.h
++++ clipgrab-3.7.2/video_facebook.h
@@ -24,9 +24,9 @@
#ifndef VIDEO_FACEBOOK_H
#define VIDEO_FACEBOOK_H
@@ -537,9 +551,10 @@
class video_facebook : public video
{
-diff -udp clipgrab-3.7.1.orig/video.h clipgrab-3.7.1/video.h
---- clipgrab-3.7.1.orig/video.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video.h 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video.h
+===================================================================
+--- clipgrab-3.7.2.orig/video.h
++++ clipgrab-3.7.2/video.h
@@ -26,6 +26,10 @@
#include <QtGui>
@@ -551,9 +566,10 @@
#include "converter.h"
#include "converter_ffmpeg.h"
#include "http_handler.h"
-diff -udp clipgrab-3.7.1.orig/video_heuristic.cpp clipgrab-3.7.1/video_heuristic.cpp
---- clipgrab-3.7.1.orig/video_heuristic.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_heuristic.cpp 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video_heuristic.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/video_heuristic.cpp
++++ clipgrab-3.7.2/video_heuristic.cpp
@@ -124,7 +124,11 @@ void video_heuristic::parseVideo(QString
{
videoQuality newQuality;
@@ -578,9 +594,10 @@
newQuality.quality = tr("normal");
_supportedQualities.append(newQuality);
emit analysingFinished();
-diff -udp clipgrab-3.7.1.orig/video_vimeo.h clipgrab-3.7.1/video_vimeo.h
---- clipgrab-3.7.1.orig/video_vimeo.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_vimeo.h 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video_vimeo.h
+===================================================================
+--- clipgrab-3.7.2.orig/video_vimeo.h
++++ clipgrab-3.7.2/video_vimeo.h
@@ -24,10 +24,15 @@
#ifndef video_vimeo_H
#define video_vimeo_H
@@ -600,9 +617,10 @@
#include "ui_login_dialog.h"
class video_vimeo : public video
-diff -udp clipgrab-3.7.1.orig/video_youtube.cpp clipgrab-3.7.1/video_youtube.cpp
---- clipgrab-3.7.1.orig/video_youtube.cpp 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_youtube.cpp 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video_youtube.cpp
+===================================================================
+--- clipgrab-3.7.2.orig/video_youtube.cpp
++++ clipgrab-3.7.2/video_youtube.cpp
@@ -22,7 +22,11 @@
@@ -617,7 +635,7 @@
{
@@ -103,7 +107,11 @@ QString video_youtube::getUrlFromFmtLink
- if (urlExpression.indexIn(link) > -1)
+ if (clen0.indexIn(link) == -1 && urlExpression.indexIn(link) > -1)
{
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
QString url = QUrl::fromEncoded(QUrl::fromEncoded(urlExpression.cap(1).toAscii()).toString().toAscii()).toString();
@@ -627,7 +645,7 @@
QRegExp sigExpression;
sigExpression = QRegExp("(?:^|[^a-zA-Z])[,]?s(ig)?=([^,]+)");
-@@ -674,7 +682,11 @@ void video_youtube::parseVideo(QString h
+@@ -673,7 +681,11 @@ void video_youtube::parseVideo(QString h
{
videoQuality newQuality;
newQuality.quality = tr("normal");
@@ -639,9 +657,10 @@
_supportedQualities.append(newQuality);
}
else
-diff -udp clipgrab-3.7.1.orig/video_youtube.h clipgrab-3.7.1/video_youtube.h
---- clipgrab-3.7.1.orig/video_youtube.h 2018-10-03 08:13:44.000000000 +0200
-+++ clipgrab-3.7.1/video_youtube.h 2018-10-27 20:16:12.355021553 +0200
+Index: clipgrab-3.7.2/video_youtube.h
+===================================================================
+--- clipgrab-3.7.2.orig/video_youtube.h
++++ clipgrab-3.7.2/video_youtube.h
@@ -24,13 +24,17 @@
#ifndef video_YOUTUBE_H
#define video_YOUTUBE_H