May 2019 - rpmfusion-commits

by Martin Gansser

Summary of changes: 4586c91... Update to 3.8.3 (*) (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[clipgrab] Update to 3.8.3

by Martin Gansser

commit 4586c9188a8693e9e60803a102d5f92b89ffecea Author: Martin Gansser <mgansser(a)online.de> Date: Mon May 13 14:53:52 2019 +0200 Update to 3.8.3 .gitignore | 1 + clipgrab-qt5-3.7.2.patch | 650 +++++++++++++++++++++++++++++++++++++++++++++++ clipgrab.spec | 13 +- sources | 2 +- 4 files changed, 662 insertions(+), 4 deletions(-) --- diff --git a/.gitignore b/.gitignore index 96bf503..860a435 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clipgrab-3.5.5.tar.gz /clipgrab-3.8.0.tar.gz /clipgrab-3.8.1.tar.gz /clipgrab-3.8.2.tar.gz +/clipgrab-3.8.3.tar.gz diff --git a/clipgrab-qt5-3.7.2.patch b/clipgrab-qt5-3.7.2.patch new file mode 100644 index 0000000..0127eba --- /dev/null +++ b/clipgrab-qt5-3.7.2.patch @@ -0,0 +1,650 @@ +diff -Naur -x '.git*' clipgrab-main/clipgrab.cpp clipgrab-qt5/clipgrab.cpp +--- clipgrab-main/clipgrab.cpp 2018-10-10 11:45:58.383957000 +0200 ++++ clipgrab-qt5/clipgrab.cpp 2018-11-20 16:24:03.108664000 +0100 +@@ -23,6 +23,13 @@ + + #include "clipgrab.h" + ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ++#include <QMessageBox> ++#else ++#include <QtWidgets/QMessageBox> ++#include <QUrlQuery> ++#endif ++ + ClipGrab::ClipGrab() + { + //* +@@ -286,16 +293,25 @@ + + QString firstStarted = settings.value("firstStarted", "").toString(); + ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QUrl updateInfoRequestUrl("https://clipgrab.org/update/" + sys + "/"); ++#else ++ QUrlQuery updateInfoRequestUrl("https://clipgrab.org/update/" + sys + "/"); ++#endif + updateInfoRequestUrl.addQueryItem("v", this->version); + updateInfoRequestUrl.addQueryItem("l", QLocale::system().name().split("_")[0]); + if (!firstStarted.isEmpty()) + { + updateInfoRequestUrl.addQueryItem("t", firstStarted); + } +- + QNetworkRequest updateInfoRequest; ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + updateInfoRequest.setUrl(updateInfoRequestUrl); ++#else ++ QUrl url; ++ url.setQuery(updateInfoRequestUrl); ++ updateInfoRequest.setUrl(url); ++#endif + QNetworkAccessManager* updateInfoNAM = new QNetworkAccessManager; + 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-10-10 11:45:58.384140000 +0200 ++++ clipgrab-qt5/clipgrab.h 2018-11-20 16:24:03.108854000 +0100 +@@ -29,6 +29,10 @@ + #include <QtXml> + #include <QtDebug> + ++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) ++#include <QtWidgets/QSystemTrayIcon> ++#endif ++ + #include "video.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-11-20 16:24:54.613391000 +0100 ++++ clipgrab-qt5/clipgrab.pro 2018-11-20 16:24:03.109025000 +0100 +@@ -1,16 +1,24 @@ + # ##################################################################### + # Automatically generated by qmake (2.01a) Mo 26. Okt 18:26:00 2009 + # ##################################################################### ++CONFIG += debug_and_release + TEMPLATE = app +-TARGET = clipgrab +-DEPENDPATH += . \ +- release +-INCLUDEPATH += . ++QT += core ++QT += gui + QT += network +-QT += webkit + QT += xml +- ++lessThan(QT_MAJOR_VERSION, 5) { ++ QT += webkit ++} else { ++ QT += webkitwidgets ++} ++INCLUDEPATH += . + # Input ++FORMS += mainwindow.ui \ ++ metadata-dialog.ui \ ++ update_message.ui \ ++ message_dialog.ui \ ++ login_dialog.ui + HEADERS += clipgrab.h \ + converter.h \ + converter_copy.h \ +@@ -26,11 +34,6 @@ + http_handler.h \ + notifications.h \ + message_dialog.h +-FORMS += mainwindow.ui \ +- metadata-dialog.ui \ +- update_message.ui \ +- message_dialog.ui \ +- login_dialog.ui + SOURCES += clipgrab.cpp \ + converter.cpp \ + converter_copy.cpp \ +@@ -79,6 +82,7 @@ + clipgrab_vi.ts \ + clipgrab_zh.ts \ + clipgrab_strings.ts ++TARGET = clipgrab + CODECFORTR = UTF-8 + 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-10-10 11:45:58.384600000 +0200 ++++ clipgrab-qt5/http_handler.cpp 2018-11-20 16:24:03.109299000 +0100 +@@ -45,14 +45,22 @@ + QNetworkReply* http_handler::addDownload(QString url, bool chunked, QByteArray postData, QStringList segments) + { + download* newDownload = new download; ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QNetworkRequest request = createRequest(QUrl::fromEncoded(url.toAscii())); ++#else ++ QNetworkRequest request = createRequest(QUrl::fromEncoded(url.toLatin1())); ++#endif + newDownload->tempFile = new QTemporaryFile(QDir::tempPath() + "/clipgrab-download-XXXXXX"); + newDownload->size = 0; + newDownload->redirectLevel = 0; + newDownload->chunked = chunked; + if (newDownload->chunked) + { ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + request.setRawHeader("Range", QString("bytes=0-1397760").toAscii()); ++#else ++ request.setRawHeader("Range", QString("bytes=0-1397760").toLatin1()); ++#endif + } + if (!segments.isEmpty()) + { +@@ -121,7 +129,11 @@ + //If more parts need to be downloaded + else + { ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toAscii()); ++#else ++ request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toLatin1()); ++#endif + } + } + +@@ -133,7 +145,11 @@ + dl->currentProgress = 0; + dl->redirectLevel = 0; + qint64 targetBytes = dl->size; ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toAscii()); ++#else ++ request.setRawHeader("Range", QString("bytes=" + QString::number(dl->getProgress()) + "-" + QString::number(targetBytes)).toLatin1()); ++#endif + } + + +@@ -227,7 +243,11 @@ + + dl->redirectLevel = 0; + dl->segmentPosition++; ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QNetworkRequest request = createRequest(QUrl::fromEncoded(dl->segments.at(dl->segmentPosition).toAscii())); ++#else ++ QNetworkRequest request = createRequest(QUrl::fromEncoded(dl->segments.at(dl->segmentPosition).toLatin1())); ++#endif + dl->progress = dl->getProgress(); + dl->currentProgress = 0; + dl->reply = this->networkAccessManager->get(request); +@@ -381,8 +401,16 @@ + QList<QNetworkCookie> cookies; + for (int i = 0; i < serializedCookies.length(); i++) + { ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QString cookieString = QUrl::fromPercentEncoding(serializedCookies.at(i).toAscii()); ++#else ++ QString cookieString = QUrl::fromPercentEncoding(serializedCookies.at(i).toLatin1()); ++#endif ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QList<QNetworkCookie> parsedCookies = QNetworkCookie::parseCookies(cookieString.toAscii()); ++#else ++ QList<QNetworkCookie> parsedCookies = QNetworkCookie::parseCookies(cookieString.toLatin1()); ++#endif + for (int j = 0; j < parsedCookies.length(); j++) + { + cookies.append(parsedCookies.at(j)); +diff -Naur -x '.git*' clipgrab-main/main.cpp clipgrab-qt5/main.cpp +--- clipgrab-main/main.cpp 2018-10-10 11:45:58.384773000 +0200 ++++ clipgrab-qt5/main.cpp 2018-11-20 16:24:03.109454000 +0100 +@@ -19,9 +19,14 @@ + along with ClipGrab. If not, see <http://www.gnu.org/licenses/>. + */ + +- +- ++#include <qglobal.h> ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + #include <QtGui/QApplication> ++#include <QSplashScreen> ++#else ++#include <QtWidgets/QApplication> ++#include <QtWidgets/QSplashScreen> ++#endif + #include <QTranslator> + #include "mainwindow.h" + #include "clipgrab.h" +@@ -39,8 +44,8 @@ + QCoreApplication::setApplicationName("ClipGrab"); + QCoreApplication::setApplicationVersion(QString(STRINGIZE_VALUE_OF(CLIPGRAB_VERSION)).replace("\"", "")); + QSplashScreen splash(QPixmap(":/img/splash.png"), Qt::FramelessWindowHint); +- QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); +- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); ++// QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); ++// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); + + splash.setMask(QPixmap(":/img/splash.png").mask()); +@@ -69,10 +74,22 @@ + } + + MainWindow w; ++ splash.finish(&w); + w.cg = &cg; + w.init(); +- w.show(); +- splash.finish(w.centralWidget()); ++ if ("" != settings.value("x", "")) ++ { ++ w.move(settings.value("x").toInt(), settings.value("y").toInt()); ++ w.resize(settings.value("width").toInt(), settings.value("height").toInt()); ++ } ++ if (settings.value("isMaximized", false).toBool()) ++ { ++ w.showMaximized(); ++ } ++ else ++ { ++ w.show(); ++ } + cg.getUpdateInfo(); + return app.exec(); + } +diff -Naur -x '.git*' clipgrab-main/mainwindow.cpp clipgrab-qt5/mainwindow.cpp +--- clipgrab-main/mainwindow.cpp 2018-11-20 16:24:54.614012000 +0100 ++++ clipgrab-qt5/mainwindow.cpp 2018-11-20 16:24:03.109934000 +0100 +@@ -23,7 +23,23 @@ + + #include "mainwindow.h" + ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ++#include <QSystemTrayIcon> ++#include <QShortcut> ++#include <QFileDialog> ++#include <QMessageBox> ++#else ++#include <QtWidgets/QSystemTrayIcon> ++#include <QtWidgets/QShortcut> ++#include <QtWidgets/QFileDialog> ++#include <QtWidgets/QMessageBox> ++#endif ++ ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + MainWindow::MainWindow(QWidget *parent, Qt::WFlags flags) ++#else ++MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) ++#endif + : QMainWindow(parent, flags) + { + ui.setupUi(this); +@@ -34,6 +50,14 @@ + + MainWindow::~MainWindow() + { ++ QSettings settings; ++ settings.setValue("isMaximized", isMaximized()); ++ if (!isMaximized()) { // the position and size is only valid if not maximized ++ settings.setValue("x", x()); ++ settings.setValue("y", y()); ++ settings.setValue("width", width()); ++ settings.setValue("height", height()); ++ } + } + + void MainWindow::init() +@@ -64,9 +88,14 @@ + connect(ui.downloadLineEdit, SIGNAL(textChanged(QString)), cg, SLOT(determinePortal(QString))); + connect(this, SIGNAL(itemToRemove(int)), cg, SLOT(removeDownload(int))); + //connect(ui.downloadTree, SIGNAL(doubleClicked(QModelIndex)), this, openFinishedVideo(QModelIndex)); ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + ui.downloadTree->header()->setResizeMode(1, QHeaderView::Stretch); +- ui.downloadTree->header()->setStretchLastSection(false); + ui.downloadTree->header()->setResizeMode(3, QHeaderView::ResizeToContents); ++#else ++ ui.downloadTree->header()->setSectionResizeMode(1, QHeaderView::Stretch); ++ ui.downloadTree->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents); ++#endif ++ ui.downloadTree->header()->setStretchLastSection(false); + ui.downloadLineEdit->setFocus(Qt::OtherFocusReason); + + int lastFormat = cg->settings.value("LastFormat", 0).toInt(); +@@ -100,7 +129,11 @@ + connect(this->ui.settingsRadioNotificationsNever, SIGNAL(toggled(bool)), this, SLOT(settingsNotifications_toggled(bool))); + + ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + this->ui.settingsSavedPath->setText(cg->settings.value("savedPath", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)).toString()); ++#else ++ this->ui.settingsSavedPath->setText(cg->settings.value("savedPath", QStandardPaths::standardLocations(QStandardPaths::DesktopLocation)).toString()); ++#endif + this->ui.settingsSaveLastPath->setChecked(cg->settings.value("saveLastPath", true).toBool()); + ui.settingsNeverAskForPath->setChecked(cg->settings.value("NeverAskForPath", false).toBool()); + +@@ -239,7 +272,11 @@ + + void MainWindow::startDownload() + { ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QString targetDirectory = cg->settings.value("savedPath", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)).toString(); ++#else ++ QString targetDirectory = cg->settings.value("savedPath", QStandardPaths::standardLocations(QStandardPaths::DesktopLocation)).toString(); ++#endif + QString fileName = currentVideo->getSaveTitle(); + + if (cg->settings.value("NeverAskForPath", false).toBool() == false) +@@ -566,6 +603,7 @@ + if (exitBox->exec() == QMessageBox::Yes) + { + cg->cancelAll(); ++ systemTrayIcon.hide(); + event->accept(); + } + else +@@ -575,6 +613,7 @@ + } + else + { ++ systemTrayIcon.hide(); + event->accept();; + } + } +@@ -668,9 +707,17 @@ + if (downloadProgress.first != 0 && downloadProgress.second != 0) + { + #ifdef Q_WS_X11 ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + systemTrayIcon.setToolTip("" + tr("ClipGrab") + " " + QString::number(downloadProgress.first*100/downloadProgress.second) + " % " + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB")); ++#else ++ systemTrayIcon.setToolTip("" + tr("ClipGrab") + " " + QString::number(downloadProgress.first*100/downloadProgress.second) + " % " + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB")); ++#endif + #else ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + systemTrayIcon.setToolTip(tr("ClipGrab") + " - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " % - " + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toAscii(), 1) + tr(" KiB")); ++#else ++ systemTrayIcon.setToolTip(tr("ClipGrab") + " - " + QString::number(downloadProgress.first*100/downloadProgress.second) + " % - " + QString::number((double)downloadProgress.first/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" MiB") + "/" + QString::number((double)downloadProgress.second/1024/1024, QLocale::system().decimalPoint().toLatin1(), 1) + tr(" KiB")); ++#endif + #endif + 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-10-10 11:45:58.385468000 +0200 ++++ clipgrab-qt5/mainwindow.h 2018-11-20 16:24:03.110129000 +0100 +@@ -24,10 +24,14 @@ + #ifndef MAINWINDOW_H + #define MAINWINDOW_H + +-#include <QtGui/QMainWindow> + #include <QSignalMapper> + #include <QtXml> + #include <QUrl> ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ++#include <QMainWindow> ++#else ++#include <QtWidgets/QMainWindow> ++#endif + #include "ui_mainwindow.h" + #include "ui_metadata-dialog.h" + #include "clipgrab.h" +@@ -43,7 +47,11 @@ + Q_OBJECT + + public: ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + MainWindow(QWidget *parent = 0, Qt::WFlags flags = 0); ++#else ++ MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); ++#endif + ~MainWindow(); + void init(); + +diff -Naur -x '.git*' clipgrab-main/message_dialog.h clipgrab-qt5/message_dialog.h +--- clipgrab-main/message_dialog.h 2018-10-10 11:45:58.385612000 +0200 ++++ clipgrab-qt5/message_dialog.h 2018-11-20 16:24:03.110256000 +0100 +@@ -1,9 +1,14 @@ + #ifndef MESSAGE_DIALOG_H + #define MESSAGE_DIALOG_H + ++#include <QtGui/QDesktopServices> ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + #include <QDialog> + #include <QWebPage> +-#include <QDesktopServices> ++#else ++#include <QtWidgets/QDialog> ++#include <QtWebKitWidgets/QWebPage> ++#endif + + namespace Ui { + class messageDialog; +diff -Naur -x '.git*' clipgrab-main/notifications.h clipgrab-qt5/notifications.h +--- clipgrab-main/notifications.h 2018-10-10 11:45:58.385983000 +0200 ++++ clipgrab-qt5/notifications.h 2018-11-20 16:24:03.110601000 +0100 +@@ -25,6 +25,11 @@ + #define FOO_H + + #include <QtGui> ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ++#include <QSystemTrayIcon> ++#else ++#include <QtWidgets/QSystemTrayIcon> ++#endif + + #ifdef Q_WS_MAC64 + #include "notifications_mac.h" +diff -Naur -x '.git*' clipgrab-main/video_dailymotion.cpp clipgrab-qt5/video_dailymotion.cpp +--- clipgrab-main/video_dailymotion.cpp 2018-11-20 16:24:54.614595000 +0100 ++++ clipgrab-qt5/video_dailymotion.cpp 2018-11-20 16:24:03.111287000 +0100 +@@ -22,6 +22,9 @@ + + + #include "video_dailymotion.h" ++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) ++ #include <QtWebKitWidgets/QtWebKitWidgets> ++#endif + + video_dailymotion::video_dailymotion() + { +diff -Naur -x '.git*' clipgrab-main/video_dailymotion.h clipgrab-qt5/video_dailymotion.h +--- clipgrab-main/video_dailymotion.h 2018-10-10 11:57:23.970774000 +0200 ++++ clipgrab-qt5/video_dailymotion.h 2018-11-20 16:24:03.111456000 +0100 +@@ -23,8 +23,9 @@ + + #ifndef VIDEO_DAILYMOTION_H + #define VIDEO_DAILYMOTION_H ++ ++#include <QtWebKit/QtWebKit> + #include "video.h" +-#include "QtWebKit" + + struct dailymotion_quality + { +diff -Naur -x '.git*' clipgrab-main/video_facebook.cpp clipgrab-qt5/video_facebook.cpp +--- clipgrab-main/video_facebook.cpp 2018-10-10 11:45:58.387121000 +0200 ++++ clipgrab-qt5/video_facebook.cpp 2018-11-20 16:24:03.111687000 +0100 +@@ -22,6 +22,10 @@ + + + #include "video_facebook.h" ++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) ++ #include <QtWebKitWidgets/QtWebKitWidgets> ++ #include <QUrlQuery> ++#endif + + video_facebook::video_facebook() + { +@@ -152,6 +156,7 @@ + + QString playerLink = "https://www.facebook.com/video/tahoe/async/" + videoIDRegExp.cap(1) + "/?payloadtype=primary"; + ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + QUrl postData; + postData.addQueryItem("__a", "1"); + postData.addQueryItem("__user", userID); +@@ -159,6 +164,15 @@ + + qDebug() << "Downloading player ..." << playerLink << postData.encodedQuery(); + handler->addDownload(playerLink, false, postData.encodedQuery()); ++#else ++ QUrlQuery postData; ++ postData.addQueryItem("__a", "1"); ++ postData.addQueryItem("__user", userID); ++ postData.addQueryItem("fb_dtsg", dtsg); ++ ++ qDebug() << "Downloading player ..." << playerLink << postData.query(QUrl::FullyEncoded).toUtf8(); ++ handler->addDownload(playerLink, false, postData.query(QUrl::FullyEncoded).toUtf8()); ++#endif + return; + } + +diff -Naur -x '.git*' clipgrab-main/video_facebook.h clipgrab-qt5/video_facebook.h +--- clipgrab-main/video_facebook.h 2018-10-10 11:45:58.387308000 +0200 ++++ clipgrab-qt5/video_facebook.h 2018-11-20 16:24:03.111846000 +0100 +@@ -24,9 +24,9 @@ + #ifndef VIDEO_FACEBOOK_H + #define VIDEO_FACEBOOK_H + ++#include <QtWebKit/QtWebKit> + #include "video.h" + #include "ui_login_dialog.h" +-#include "QtWebKit" + + class video_facebook : public video + { +diff -Naur -x '.git*' clipgrab-main/video_heuristic.cpp clipgrab-qt5/video_heuristic.cpp +--- clipgrab-main/video_heuristic.cpp 2018-10-10 11:45:58.387486000 +0200 ++++ clipgrab-qt5/video_heuristic.cpp 2018-11-20 16:24:03.112245000 +0100 +@@ -124,7 +124,11 @@ + { + videoQuality newQuality; + newQuality.containerName = expression.cap(2).prepend("."); ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toAscii()); ++#else ++ newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toLatin1()); ++#endif + newQuality.quality = tr("normal"); + _supportedQualities.append(newQuality); + emit analysingFinished(); +@@ -138,7 +142,11 @@ + { + videoQuality newQuality; + newQuality.containerName = expression.cap(2).prepend("."); ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toAscii()); ++#else ++ newQuality.videoUrl = QUrl::fromPercentEncoding(expression.cap(1).toLatin1()); ++#endif + newQuality.quality = tr("normal"); + _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-10-10 11:45:58.387671000 +0200 ++++ clipgrab-qt5/video_vimeo.h 2018-11-20 16:24:03.112383000 +0100 +@@ -24,10 +24,15 @@ + #ifndef video_vimeo_H + #define video_vimeo_H + ++#include <qglobal.h> ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ++#include <QWebPage> ++#include <QWebFrame> ++#include <QWebElement> ++#else ++#include <QtWebKitWidgets/QtWebKitWidgets> ++#endif + #include "video.h" +-#include "QWebPage" +-#include "QWebFrame" +-#include "QWebElement" + #include "ui_login_dialog.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-11-20 16:24:54.615056000 +0100 ++++ clipgrab-qt5/video_youtube.cpp 2018-11-20 16:24:03.112721000 +0100 +@@ -22,7 +22,11 @@ + + + #include "video_youtube.h" ++ + #include "QMutableListIterator" ++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) ++ #include <QtWebKitWidgets/QtWebKitWidgets> ++#endif + + video_youtube::video_youtube() + { +@@ -103,7 +107,11 @@ + + 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(); ++#else ++ QString url = QUrl::fromPercentEncoding(QUrl::fromPercentEncoding(urlExpression.cap(1).toUtf8()).toUtf8()); ++#endif + + QRegExp sigExpression; + sigExpression = QRegExp("(?:^|[^a-zA-Z])[,]?s(ig)?=([^,]+)"); +@@ -673,7 +681,11 @@ + { + videoQuality newQuality; + newQuality.quality = tr("normal"); ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + newQuality.videoUrl = QUrl::fromEncoded(QString("http://www.youtube.com/get_video?video_id=" + expression2.cap(1) + "&t=" + expression.cap(1)).toAscii()).toString(QUrl::None); ++#else ++ newQuality.videoUrl = QUrl::fromEncoded(QString("http://www.youtube.com/get_video?video_id=" + expression2.cap(1) + "&t=" + expression.cap(1)).toLatin1()).toString(QUrl::None); ++#endif + _supportedQualities.append(newQuality); + } + else +diff -Naur -x '.git*' clipgrab-main/video_youtube.h clipgrab-qt5/video_youtube.h +--- clipgrab-main/video_youtube.h 2018-10-10 11:45:58.388234000 +0200 ++++ clipgrab-qt5/video_youtube.h 2018-11-20 16:24:03.112885000 +0100 +@@ -24,13 +24,17 @@ + #ifndef video_YOUTUBE_H + #define video_YOUTUBE_H + +-#include "video.h" +-#include "QtWebKit" ++#include <qglobal.h> ++#if QT_VERSION < QT_VERSION_CHECK(5,0,0) ++#include <QtWebKit> ++#else ++#include <QtWebKit/QtWebKit> ++#endif + #include <QtGui> +-#include "QDomDocument" ++#include <QFile> ++#include <QDomDocument> + #include "ui_login_dialog.h" +- +-#include "QFile" ++#include "video.h" + + struct fmtQuality + { +diff -Naur -x '.git*' clipgrab-main/video.cpp clipgrab-qt5/video.cpp +--- clipgrab-main/video.cpp 2018-11-20 16:24:54.614334000 +0100 ++++ clipgrab-qt5/video.cpp 2018-11-20 16:24:03.110835000 +0100 +@@ -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("" + tr("Downloading ...") + " " + 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("" + tr("Downloading ...") + " " + 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-11-20 16:24:03.111085000 +0100 +@@ -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/clipgrab.spec b/clipgrab.spec index eb98a03..633a717 100644 --- a/clipgrab.spec +++ b/clipgrab.spec @@ -1,5 +1,5 @@ Name: clipgrab -Version: 3.8.2 +Version: 3.8.3 Release: 1%{?dist} License: GPLv3 and Non-Commercial Use Only (Artwork and Trademark) @@ -7,8 +7,9 @@ Summary: A free video downloader and converter URL: http://clipgrab.de/en Source0: https://download.clipgrab.org/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: https://gitlab.com/kikadf/clipgrab-qt5/raw/patches/patches/clipgrab-qt5-3... -ExcludeArch: ppc64le ppc64 +ExcludeArch: ppc64le ppc64 aarch64 BuildRequires: ImageMagick BuildRequires: desktop-file-utils @@ -24,8 +25,11 @@ ClipGrab is a free downloader and converter for YouTube, Vimeo, Dailymotion and many other online video sites. %prep -%setup -q +#setup -q +%autosetup -p 1 -n %{name}-%{version} chmod 0644 *.cpp *.h icon.png COPYING README license.odt +# Fix build with Qt 5.12: https://aur.archlinux.org/packages/clipgrab-qt5/ +sed -i 's|QtWebKit/QWebView|QtWebKitWidgets/QWebView|' mainwindow.ui %build %{qmake_qt5} clipgrab.pro QMAKE_CXXFLAGS="%{optflags}" @@ -45,6 +49,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} %{_datadir}/applications/clipgrab.desktop %changelog +* Mon May 13 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 3.8.3-1 +- Update to 3.8.3 + * Mon Mar 11 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 3.8.2-1 - Update to 3.8.2 diff --git a/sources b/sources index 6976cfa..248e654 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76e51811853839397bd52563ecac6347 clipgrab-3.8.2.tar.gz +5f63b8cc431867921114fe2e32c05325 clipgrab-3.8.3.tar.gz

5 years, 6 months

1
0
0 / 0

[openshot] (7 commits) ...Merge branch 'el7'

by Sérgio M. Basto

Summary of changes: 0a80a36... Merge branches 'master' and 'f20' into f20 (*) cb3156d... Merge branch 'master' into el7 (*) 9bc17ad... Change Recommends to Requires for el7. (*) b2d1626... Change python3 BuildRequires/Requires for pkgversion macro (*) d102997... Revert scm back to the state of the last good build of open (*) cc38ba6... git merge and squash master (*) 8a0862f... Merge branch 'el7' (*) (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[openshot/el7: 33/33] Merge branch 'el7'

by Sérgio M. Basto

commit 8a0862f76fa3ff1d5811d80555807f00cbfb0424 Merge: 964a7d0 cc38ba6 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Mon May 13 05:05:28 2019 +0100 Merge branch 'el7' ---

5 years, 6 months

1
0
0 / 0

[openshot/el7: 32/33] git merge and squash master

by Sérgio M. Basto

commit cc38ba6f633c137dbe64e1aebcfcd7526d720dd7 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Mon May 13 05:04:23 2019 +0100 git merge and squash master .gitignore | 4 + openshot-find-lang.sh | 40 ++++-- openshot.spec | 343 ++++++++++++++++++++++++++++++++------------------ sources | 2 +- 4 files changed, 257 insertions(+), 132 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7802f2f..ba89234 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ openshot-1.4.3.tar.gz /openshot-qt-2.3.3.tar.gz /openshot-qt-2.3.4.tar.gz /openshot-qt-2.4.0.tar.gz +/openshot-qt-2.4.1.tar.gz +/openshot-qt-2.4.2.tar.gz +/openshot-qt-2.4.3.tar.gz +/openshot-qt-2.4.4.tar.gz diff --git a/openshot-find-lang.sh b/openshot-find-lang.sh index 4d5332c..8f74517 100755 --- a/openshot-find-lang.sh +++ b/openshot-find-lang.sh @@ -54,7 +54,7 @@ fi shift if [ -z "$1" ] ; then usage -else NAME=$1 +else NAMES[0]=$1 fi shift @@ -65,7 +65,7 @@ QT=# MAN=# HTML=# MO= -MO_NAME=$NAME.lang +MO_NAME=${NAMES[0]}.lang ALL_NAME=# NO_ALL_NAME= @@ -105,19 +105,28 @@ while test $# -gt 0 ; do shift ;; * ) + if [ $MO_NAME != ${NAMES[$#]}.lang ]; then + NAMES[${#NAMES[@]}]=$MO_NAME + fi MO_NAME=${1} shift ;; esac done +if [ -f $MO_NAME ]; then + rm $MO_NAME +fi + +for NAME in ${NAMES[@]}; do + find "$TOP_DIR" -type f -o -type l|sed ' s:'"$TOP_DIR"':: '"$ALL_NAME$MO"'s:$.*/locale/$$[^/_]\+$$.*\.mo$$:%lang(\2) \1\2\3: '"$NO_ALL_NAME$MO"'s:$.*/locale/$$[^/_]\+$$.*/'"$NAME"'\.mo$$:%lang(\2) \1\2\3: s:^$[^%].*$:: s:%lang(C) :: -/^$/d' > $MO_NAME +/^$/d' >> $MO_NAME find "$TOP_DIR" -type d|sed ' s:'"$TOP_DIR"':: @@ -162,7 +171,7 @@ s:'"$TOP_DIR"':: '"$NO_ALL_NAME$MATE"'s:$.*/mate/help/'"$NAME"'\/$$[^/_]\+$:%lang(\2) \1\2: '"$ALL_NAME$MATE"'s:$.*/mate/help/[a-zA-Z0-9.\_\-]\+$$:%dir \1: '"$ALL_NAME$MATE"'s:$.*/mate/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+$:: -'"$ALL_NAME$GNOME"'s:$.*/mate/help/[a-zA-Z0-9.\_\-]\+\/$$[^/_]\+$:%lang(\2) \1\2: +'"$ALL_NAME$MATE"'s:$.*/mate/help/[a-zA-Z0-9.\_\-]\+\/$$[^/_]\+$:%lang(\2) \1\2: s:%lang(.*) .*/mate/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*:: s:^$[^%].*$:: s:%lang(C) :: @@ -209,6 +218,19 @@ s:%lang(C) :: /^$/d' >> $MO_NAME fi +KF5_HTML=`kf5-config --expandvars --install html 2>/dev/null` +if [ x"$KF5_HTML" != x -a -d "$TOP_DIR$KF5_HTML" ]; then +find "$TOP_DIR$KF5_HTML" -type d|sed ' +s:'"$TOP_DIR"':: +'"$NO_ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/'"$NAME"'/$:: +'"$NO_ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/'"$NAME"'$$:%lang(\2) \1\2\3: +'"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+/$:: +'"$ALL_NAME$KDE"'s:$.*/HTML/$$[^/_]\+$$.*/[a-zA-Z0-9.\_\-]\+$$:%lang(\2) \1\2\3: +s:^$[^%].*$:: +s:%lang(C) :: +/^$/d' >> $MO_NAME +fi + find "$TOP_DIR" -type d|sed ' s:'"$TOP_DIR"':: '"$NO_ALL_NAME$HTML"'s:$.*/doc/HTML/$$[^/_]\+$$.*/'"$NAME"'/$:: @@ -221,10 +243,12 @@ s:%lang(C) :: find "$TOP_DIR" -type f -o -type l|sed ' s:'"$TOP_DIR"':: +'"$NO_ALL_NAME$QT"'s:$.*/'"$NAME"'\.\([a-zA-Z]\{2,3\}\([_@].*$\?\)\.qm$\):%lang(\2) \1: '"$NO_ALL_NAME$QT"'s:$.*/locale/$$[^/_]\+$$.*/'"$NAME"'\.qm$$:%lang(\2) \1\2\3: -#'"$NO_ALL_NAME$QT"'s:$.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*$\?\)\.qm$\):%lang(\2) \1: -'"$ALL_NAME$QT"'s:$.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*$\.qm$\):%lang(\2) \1: -'"$ALL_NAME$QT"'s:$.*/[^/_]\+_\([a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: +'"$ALL_NAME$QT"'s:^$[^%].*/\([a-zA-Z]\{2\}[_@].*$\.qm$\):%lang(\2) \1: +'"$ALL_NAME$QT"'s:^$[^%].*/\([a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: +'"$ALL_NAME$QT"'s:^$[^%].*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*$\.qm$\):%lang(\2) \1: +'"$ALL_NAME$QT"'s:^$[^%].*/[^/_]\+_\([a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: '"$ALL_NAME$QT"'s:^$[^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*$\.qm$\):%lang(\2) \1: '"$ALL_NAME$QT"'s:^$[^%].*/[^/]\+_\([a-zA-Z]\{2\}$\.qm$\):%lang(\2) \1: s:^[^%].*:: @@ -246,6 +270,8 @@ s:^$[^%].*$:: s:%lang(C) :: /^$/d' >> $MO_NAME +done # for NAME in ${NAMES[@]} + if ! grep -q / $MO_NAME; then echo "No translations found for ${NAME} in ${TOP_DIR}" exit 1 diff --git a/openshot.spec b/openshot.spec index 1688bd4..7a8e8ef 100644 --- a/openshot.spec +++ b/openshot.spec @@ -1,79 +1,93 @@ +# Redirect find_lang to our patched version +%global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot} + Name: openshot -Version: 1.4.3 -Release: 3%{?dist} -Summary: A GTK based non-linear video editor +Version: 2.4.4 +Release: 2%{?dist} +Summary: Create and edit videos and movies Group: Applications/Multimedia -# All files are GPLv3+ except for files under openshot/uploads/youtube which -# are ASL 2.0 and openshot/window/SimpleGtkBuilderApp.py which is LGPLv3 making -# the effective license of openshot GPLv3. -License: GPLv3 -URL: http://www.openshotvideo.com/ - -Source0: http://launchpad.net/openshot/1.4/%{version}/+download/openshot-%{version... -Source1: openshot.png - -Patch0: openshot-1.4.0-use_mlt-melt.diff -Patch1: openshot-1.4.0-doc-install.diff - -BuildArch: noarch - -#BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: python-devel -# Resize icon -BuildRequires: ImageMagick -BuildRequires: exiv2 - -Requires: mlt -Requires: mlt-python -Requires: ladspa -Requires: notify-python -Requires: pygoocanvas -Requires: pygtk2-libglade -Requires: python(abi) >= 2.5 -Requires: python-imaging -Requires: python-httplib2 -Requires: pyxdg -Requires: SDL -Requires: sox -Requires: librsvg2 -Requires: frei0r-plugins -Requires: fontconfig -# Needed because it owns icon directories -Requires: hicolor-icon-theme +License: GPLv3+ +URL: http://www.openshot.org + +Source0: https://github.com/OpenShot/%{name}-qt/archive/v%{version}/%{name}-qt-%{v... + +# QT translation files are installed to a non-standard location +Source100: openshot-find-lang.sh + +# Add openshot-owner@rpmfusion to appdata as update_contact +Patch1: openshot-rpmfusion-contact.patch + +BuildArch: noarch + +# For appdata +BuildRequires: libappstream-glib + +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-qt5-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: libopenshot >= 0.2.3 +BuildRequires: libopenshot-audio >= 0.1.8 +BuildRequires: desktop-file-utils + +Requires: python%{python3_pkgversion}-httplib2 +Requires: python%{python3_pkgversion}-qt5 +Requires: python%{python3_pkgversion}-qt5-webkit +Requires: python%{python3_pkgversion}-requests +Requires: python%{python3_pkgversion}-setuptools +Requires: python%{python3_pkgversion}-zmq +Requires: python%{python3_pkgversion}-libopenshot >= 0.2.3 +Requires: ffmpeg-libs + +%if 0%{?fedora} +Recommends: openshot-lang +Recommends: font(bitstreamverasans) +Recommends: blender +%else +Requires: openshot-lang +%endif %description -OpenShot Video Editor is a free, open-source, non-linear video editor, based on -Python, GTK, and MLT. It can edit video and audio files, composite and -transition video files, and mix multiple layers of video and audio together and -render the output in many different formats. +OpenShot Video Editor is a free, open-source, non-linear video editor. It +can create and edit videos and movies using many popular video, audio, +image formats. Create videos for YouTube, Flickr, Vimeo, Metacafe, iPod, +Xbox, and many more common formats! + +Features include: +* Multiple tracks (layers) +* Compositing, image overlays, and watermarks +* Audio mixing and editing +* Support for image sequences (rotoscoping) +* Key-frame animation +* Video effects (chroma-key) +* Transitions (lumas and masks) +* Titles with integrated editor and templates +* 3D animation (titles and effects) + + +%package lang +Summary: Additional languages for OpenShot +Requires: %{name} = %{version}-%{release} + +%description lang +%{summary}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -# Don't install unnecessary stuff -sed -i -e '/lib\/mime\/packages/d' setup.py +%autosetup -p1 -n %{name}-qt-%{version} %build -%{__python} setup.py build +%py3_build %install -%{__python} setup.py install -O1 --skip-build --root=%{buildroot} - -# Remove unnecessary .po files -rm %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.po -rm %{buildroot}%{python_sitelib}/%{name}/locale/OpenShot/OpenShot.pot -rm %{buildroot}%{python_sitelib}/%{name}/locale/README +%py3_install # We strip bad shebangs (/usr/bin/env) instead of fixing them # since these files are not executable anyways -find %{buildroot}/%{python_sitelib} -name '*.py' \ +find %{buildroot}/%{python3_sitelib} -name '*.py' \ -exec grep -q '^#!' '{}' \; -print | while read F do awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped @@ -82,72 +96,174 @@ do done # Validate desktop file -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop - -# Move icon files to the preferred location -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -mv %{buildroot}%{_datadir}/pixmaps/%{name}.svg \ - %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -cp -p %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ - -# modify find-lang.sh to deal with gettext .mo files under -# openshot/locale -%{__sed} -e 's|/share/locale/|/%{name}/locale/|' \ - /usr/lib/rpm/find-lang.sh \ - > find-lang-modified.sh - -sh find-lang-modified.sh %{buildroot} OpenShot %{name}.lang -find %{buildroot}%{python_sitelib}/%{name}/locale -type d | while read dir -do - echo "%%dir ${dir#%{buildroot}}" >> %{name}.lang -done +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop + +%if 0%{?rhel} +# Move appdata file to default location +mkdir -p %{buildroot}%{_metainfodir} +mv %{buildroot}%{_datadir}/metainfo/*.appdata.xml %{buildroot}%{_metainfodir}/ +%endif #rhel + +# Validate appdata file +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml +%find_lang OpenShot --with-qt + +%if 0%{?rhel} %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -update-desktop-database &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -update-desktop-database &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%endif -%files -f %{name}.lang -%doc AUTHORS COPYING README -%{_datadir}/gnome/help/openshot/ -%{_datadir}/omf/openshot/ +%files +%license COPYING +%doc AUTHORS README.md %{_bindir}/* -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/%{name}-qt.desktop %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/pixmaps/* %{_datadir}/mime/packages/* -%dir %{python_sitelib}/%{name} -%{python_sitelib}/%{name}/*.py* -%{python_sitelib}/%{name}/blender -%{python_sitelib}/%{name}/classes -%{python_sitelib}/%{name}/effects -%{python_sitelib}/%{name}/export_presets -%{python_sitelib}/%{name}/images -%{python_sitelib}/%{name}/language -%{python_sitelib}/%{name}/profiles -%{python_sitelib}/%{name}/themes -%{python_sitelib}/%{name}/titles -%{python_sitelib}/%{name}/transitions -%{python_sitelib}/%{name}/uploads -%{python_sitelib}/%{name}/windows -%{python_sitelib}/*egg-info -%{_mandir}/man*/* +%{_metainfodir}/*.appdata.xml +%{python3_sitelib}/%{name}_qt/ +%exclude %{python3_sitelib}/%{name}_qt/language/* +%{python3_sitelib}/*egg-info +%{_prefix}/lib/mime/packages/openshot-qt + +%files lang -f OpenShot.lang +%dir %{python3_sitelib}/%{name}_qt/language +%{python3_sitelib}/%{name}_qt/language/%{name}_lang.py +%{python3_sitelib}/%{name}_qt/language/%{name}_lang.qrc %changelog +* Mon Apr 29 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 2.4.4-3 +- Remove simplejson require, not actually a dependency after all +- setuptools, however, is also a runtime dependency + +* Sun Apr 28 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 2.4.4-2 +- Declare dependency on requests, simplejson Python modules + +* Fri Mar 22 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.4-1 +- New upstream release + +* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 14 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.3-2 +- Add patch to fix opening files via commandline / .desktop + +* Mon Sep 3 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.3-1 +- New upstream release 2.4.3 +- Update libopenshot dependency version to new 0.2.2 release +- Drop several upstreamed build fixes +- Use upstream appdata file instead of our own +- Patch upstream appdata file for missed release tag +- Add openshot-owner(a)rpmfusion.org as update contact in appdata +- Clean up installed files +- New translations path, update find logic and packaging + +* Sat Sep 1 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.2-2 +- Updated package description +- Rebuild for updated libopenshot (with new ImageMagick) + +* Tue Jul 31 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.2-1 +- New upstream release + +* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jul 10 2018 Miro Hrončok <mhroncok(a)redhat.com> - 2.4.1-6 +- Rebuilt for Python 3.7 + +* Thu Mar 01 2018 Richard Shaw <hobbes1069(a)gmail.com> - 2.4.1-5 +- Fix package ownership of locale directory, fixes RFBZ#4809. + +* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 17 2018 Sérgio Basto <sergio(a)serjux.com> - 2.4.1-3 +- Add some recommends to spec +- Merge epel7 work, but we still haven't python-qt5 in epel7 + +* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.1-2 +- Rebuilt for ffmpeg-3.5 git + +* Sat Jan 13 2018 Richard Shaw <hobbes1069(a)gmail.com> - 2.4.1-1 +- Update to latest upstream release. + +* Wed Oct 25 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.4.0-3 +- Add recommends for Vera Sans font, fixes RFBZ#5677. + +* Mon Sep 11 2017 Sérgio Basto <sergio(a)serjux.com> - 2.4.0-2 +- Also requires libopenshot >= 0.1.8 + +* Fri Sep 08 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.4.0-1 +- Update to 2.4.0 +- Use python macros +- Remove obsolete scriptlets + +* Sun Sep 03 2017 Sérgio Basto <sergio(a)serjux.com> - 2.3.4-1 +- Update to 2.3.4 + +* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri May 12 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.3.2-1 +- Update to latest upstream release. + +* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.3.1-2 +- Rebuild for ffmpeg update + +* Mon Apr 03 2017 Sérgio Basto <sergio(a)serjux.com> - 2.3.1-1 +- Update to 2.3.1 + +* Fri Mar 31 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.3.0-1 +- Update to latest upstream release. + +* Sat Mar 25 2017 Sérgio Basto <sergio(a)serjux.com> - 2.2.0-1 +- Update openshot to 2.2.0 + +* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Dec 4 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.0-2 +- All translation files now included in openshot-lang, fixes RFBZ#4358. +- Change dependency on openshot-lang from Requires to Recommends. + +* Tue Aug 30 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.0-1 +- Update to latest upstream release. + +* Tue Aug 23 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.0.7-5 +- Install locale files. + +* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.0.7-4 +- Rebuilt for ffmpeg-3.1.1 + +* Wed Jul 20 2016 Sérgio Basto <sergio(a)serjux.com> - 2.0.7-3 +- Add python3-qt5-webkit to package requires + +* Mon Apr 18 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.0.7-2 +- Update to require python3-libopenshot. + +* Fri Apr 8 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.0.7-1 +- Update to latest upstream release. + +* Fri Mar 4 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.0.6-1 +- Update to latest upstream release. + +* Mon Jan 11 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.0.4-1 +- Update to latest upstream release. + * Mon Apr 6 2015 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.3-3 - Fix broken icon file (BZ#3546). - Add ladspa as a install requirement (BZ#3472). @@ -174,24 +290,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || : * Mon Jan 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.1-1 - Update to latest release. - -* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.0-1 -- New release. - -* Sun Apr 10 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.3.0-2 -- Fixed spec file for packaging guidelines compliance. - -* Mon Feb 14 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.3.0-1 -- Release 1.3.0 - -* Thu Oct 11 2010 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.2.2-1 -- Release 1.2.2 - -* Tue Jun 22 2010 Renich Bon Ćirić <renich(a)woralelandia.com> - 1.1.3-1 -- Release 1.1.3 - -* Tue Jan 12 2010 Zarko <zarko.pintar(a)gmail.com> - 1.0.0-1 -- Release 1.0.0 - -* Thu Dec 04 2009 Zarko <zarko.pintar(a)gmail.com> - 0.9.54-1 -- initial release diff --git a/sources b/sources index fc381b1..078097c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ec82a7e8b7700ee4a359458aedf19e9 openshot-1.4.3.tar.gz +6addaf63691bd9bbe75a2fb854997bbe openshot-qt-2.4.4.tar.gz

5 years, 6 months

1
0
0 / 0

[openshot/el7] (33 commits) ...Merge branch 'el7'

by Sérgio M. Basto

Summary of changes: e32e691... Update to latest upstream release. (*) 430187e... Update libopenshot required version. (*) b940190... Rebuilt for ffmpeg-3.5 git (*) c02094c... Add some recommends to spec Merge epel7 work, but we still (*) cd62fb2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*) e17897f... Fix package ownership of locale directory, fixes RFBZ#4809. (*) 3359caf... Rebuilt for Python 3.7 (*) b475156... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*) 687d6e8... New upstream release (*) 291afab... Uploaded source (*) 05e5d43... Update package description (*) 5f55a21... Update for new libopenshot (*) 5a29a65... Add appdata file. (*) 2974e55... Actually commit appdata file. (*) 28f3b0d... Add appdata to %%file. (*) 4b7b728... Correct version typo in changelog (*) b7a439b... Update contact email in appdata (*) 1ce8138... Update appdata file per upstream (*) 7bd3dd5... small typo (*) 02581b6... Pull in find-lang changes from Fedora (*) 441777f... Update find-lang for new translation files (*) 7a4cd9e... New upstream release 2.4.3 (*) 448980a... Add patch to fix opening files (*) 7c17ac2... Remove Recommends: vid.stab (not used by OpenShot) (*) ca80b46... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*) 3023c58... New upstream release 2.4.4 (*) 5725b06... Drop upstreamed patches (*) 28da396... Requires: python-requests & python-simplejson (*) e13c7c3... Add appdata file moving, for EL7 (like old F27) (*) c3a2cc5... Add runtime setuptools dependency (*) 964a7d0... Remove Requires: simplejson, not actually needed (*) cc38ba6... git merge and squash master 8a0862f... Merge branch 'el7' (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[libopenshot/el7] (6 commits) ...deleted: ffmpeg40_buildfix.patch

by Sérgio M. Basto

Summary of changes: ede60c7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*) 5194b25... New upstream release 0.2.3 (*) d058bab... Clean up spec file (*) b8d139d... Build from latest git HEAD (*) 47a3d7d... Merge branch 'el7' (*) 01512cf... deleted: ffmpeg40_buildfix.patch (*) (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

[libopenshot: 4/4] deleted: ffmpeg40_buildfix.patch

by Sérgio M. Basto

commit 01512cf4be6e937d31af0f80ec9593927b87150e Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Mon May 13 04:50:28 2019 +0100 deleted: ffmpeg40_buildfix.patch ffmpeg40_buildfix.patch | 90 ------------------------------------------------- 1 file changed, 90 deletions(-)

5 years, 6 months

1
0
0 / 0

[libopenshot: 3/4] Merge branch 'el7'

by Sérgio M. Basto

commit 47a3d7d537d095f197c27c1cffe11be756dea1a9 Merge: b8d139d c8086cf Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Mon May 13 04:48:55 2019 +0100 Merge branch 'el7' ffmpeg40_buildfix.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) ---

5 years, 6 months

1
0
0 / 0

[libopenshot] (4 commits) ...deleted: ffmpeg40_buildfix.patch

by Sérgio M. Basto

Summary of changes: 62cd977... New upstream release (*) c8086cf... Rebuild for ffmpeg-3.4.5 on el7 (*) 47a3d7d... Merge branch 'el7' 01512cf... deleted: ffmpeg40_buildfix.patch (*) This commit already existed in another branch; no separate mail sent

5 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits May 2019