Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minitube for openSUSE:Factory checked in at 2022-02-04 21:49:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minitube (Old) and /work/SRC/openSUSE:Factory/.minitube.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minitube" Fri Feb 4 21:49:31 2022 rev:30 rq:951638 version:3.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/minitube/minitube.changes 2022-01-23 12:16:51.068001506 +0100 +++ /work/SRC/openSUSE:Factory/.minitube.new.1898/minitube.changes 2022-02-04 21:52:54.310941685 +0100 @@ -1,0 +2,14 @@ +Fri Feb 4 17:23:14 UTC 2022 - Carsten Ziepke <[email protected]> + +- Fix building on openSUSE Leap 15.4: instead pkgconfig(Qt5Script) + use libqt5-qtscript-devel as BuildRequires + https://github.com/openSUSE/obs-build/issues/724 + +------------------------------------------------------------------- +Thu Feb 3 05:07:42 UTC 2022 - Carsten Ziepke <[email protected]> + +- Update to 3.9.3: + - Update js + - Updated translations + +------------------------------------------------------------------- Old: ---- minitube-3.9.2.tar.xz New: ---- minitube-3.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minitube.spec ++++++ --- /var/tmp/diff_new_pack.ropg8w/_old 2022-02-04 21:52:54.710938933 +0100 +++ /var/tmp/diff_new_pack.ropg8w/_new 2022-02-04 21:52:54.714938905 +0100 @@ -17,7 +17,7 @@ Name: minitube -Version: 3.9.2 +Version: 3.9.3 Release: 0 Summary: Native YouTube Client License: GPL-3.0-or-later @@ -34,12 +34,13 @@ BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist BuildRequires: libqt5-qtdeclarative-devel +# Have 32bit choice when build with pkgconfig - https://github.com/openSUSE/obs-build/issues/724 - instead pkgconfig(Qt5Script) use libqt5-qtscript-devel +BuildRequires: libqt5-qtscript-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) >= 5.12 BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ropg8w/_old 2022-02-04 21:52:54.742938713 +0100 +++ /var/tmp/diff_new_pack.ropg8w/_new 2022-02-04 21:52:54.746938686 +0100 @@ -4,7 +4,7 @@ <param name="url">https://github.com/flaviotordini/minitube.git</param> <param name="filename">minitube</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">3.9.2</param> + <param name="revision">3.9.3</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ minitube-3.9.2.tar.xz -> minitube-3.9.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/lib/js/js.cpp new/minitube-3.9.3/lib/js/js.cpp --- old/minitube-3.9.2/lib/js/js.cpp 2021-11-11 13:11:41.000000000 +0100 +++ new/minitube-3.9.3/lib/js/js.cpp 2022-02-03 02:44:51.000000000 +0100 @@ -1,6 +1,7 @@ #include "js.h" #include "cachedhttp.h" +#include "jsvm.h" namespace { Http &cachedHttp() { @@ -114,6 +115,9 @@ checkError(setTimeoutWrapperFunction); engine->globalObject().setProperty("clearTimeout", timer.property("clearTimeout")); + QJSValue vm = engine->newQObject(new JSVM(engine)); + engine->globalObject().setProperty("runInContextQt", vm.property("runInContext")); + connect(cachedHttp().get(url), &HttpReply::finished, this, [this](auto &reply) { if (!reply.isSuccessful()) { emit initFailed("Cannot load JS"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/lib/js/js.pri new/minitube-3.9.3/lib/js/js.pri --- old/minitube-3.9.2/lib/js/js.pri 2021-11-11 13:11:41.000000000 +0100 +++ new/minitube-3.9.3/lib/js/js.pri 2022-02-03 02:44:51.000000000 +0100 @@ -6,9 +6,11 @@ HEADERS += \ $$PWD/js.h \ $$PWD/jsnamfactory.h \ - $$PWD/jsresult.h + $$PWD/jsresult.h \ + $$PWD/jsvm.h SOURCES += \ $$PWD/js.cpp \ $$PWD/jsnamfactory.cpp \ - $$PWD/jsresult.cpp + $$PWD/jsresult.cpp \ + $$PWD/jsvm.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/lib/js/jsvm.cpp new/minitube-3.9.3/lib/js/jsvm.cpp --- old/minitube-3.9.2/lib/js/jsvm.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/minitube-3.9.3/lib/js/jsvm.cpp 2022-02-03 02:44:51.000000000 +0100 @@ -0,0 +1,20 @@ +#include "jsvm.h" + +JSVM::JSVM(QQmlEngine *parent) : QObject{parent}, parentEngine(parent) {} + +QJSValue JSVM::runInContext(QString code, QJSValue props) { + auto engine = QQmlEngine(this); + + auto objectKeysFunction = parentEngine->evaluate("Object.keys"); + auto keys = objectKeysFunction.call({props}); + const int keyLength = keys.property("length").toInt(); + for (int i = 0; i < keyLength; ++i) { + auto key = keys.property(i).toString(); + auto value = props.property(key).toString(); + qDebug() << "Setting property" << key << value; + engine.globalObject().setProperty(key, value); + } + + auto res = engine.evaluate(code).toString(); + return parentEngine->toScriptValue(res); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/lib/js/jsvm.h new/minitube-3.9.3/lib/js/jsvm.h --- old/minitube-3.9.2/lib/js/jsvm.h 1970-01-01 01:00:00.000000000 +0100 +++ new/minitube-3.9.3/lib/js/jsvm.h 2022-02-03 02:44:51.000000000 +0100 @@ -0,0 +1,18 @@ +#ifndef JSVM_H +#define JSVM_H + +#include <QtCore> +#include <QtQml> + +class JSVM : public QObject { + Q_OBJECT +public: + explicit JSVM(QQmlEngine *parent); + + Q_INVOKABLE QJSValue runInContext(QString code, QJSValue props); + +private: + QQmlEngine *parentEngine; +}; + +#endif // JSVM_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/locale/gl.ts new/minitube-3.9.3/locale/gl.ts --- old/minitube-3.9.2/locale/gl.ts 2021-11-11 13:11:41.000000000 +0100 +++ new/minitube-3.9.3/locale/gl.ts 2022-02-03 02:44:51.000000000 +0100 @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="gl"> <context> <name>AboutView</name> <message> @@ -223,7 +223,7 @@ </message> <message numerus="yes"> <source>%n year(s) ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n ano(s) atr??s</numerusform><numerusform>%n ano(s) atr??s</numerusform></translation> </message> </context> <context> @@ -852,15 +852,15 @@ </message> <message> <source>Rewind %1 seconds</source> - <translation type="unfinished"/> + <translation>Rebobina %1 segundos</translation> </message> <message> <source>Fast forward %1 seconds</source> - <translation type="unfinished"/> + <translation>Avanzar %1 segundos</translation> </message> <message> <source>channel</source> - <translation type="unfinished"/> + <translation>canle</translation> </message> </context> <context> @@ -1038,19 +1038,19 @@ </message> <message> <source>This year</source> - <translation type="unfinished"/> + <translation>Este ano</translation> </message> <message> <source>HD</source> - <translation type="unfinished"/> + <translation>HD</translation> </message> <message> <source>4K</source> - <translation type="unfinished"/> + <translation>4K</translation> </message> <message> <source>HDR</source> - <translation type="unfinished"/> + <translation>HDR</translation> </message> </context> <context> @@ -1099,19 +1099,19 @@ </message> <message> <source>Remove</source> - <translation type="unfinished"/> + <translation>Eliminar</translation> </message> <message> <source>Need a remote control for %1? Try %2!</source> - <translation type="unfinished"/> + <translation>Necesitas un control remoto para %1? Proba %2!</translation> </message> <message> <source>I keep improving %1 to make it the best I can. Support this work!</source> - <translation type="unfinished"/> + <translation>Sigo mellorando %1 para que sexa o mellor posible. Apoia este traballo!</translation> </message> <message> <source>An update is ready to be installed. Quit and install update.</source> - <translation type="unfinished"/> + <translation>Hai unha actualizaci??n para ser instalada. Saia e instale a actualizaci??n.</translation> </message> </context> <context> @@ -1167,23 +1167,23 @@ </message> <message> <source>Trending</source> - <translation type="unfinished"/> + <translation>Tendencia</translation> </message> <message> <source>Music</source> - <translation type="unfinished"/> + <translation>M??sica</translation> </message> <message> <source>News</source> - <translation type="unfinished"/> + <translation>Noticias</translation> </message> <message> <source>Movies</source> - <translation type="unfinished"/> + <translation>Pel??culas</translation> </message> <message> <source>Gaming</source> - <translation type="unfinished"/> + <translation>Xogos</translation> </message> </context> <context> @@ -1201,31 +1201,31 @@ <name>Updater</name> <message> <source>Check for Updates...</source> - <translation type="unfinished"/> + <translation>Buscando actualizaci??ns...</translation> </message> <message> <source>Version %1 is available...</source> - <translation type="unfinished"/> + <translation>Est?? dispo??ible a versi??n %1...</translation> </message> <message> <source>Downloading version %1...</source> - <translation type="unfinished"/> + <translation>Baixando a versi??n %1...</translation> </message> <message> <source>Restart to Update</source> - <translation type="unfinished"/> + <translation>Reiniciar para actualizar</translation> </message> <message> <source>Version %1 download failed</source> - <translation type="unfinished"/> + <translation>Erro ao baixar a versi??n %1</translation> </message> <message> <source>Check for Updates</source> - <translation type="unfinished"/> + <translation>Buscar actualizaci??ns</translation> </message> <message> <source>Download Update</source> - <translation type="unfinished"/> + <translation>Baixar actualizaci??n</translation> </message> <message> <source>Downloading update...</source> @@ -1233,19 +1233,19 @@ </message> <message> <source>Retry Update Download</source> - <translation type="unfinished"/> + <translation>Volver a intentar baixar a actualizaci??n</translation> </message> <message> <source>You have the latest version.</source> - <translation type="unfinished"/> + <translation>Xa tes a ??ltima versi??n.</translation> </message> <message> <source>Version %1 is available.</source> - <translation type="unfinished"/> + <translation>Est?? dispo??ible a versi??n %1.</translation> </message> <message> <source>An update has been downloaded and is ready to be installed.</source> - <translation type="unfinished"/> + <translation>Baixouse unha actualizaci??n e est?? listo para que se instale.</translation> </message> </context> <context> @@ -1461,18 +1461,18 @@ <name>updater::DefaultUpdater</name> <message> <source>There are currently no updates available.</source> - <translation type="unfinished"/> + <translation>Non hai actualmente actualizaci??ns dispo??ibles.</translation> </message> </context> <context> <name>updater::Dialog</name> <message> <source>You already have the latest version</source> - <translation type="unfinished"/> + <translation>Xa tes a ??ltima versi??n</translation> </message> <message> <source>Downloading %1 %2...</source> - <translation type="unfinished"/> + <translation>Baixando %1 %2...</translation> </message> <message> <source>A new version of %1 is available!</source> @@ -1492,7 +1492,7 @@ </message> <message> <source>Download Update</source> - <translation type="unfinished"/> + <translation>Baixar actualizaci??n</translation> </message> </context> </TS> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/locale/ru.ts new/minitube-3.9.3/locale/ru.ts --- old/minitube-3.9.2/locale/ru.ts 2021-11-11 13:11:41.000000000 +0100 +++ new/minitube-3.9.3/locale/ru.ts 2022-02-03 02:44:51.000000000 +0100 @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ru"> <context> <name>AboutView</name> <message> @@ -224,7 +224,7 @@ </message> <message numerus="yes"> <source>%n year(s) ago</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n ?????? ??????????</numerusform><numerusform>%n ?????? ??????????</numerusform><numerusform>%n ?????? ??????????</numerusform><numerusform>%n ?????? ??????????</numerusform></translation> </message> </context> <context> @@ -278,7 +278,7 @@ </message> <message numerus="yes"> <source>%n Download(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>?????????????? %n ??????</numerusform><numerusform>?????????????? %n ??????</numerusform><numerusform>?????????????? %n ??????</numerusform><numerusform>?????????????? %n ??????</numerusform></translation> </message> </context> <context> @@ -861,7 +861,7 @@ </message> <message> <source>channel</source> - <translation type="unfinished"/> + <translation>??????????</translation> </message> </context> <context> @@ -1039,19 +1039,19 @@ </message> <message> <source>This year</source> - <translation type="unfinished"/> + <translation>?? ???????? ????????</translation> </message> <message> <source>HD</source> - <translation type="unfinished"/> + <translation>HD</translation> </message> <message> <source>4K</source> - <translation type="unfinished"/> + <translation>4K</translation> </message> <message> <source>HDR</source> - <translation type="unfinished"/> + <translation>HDR</translation> </message> </context> <context> @@ -1100,19 +1100,19 @@ </message> <message> <source>Remove</source> - <translation type="unfinished"/> + <translation>????????????</translation> </message> <message> <source>Need a remote control for %1? Try %2!</source> - <translation type="unfinished"/> + <translation>?????????? ?????????? ?????? %1? ???????????????????? %2!</translation> </message> <message> <source>I keep improving %1 to make it the best I can. Support this work!</source> - <translation type="unfinished"/> + <translation>?? ???????? ???????????????? %1 , ?????????? ?????????????? ?????????????? ????????????????????. ???????????????????? ????????????!</translation> </message> <message> <source>An update is ready to be installed. Quit and install update.</source> - <translation type="unfinished"/> + <translation>???????????????????? ???????????? ?????? ??????????????????. ?????????????? ?? ???????????????????? ????????????????????.</translation> </message> </context> <context> @@ -1168,23 +1168,23 @@ </message> <message> <source>Trending</source> - <translation type="unfinished"/> + <translation>????????????????????</translation> </message> <message> <source>Music</source> - <translation type="unfinished"/> + <translation>????????????</translation> </message> <message> <source>News</source> - <translation type="unfinished"/> + <translation>??????????????</translation> </message> <message> <source>Movies</source> - <translation type="unfinished"/> + <translation>????????????</translation> </message> <message> <source>Gaming</source> - <translation type="unfinished"/> + <translation>????????</translation> </message> </context> <context> @@ -1202,31 +1202,31 @@ <name>Updater</name> <message> <source>Check for Updates...</source> - <translation type="unfinished"/> + <translation>?????????????????? ????????????????????...</translation> </message> <message> <source>Version %1 is available...</source> - <translation type="unfinished"/> + <translation>???????????????? ???????????? %1 </translation> </message> <message> <source>Downloading version %1...</source> - <translation type="unfinished"/> + <translation>?????????? ???????????? %1...</translation> </message> <message> <source>Restart to Update</source> - <translation type="unfinished"/> + <translation>???????????????????? ?????? ????????????????????</translation> </message> <message> <source>Version %1 download failed</source> - <translation type="unfinished"/> + <translation>???????????????? ???????????? %1 ??????????????????</translation> </message> <message> <source>Check for Updates</source> - <translation type="unfinished"/> + <translation>?????????????????? ????????????????????</translation> </message> <message> <source>Download Update</source> - <translation type="unfinished"/> + <translation>?????????????? ????????????????????</translation> </message> <message> <source>Downloading update...</source> @@ -1234,19 +1234,19 @@ </message> <message> <source>Retry Update Download</source> - <translation type="unfinished"/> + <translation>???????????????????? ?????????????? ???????????????????? ????????????</translation> </message> <message> <source>You have the latest version.</source> - <translation type="unfinished"/> + <translation>?? ?????? ?????????????????? ????????????.</translation> </message> <message> <source>Version %1 is available.</source> - <translation type="unfinished"/> + <translation>???????????????? ???????????? %1 </translation> </message> <message> <source>An update has been downloaded and is ready to be installed.</source> - <translation type="unfinished"/> + <translation>???????????????????? ???????? ?????????????????? ?? ???????????? ?? ??????????????????.</translation> </message> </context> <context> @@ -1462,18 +1462,18 @@ <name>updater::DefaultUpdater</name> <message> <source>There are currently no updates available.</source> - <translation type="unfinished"/> + <translation>?????? ?????????? ????????????????????.</translation> </message> </context> <context> <name>updater::Dialog</name> <message> <source>You already have the latest version</source> - <translation type="unfinished"/> + <translation>?? ?????? ?????? ?????????????????? ????????????</translation> </message> <message> <source>Downloading %1 %2...</source> - <translation type="unfinished"/> + <translation>?????????????????????? %1 %2...</translation> </message> <message> <source>A new version of %1 is available!</source> @@ -1493,7 +1493,7 @@ </message> <message> <source>Download Update</source> - <translation type="unfinished"/> + <translation>?????????????? ????????????????????</translation> </message> </context> </TS> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/minitube.pro new/minitube-3.9.3/minitube.pro --- old/minitube-3.9.2/minitube.pro 2021-11-11 13:11:41.000000000 +0100 +++ new/minitube-3.9.3/minitube.pro 2022-02-03 02:44:51.000000000 +0100 @@ -1,7 +1,7 @@ CONFIG += c++17 exceptions_off rtti_off object_parallel_to_source TEMPLATE = app -VERSION = 3.9.2 +VERSION = 3.9.3 DEFINES += APP_VERSION="$$VERSION" APP_NAME = Minitube diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9.2/src/mainwindow.cpp new/minitube-3.9.3/src/mainwindow.cpp --- old/minitube-3.9.2/src/mainwindow.cpp 2021-11-11 13:11:41.000000000 +0100 +++ new/minitube-3.9.3/src/mainwindow.cpp 2022-02-03 02:44:51.000000000 +0100 @@ -171,7 +171,7 @@ } else if (VideoAPI::impl() == VideoAPI::YT3) { YT3::instance().initApiKeys(); } else if (VideoAPI::impl() == VideoAPI::JS) { - JS::instance().initialize(QUrl(QLatin1String(Constants::WEBSITE) + "-ws/bundle2.js")); + JS::instance().initialize(QUrl(QLatin1String(Constants::WEBSITE) + "-ws/bundle3.js")); // JS::instance().initialize(QUrl("http://localhost:8000/bundle-test.js";)); Invidious::instance().initServers(); }
