Hello community, here is the log from the commit of package clipgrab for openSUSE:Factory checked in at 2018-04-17 11:17:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clipgrab (Old) and /work/SRC/openSUSE:Factory/.clipgrab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clipgrab" Tue Apr 17 11:17:58 2018 rev:4 rq:597104 version:3.6.8 Changes: -------- --- /work/SRC/openSUSE:Factory/clipgrab/clipgrab.changes 2017-08-18 15:06:17.394217770 +0200 +++ /work/SRC/openSUSE:Factory/.clipgrab.new/clipgrab.changes 2018-04-17 11:18:00.373036762 +0200 @@ -1,0 +2,6 @@ +Sun Apr 15 15:31:11 UTC 2018 - [email protected] + +- Update to version 3.6.8 (no changelog supplied) +- Rebase clipgrab-qt5.patch + +------------------------------------------------------------------- Old: ---- clipgrab-3.6.5.tar.gz New: ---- clipgrab-3.6.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clipgrab.spec ++++++ --- /var/tmp/diff_new_pack.fvuIRj/_old 2018-04-17 11:18:00.997007512 +0200 +++ /var/tmp/diff_new_pack.fvuIRj/_new 2018-04-17 11:18:01.001007324 +0200 @@ -1,7 +1,7 @@ # # spec file for package clipgrab # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2008-2013 [email protected] # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: clipgrab -Version: 3.6.5 +Version: 3.6.8 Release: 0 Summary: Video downloader License: GPL-3.0+ ++++++ clipgrab-3.6.5.tar.gz -> clipgrab-3.6.8.tar.gz ++++++ ++++ 26771 lines of diff (skipped) ++++++ clipgrab-qt5.patch ++++++ --- /var/tmp/diff_new_pack.fvuIRj/_old 2018-04-17 11:18:01.160999824 +0200 +++ /var/tmp/diff_new_pack.fvuIRj/_new 2018-04-17 11:18:01.160999824 +0200 @@ -33,10 +33,10 @@ video_youtube.h | 14 +++++++++----- 20 files changed, 221 insertions(+), 33 deletions(-) -Index: clipgrab-3.6.4/.gitignore +Index: clipgrab-3.6.8/.gitignore =================================================================== ---- clipgrab-3.6.4.orig/.gitignore -+++ clipgrab-3.6.4/.gitignore +--- clipgrab-3.6.8.orig/.gitignore ++++ clipgrab-3.6.8/.gitignore @@ -1,12 +1,18 @@ +/debug/ +/release/ @@ -58,10 +58,10 @@ +.qmake.stash +clipgrab +moc_predefs.h -Index: clipgrab-3.6.4/clipgrab.cpp +Index: clipgrab-3.6.8/clipgrab.cpp =================================================================== ---- clipgrab-3.6.4.orig/clipgrab.cpp -+++ clipgrab-3.6.4/clipgrab.cpp +--- clipgrab-3.6.8.orig/clipgrab.cpp ++++ clipgrab-3.6.8/clipgrab.cpp @@ -23,6 +23,13 @@ #include "clipgrab.h" @@ -76,7 +76,7 @@ ClipGrab::ClipGrab() { //* -@@ -259,16 +266,25 @@ void ClipGrab::getUpdateInfo() +@@ -286,16 +293,25 @@ void ClipGrab::getUpdateInfo() QString firstStarted = settings.value("firstStarted", "").toString(); @@ -103,10 +103,10 @@ QNetworkAccessManager* updateInfoNAM = new QNetworkAccessManager; updateInfoNAM->get(updateInfoRequest); connect(updateInfoNAM, SIGNAL(finished(QNetworkReply*)), this, SLOT(parseUpdateInfo(QNetworkReply*))); -Index: clipgrab-3.6.4/clipgrab.h +Index: clipgrab-3.6.8/clipgrab.h =================================================================== ---- clipgrab-3.6.4.orig/clipgrab.h -+++ clipgrab-3.6.4/clipgrab.h +--- clipgrab-3.6.8.orig/clipgrab.h ++++ clipgrab-3.6.8/clipgrab.h @@ -29,6 +29,10 @@ #include <QtXml> #include <QtDebug> @@ -118,10 +118,10 @@ #include "video.h" #include "video_youtube.h" #include "video_vimeo.h" -Index: clipgrab-3.6.4/clipgrab.pro +Index: clipgrab-3.6.8/clipgrab.pro =================================================================== ---- clipgrab-3.6.4.orig/clipgrab.pro -+++ clipgrab-3.6.4/clipgrab.pro +--- clipgrab-3.6.8.orig/clipgrab.pro ++++ clipgrab-3.6.8/clipgrab.pro @@ -1,16 +1,24 @@ # ##################################################################### # Automatically generated by qmake (2.01a) Mo 26. Okt 18:26:00 2009 @@ -165,7 +165,7 @@ SOURCES += clipgrab.cpp \ converter.cpp \ converter_copy.cpp \ -@@ -74,6 +77,7 @@ TRANSLATIONS += clipgrab_ca.ts \ +@@ -79,6 +82,7 @@ TRANSLATIONS += clipgrab_bg.ts \ clipgrab_vi.ts \ clipgrab_zh.ts \ clipgrab_strings.ts @@ -173,10 +173,10 @@ CODECFORTR = UTF-8 win32:RC_FILE = windows_icon.rc macx { -Index: clipgrab-3.6.4/http_handler.cpp +Index: clipgrab-3.6.8/http_handler.cpp =================================================================== ---- clipgrab-3.6.4.orig/http_handler.cpp -+++ clipgrab-3.6.4/http_handler.cpp +--- clipgrab-3.6.8.orig/http_handler.cpp ++++ clipgrab-3.6.8/http_handler.cpp @@ -45,14 +45,22 @@ QNetworkRequest http_handler::createRequ QNetworkReply* http_handler::addDownload(QString url, bool chunked, QByteArray postData, QStringList segments) { @@ -253,10 +253,10 @@ for (int j = 0; j < parsedCookies.length(); j++) { cookies.append(parsedCookies.at(j)); -Index: clipgrab-3.6.4/main.cpp +Index: clipgrab-3.6.8/main.cpp =================================================================== ---- clipgrab-3.6.4.orig/main.cpp -+++ clipgrab-3.6.4/main.cpp +--- clipgrab-3.6.8.orig/main.cpp ++++ clipgrab-3.6.8/main.cpp @@ -19,9 +19,14 @@ along with ClipGrab. If not, see <http://www.gnu.org/licenses/>. */ @@ -310,10 +310,10 @@ cg.getUpdateInfo(); return app.exec(); } -Index: clipgrab-3.6.4/mainwindow.cpp +Index: clipgrab-3.6.8/mainwindow.cpp =================================================================== ---- clipgrab-3.6.4.orig/mainwindow.cpp -+++ clipgrab-3.6.4/mainwindow.cpp +--- clipgrab-3.6.8.orig/mainwindow.cpp ++++ clipgrab-3.6.8/mainwindow.cpp @@ -23,7 +23,23 @@ #include "mainwindow.h" @@ -393,7 +393,7 @@ QString fileName = currentVideo->getSaveTitle(); if (cg->settings.value("NeverAskForPath", false).toBool() == false) -@@ -565,6 +602,7 @@ void MainWindow::on_settingsNeverAskForP +@@ -563,6 +600,7 @@ void MainWindow::on_settingsNeverAskForP if (exitBox->exec() == QMessageBox::Yes) { cg->cancelAll(); @@ -401,7 +401,7 @@ event->accept(); } else -@@ -574,6 +612,7 @@ void MainWindow::on_settingsNeverAskForP +@@ -572,6 +610,7 @@ void MainWindow::on_settingsNeverAskForP } else { @@ -409,7 +409,7 @@ event->accept();; } } -@@ -667,9 +706,17 @@ void MainWindow::timerEvent(QTimerEvent +@@ -665,9 +704,17 @@ void MainWindow::timerEvent(QTimerEvent if (downloadProgress.first != 0 && downloadProgress.second != 0) { #ifdef Q_WS_X11 @@ -427,10 +427,10 @@ #endif setWindowTitle("ClipGrab - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " %"); } -Index: clipgrab-3.6.4/mainwindow.h +Index: clipgrab-3.6.8/mainwindow.h =================================================================== ---- clipgrab-3.6.4.orig/mainwindow.h -+++ clipgrab-3.6.4/mainwindow.h +--- clipgrab-3.6.8.orig/mainwindow.h ++++ clipgrab-3.6.8/mainwindow.h @@ -24,10 +24,14 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H @@ -459,10 +459,10 @@ ~MainWindow(); void init(); -Index: clipgrab-3.6.4/message_dialog.h +Index: clipgrab-3.6.8/message_dialog.h =================================================================== ---- clipgrab-3.6.4.orig/message_dialog.h -+++ clipgrab-3.6.4/message_dialog.h +--- clipgrab-3.6.8.orig/message_dialog.h ++++ clipgrab-3.6.8/message_dialog.h @@ -1,9 +1,14 @@ #ifndef MESSAGE_DIALOG_H #define MESSAGE_DIALOG_H @@ -479,10 +479,10 @@ namespace Ui { class messageDialog; -Index: clipgrab-3.6.4/notifications.h +Index: clipgrab-3.6.8/notifications.h =================================================================== ---- clipgrab-3.6.4.orig/notifications.h -+++ clipgrab-3.6.4/notifications.h +--- clipgrab-3.6.8.orig/notifications.h ++++ clipgrab-3.6.8/notifications.h @@ -25,6 +25,11 @@ #define FOO_H @@ -495,10 +495,10 @@ #ifdef Q_WS_MAC64 #include "notifications_mac.h" -Index: clipgrab-3.6.4/video.cpp +Index: clipgrab-3.6.8/video.cpp =================================================================== ---- clipgrab-3.6.4.orig/video.cpp -+++ clipgrab-3.6.4/video.cpp +--- clipgrab-3.6.8.orig/video.cpp ++++ clipgrab-3.6.8/video.cpp @@ -195,7 +195,11 @@ void video::changeProgress(qint64 bytesR this->_progressBar->setFormat("%p%"); this->_progressBar->setMaximum(bytesTotal); @@ -511,10 +511,10 @@ } } else -Index: clipgrab-3.6.4/video.h +Index: clipgrab-3.6.8/video.h =================================================================== ---- clipgrab-3.6.4.orig/video.h -+++ clipgrab-3.6.4/video.h +--- clipgrab-3.6.8.orig/video.h ++++ clipgrab-3.6.8/video.h @@ -26,6 +26,10 @@ #include <QtGui> @@ -526,10 +526,10 @@ #include "converter.h" #include "converter_ffmpeg.h" #include "http_handler.h" -Index: clipgrab-3.6.4/video_dailymotion.cpp +Index: clipgrab-3.6.8/video_dailymotion.cpp =================================================================== ---- clipgrab-3.6.4.orig/video_dailymotion.cpp -+++ clipgrab-3.6.4/video_dailymotion.cpp +--- clipgrab-3.6.8.orig/video_dailymotion.cpp ++++ clipgrab-3.6.8/video_dailymotion.cpp @@ -22,6 +22,9 @@ @@ -540,22 +540,19 @@ video_dailymotion::video_dailymotion() { -@@ -71,7 +74,11 @@ void video_dailymotion::parseVideo(QStri - +@@ -73,7 +76,7 @@ void video_dailymotion::parseVideo(QStri _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.toAscii()).toString(QUrl::None); + html = QUrl::fromEncoded(html.toLatin1()).toString(QUrl::None); -+#endif - expression = QRegExp("var config\\s*=\\s*(\\{.+\\});"); + expression = QRegExp("var __PLAYER_CONFIG__\\s*=\\s*(\\{.+\\});"); expression.setMinimal(true); - qDebug() << expression.indexIn(html); -Index: clipgrab-3.6.4/video_dailymotion.h + +Index: clipgrab-3.6.8/video_dailymotion.h =================================================================== ---- clipgrab-3.6.4.orig/video_dailymotion.h -+++ clipgrab-3.6.4/video_dailymotion.h +--- clipgrab-3.6.8.orig/video_dailymotion.h ++++ clipgrab-3.6.8/video_dailymotion.h @@ -23,8 +23,9 @@ #ifndef VIDEO_DAILYMOTION_H @@ -567,10 +564,10 @@ struct dailymotion_quality { -Index: clipgrab-3.6.4/video_facebook.cpp +Index: clipgrab-3.6.8/video_facebook.cpp =================================================================== ---- clipgrab-3.6.4.orig/video_facebook.cpp -+++ clipgrab-3.6.4/video_facebook.cpp +--- clipgrab-3.6.8.orig/video_facebook.cpp ++++ clipgrab-3.6.8/video_facebook.cpp @@ -22,6 +22,9 @@ @@ -581,10 +578,10 @@ video_facebook::video_facebook() { -Index: clipgrab-3.6.4/video_facebook.h +Index: clipgrab-3.6.8/video_facebook.h =================================================================== ---- clipgrab-3.6.4.orig/video_facebook.h -+++ clipgrab-3.6.4/video_facebook.h +--- clipgrab-3.6.8.orig/video_facebook.h ++++ clipgrab-3.6.8/video_facebook.h @@ -24,9 +24,9 @@ #ifndef VIDEO_FACEBOOK_H #define VIDEO_FACEBOOK_H @@ -596,10 +593,10 @@ class video_facebook : public video { -Index: clipgrab-3.6.4/video_heuristic.cpp +Index: clipgrab-3.6.8/video_heuristic.cpp =================================================================== ---- clipgrab-3.6.4.orig/video_heuristic.cpp -+++ clipgrab-3.6.4/video_heuristic.cpp +--- clipgrab-3.6.8.orig/video_heuristic.cpp ++++ clipgrab-3.6.8/video_heuristic.cpp @@ -124,7 +124,11 @@ void video_heuristic::parseVideo(QString { videoQuality newQuality; @@ -624,10 +621,10 @@ newQuality.quality = tr("normal"); _supportedQualities.append(newQuality); emit analysingFinished(); -Index: clipgrab-3.6.4/video_vimeo.h +Index: clipgrab-3.6.8/video_vimeo.h =================================================================== ---- clipgrab-3.6.4.orig/video_vimeo.h -+++ clipgrab-3.6.4/video_vimeo.h +--- clipgrab-3.6.8.orig/video_vimeo.h ++++ clipgrab-3.6.8/video_vimeo.h @@ -24,10 +24,15 @@ #ifndef video_vimeo_H #define video_vimeo_H @@ -647,10 +644,10 @@ #include "ui_login_dialog.h" class video_vimeo : public video -Index: clipgrab-3.6.4/video_youtube.cpp +Index: clipgrab-3.6.8/video_youtube.cpp =================================================================== ---- clipgrab-3.6.4.orig/video_youtube.cpp -+++ clipgrab-3.6.4/video_youtube.cpp +--- clipgrab-3.6.8.orig/video_youtube.cpp ++++ clipgrab-3.6.8/video_youtube.cpp @@ -22,7 +22,11 @@ @@ -675,7 +672,7 @@ QRegExp sigExpression; sigExpression = QRegExp("(?:^|[^a-zA-Z])[,]?s(ig)?=([^,]+)"); -@@ -655,7 +663,11 @@ void video_youtube::parseVideo(QString h +@@ -663,7 +671,11 @@ void video_youtube::parseVideo(QString h { videoQuality newQuality; newQuality.quality = tr("normal"); @@ -687,10 +684,10 @@ _supportedQualities.append(newQuality); } else -Index: clipgrab-3.6.4/video_youtube.h +Index: clipgrab-3.6.8/video_youtube.h =================================================================== ---- clipgrab-3.6.4.orig/video_youtube.h -+++ clipgrab-3.6.4/video_youtube.h +--- clipgrab-3.6.8.orig/video_youtube.h ++++ clipgrab-3.6.8/video_youtube.h @@ -24,13 +24,17 @@ #ifndef video_YOUTUBE_H #define video_YOUTUBE_H
