Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package musescore for openSUSE:Factory
checked in at 2021-04-25 21:27:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/musescore (Old)
and /work/SRC/openSUSE:Factory/.musescore.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "musescore"
Sun Apr 25 21:27:31 2021 rev:24 rq:888319 version:3.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/musescore/musescore.changes 2021-03-30
20:53:56.848287644 +0200
+++ /work/SRC/openSUSE:Factory/.musescore.new.12324/musescore.changes
2021-04-25 21:29:07.416553225 +0200
@@ -1,0 +2,17 @@
+Sun Apr 25 12:38:29 UTC 2021 - Cor Blom <corne...@solcon.nl>
+
+- Do not build with qtwebengine on ppc64 and ppc64le
+
+-------------------------------------------------------------------
+Sun Apr 25 12:13:06 UTC 2021 - Cor Blom <corne...@solcon.nl>
+
+- Change the GenericName in the desktop file to something that is
+ really generic: Music score typesetter
+
+-------------------------------------------------------------------
+Sat Apr 24 12:43:24 UTC 2021 - Cor Blom <corne...@solcon.nl>
+
+- Add no-webview-in-startcentre.patch to prevent that webview is
+ used in startcentre (boo#1181604)
+
+-------------------------------------------------------------------
New:
----
no-webview-in-startcentre.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ musescore.spec ++++++
--- /var/tmp/diff_new_pack.00BtTv/_old 2021-04-25 21:29:08.296554283 +0200
+++ /var/tmp/diff_new_pack.00BtTv/_new 2021-04-25 21:29:08.296554283 +0200
@@ -16,6 +16,12 @@
#
+%ifarch ppc64 ppc64le
+%define qtwebengine 0
+%else
+%define qtwebengine 1
+%endif
+
# Internal QML imports
%global __requires_exclude qmlimport\\((MuseScore|FileIO).*
@@ -40,6 +46,8 @@
Patch0: use-qtmake-qt5.patch
# PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed
Patch1: use-system-qtwebengine-files.patch
+# PATCH-FIX-OPENSUSE: don't use webview in startcentre (boo#1181604)
+Patch2: no-webview-in-startcentre.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -64,9 +72,11 @@
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5UiTools)
+%if %qtwebengine
BuildRequires: pkgconfig(Qt5WebEngine)
BuildRequires: pkgconfig(Qt5WebEngineCore)
BuildRequires: pkgconfig(Qt5WebEngineWidgets)
+%endif
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(Qt5XmlPatterns)
@@ -126,7 +136,10 @@
-DCMAKE_BUILD_TYPE=RELEASE \
-DMUSESCORE_BUILD_CONFIG=release \
-DUSE_SYSTEM_FREETYPE="ON" \
+%if %qtwebengine
-DBUILD_WEBENGINE="ON" \
+%endif
+ -DBUILD_TELEMETRY_MODULE=OFF \
-DMUSESCORE_REVISION=%{revision}
%make_jobs lrelease all
++++++ mscore.desktop ++++++
--- /var/tmp/diff_new_pack.00BtTv/_old 2021-04-25 21:29:08.332554327 +0200
+++ /var/tmp/diff_new_pack.00BtTv/_new 2021-04-25 21:29:08.332554327 +0200
@@ -2,7 +2,7 @@
Comment=WYSIWYG Music score typesetter
Comment[de]=WYSIWYG Noteneditor
Exec=mscore
-GenericName=mscore
+GenericName=Music score typesetter
Icon=mscore
Name=MuseScore
StartupNotify=true
++++++ no-webview-in-startcentre.patch ++++++
diff -ur a/mscore/startcenter.cpp b/mscore/startcenter.cpp
--- a/mscore/startcenter.cpp 2021-02-08 13:16:37.000000000 +0100
+++ b/mscore/startcenter.cpp 2021-04-24 14:18:23.888027687 +0200
@@ -58,43 +58,6 @@
connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
setStyleSheet(QString("QPushButton { background-color: %1
}").arg(openScore->palette().color(QPalette::Base).name()));
-#ifdef USE_WEBENGINE
- if (!noWebView) {
-#if defined(WIN_PORTABLE)
- QWebEngineProfile* defaultProfile =
QWebEngineProfile::defaultProfile();
-
defaultProfile->setCachePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath())));
-
defaultProfile->setPersistentStoragePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath())));
-#endif
- _webView = new MyWebView(this);
- _webView->setMaximumWidth(200);
-
- MyWebEnginePage* page = new MyWebEnginePage(this);
- MyWebUrlRequestInterceptor* wuri = new
MyWebUrlRequestInterceptor(page);
- QWebEngineProfile* profile = page->profile();
-#if defined(WIN_PORTABLE)
-
profile->setCachePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath())));
-
profile->setPersistentStoragePath(QDir::cleanPath(QString("%1/../../../Data/settings/QWebEngine").arg(QCoreApplication::applicationDirPath())));
-#endif
- profile->setRequestInterceptor(wuri);
- _webView->setPage(page);
-
- auto extendedVer = QString(VERSION) + "." + QString(BUILD_NUMBER);
- QUrl connectPageUrl =
QUrl(QString("https://connect2.musescore.com/?version=%1";).arg(extendedVer));
- _webView->setUrl(connectPageUrl);
-
- horizontalLayout->addWidget(_webView);
-
- //workaround for the crashes sometimes happening in Chromium on
macOS with Qt 5.12
- connect(_webView, &QWebEngineView::renderProcessTerminated, this,
[this, profile, connectPageUrl](QWebEnginePage::RenderProcessTerminationStatus
terminationStatus, int exitCode)
- {
- qDebug() << "Login page loading terminated" <<
terminationStatus << " " << exitCode;
- profile->clearHttpCache();
- _webView->load(connectPageUrl);
- _webView->show();
- });
- }
-#endif
-
// if (enableExperimental)
// right now don???t know how it use in WebEngine @handrok
//
QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled,
true);
@@ -217,62 +180,5 @@
AbstractDialog::keyReleaseEvent(event);
}
-#ifdef USE_WEBENGINE
-
-//---------------------------------------------------------
-// MyWebView
-//---------------------------------------------------------
-
-MyWebView::MyWebView(QWidget *parent):
- QWebEngineView(parent)
- {
- if (!enableExperimental)
- setContextMenuPolicy(Qt::NoContextMenu);
- }
-
-//---------------------------------------------------------
-// ~MyWebView
-//---------------------------------------------------------
-
-MyWebView::~MyWebView()
- {
- disconnect(this, SIGNAL(loadFinished(bool)), this, SLOT(stopBusy(bool)));
- }
-
-//---------------------------------------------------------
-// sizeHint
-//---------------------------------------------------------
-
-QSize MyWebView::sizeHint() const
- {
- return QSize(200 , 600);
- }
-
-
-bool MyWebEnginePage::acceptNavigationRequest(const QUrl & url,
QWebEnginePage::NavigationType type, bool isMainFrame)
- {
- qDebug() << "acceptNavigationRequest(" << url << "," << type << "," <<
isMainFrame << ")";
-
- if (type == QWebEnginePage::NavigationTypeLinkClicked)
- {
- QString path(url.path());
- QFileInfo fi(path);
- if (fi.suffix() == "mscz" || fi.suffix() == "xml"
- || fi.suffix() == "musicxml" || fi.suffix() == "mxl") {
- mscore->loadFile(url);
- QAction* a = getAction("startcenter");
- a->setChecked(false);
- mscore->showStartcenter(false);
- }
- else
- QDesktopServices::openUrl(url);
-
- return false;
- }
- return true;
- }
-
-
-#endif //USE_WEBENGINE
}
diff -ur a/mscore/startcenter.h b/mscore/startcenter.h
--- a/mscore/startcenter.h 2021-02-08 13:16:37.000000000 +0100
+++ b/mscore/startcenter.h 2021-04-24 14:19:16.684029679 +0200
@@ -19,62 +19,12 @@
namespace Ms {
-#ifdef USE_WEBENGINE
-
-class MyWebUrlRequestInterceptor : public QWebEngineUrlRequestInterceptor {
- Q_OBJECT
-
- public:
- MyWebUrlRequestInterceptor(QObject* p = Q_NULLPTR)
- : QWebEngineUrlRequestInterceptor(p) {}
-
- void interceptRequest(QWebEngineUrlRequestInfo& info)
- {
- info.setHttpHeader("Accept-Language",
-
QString("%1;q=0.8,en-US;q=0.6,en;q=0.4").arg(mscore->getLocaleISOCode()).toUtf8());
- }
- };
-
-//---------------------------------------------------------
-// MyWebEnginePage
-//---------------------------------------------------------
-
-class MyWebEnginePage : public QWebEnginePage {
- Q_OBJECT
-
- public:
- MyWebEnginePage(QObject* parent = Q_NULLPTR)
- : QWebEnginePage(parent) {}
-
- bool acceptNavigationRequest(const QUrl& url,
QWebEnginePage::NavigationType type, bool isMainFrame);
- };
-
-//---------------------------------------------------------
-// MyWebEngineView
-//---------------------------------------------------------
-
-class MyWebView : public QWebEngineView {
- Q_OBJECT
-
- public slots:
-
- public:
- MyWebView(QWidget* parent = 0);
- ~MyWebView();
- virtual QSize sizeHint() const;
- };
-
-#endif //USE_WEBENGINE
-
//---------------------------------------------------------
// Startcenter
//---------------------------------------------------------
class Startcenter : public AbstractDialog, public Ui::Startcenter {
Q_OBJECT
-#ifdef USE_WEBENGINE
- MyWebView* _webView;
-#endif
virtual void closeEvent(QCloseEvent*);
private slots:
