SHA256
1
0
forked from pool/kirigami2
Fabian Vogt 2021-03-13 15:39:49 +00:00 committed by Git OBS Bridge
parent ba2129e90b
commit 30defb6d86
7 changed files with 32 additions and 106 deletions

View File

@ -1,88 +0,0 @@
From 9ea169167bb792b5128e707dbb76e4f659dc22e2 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 9 Jun 2020 08:27:30 +0200
Subject: [PATCH] Revert "Watch for language change events, and forward those
to the QML engine"
This reverts commit 9b7cae898ed7d9b58e65035b8216ec6ff78bfa17.
It causes several KCMs to crash, with Qt 5.12 at least.
References: boo#1167690, kde#419008
---
src/kirigamiplugin.cpp | 33 ---------------------------------
src/kirigamiplugin.h | 5 -----
2 files changed, 38 deletions(-)
Index: kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.cpp
===================================================================
--- kirigami2-5.56.0git.20210118T122536~4ea74c86.orig/src/kirigamiplugin.cpp 2021-01-18 11:25:36.000000000 +0100
+++ kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.cpp 2021-01-19 09:48:47.310333643 +0100
@@ -51,33 +51,6 @@
}
};
-// we can't do this in the plugin object directly, as that can live in a different thread
-// and event filters are only allowed in the same thread as the filtered object
-class LanguageChangeEventFilter : public QObject
-{
- Q_OBJECT
-public:
- bool eventFilter(QObject *receiver, QEvent *event) override
- {
- if (event->type() == QEvent::LanguageChange && receiver == QCoreApplication::instance()) {
- Q_EMIT languageChangeEvent();
- }
- return QObject::eventFilter(receiver, event);
- }
-
-Q_SIGNALS:
- void languageChangeEvent();
-};
-
-KirigamiPlugin::KirigamiPlugin(QObject *parent)
- : QQmlExtensionPlugin(parent)
-{
- auto filter = new LanguageChangeEventFilter;
- filter->moveToThread(QCoreApplication::instance()->thread());
- QCoreApplication::instance()->installEventFilter(filter);
- connect(filter, &LanguageChangeEventFilter::languageChangeEvent, this, &KirigamiPlugin::languageChangeEvent);
-}
-
QUrl KirigamiPlugin::componentUrl(const QString &fileName) const
{
for (const QString &style : qAsConst(m_stylesFallbackChain)) {
@@ -279,10 +252,4 @@
qmlProtectModule(uri, 2);
}
-void KirigamiPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
- Q_UNUSED(uri);
- connect(this, &KirigamiPlugin::languageChangeEvent, engine, &QQmlEngine::retranslate);
-}
-
#include "kirigamiplugin.moc"
Index: kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.h
===================================================================
--- kirigami2-5.56.0git.20210118T122536~4ea74c86.orig/src/kirigamiplugin.h 2021-01-18 11:25:36.000000000 +0100
+++ kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.h 2021-01-19 09:48:47.310333643 +0100
@@ -24,9 +24,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
- KirigamiPlugin(QObject *parent = nullptr);
void registerTypes(const char *uri) override;
- void initializeEngine(QQmlEngine *engine, const char *uri) override;
#ifdef KIRIGAMI_BUILD_TYPE_STATIC
static KirigamiPlugin& getInstance()
@@ -46,9 +44,6 @@
}
#endif
-Q_SIGNALS:
- void languageChangeEvent();
-
private:
QUrl componentUrl(const QString &fileName) const;
QString resolveFilePath(const QString &path) const

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7d39c9dbc20ce0fda1adfe27745ffcd8ec02ca79e8f344efc5b858fd1312b07
size 300576

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmAe6y0ACgkQWNDuZIpI
s7vL6QgAtrc2M8vNOYtTNm/zj1QIRe8U3KnNLpoYzvR15/T/nCeXZ1Li5XfY6ues
BikzW1zj7vn+CIsNOCWPtx4IZLx+vS3ThMuJZ/+MRh787A2SWtTEwNTeyAlSCchc
+CCK0FELmzs2jDz7fs2Vsa0qw3uKqhEzjn42YLICWvj9Bj3fxBvxLBiHU9tU9BEC
7nhGgQ6sPC386oP8JRWEQGPStJkPfNNY/yoPtUtwkbuwumIuouJL1GzoRqJKUNa9
8QqcbJyYlTxKsw567CHW/1mN2o9uOZoEYoEmcBdyw8iOW4cg2B5sLUakCGfDldXA
G+uZqJN1DWfBeJW7O8twMRQze0WnKg==
=UkVP
-----END PGP SIGNATURE-----

3
kirigami2-5.80.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:228ef76fa69f1d7f89f8f04be93a0528507352f3c97f6d98b6259207b2679272
size 310608

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmBD1iIACgkQWNDuZIpI
s7tcUAgAmPmvuZcmCeBJrjlHaRLqehWjPZCHm90B7/EvNyXtflkjDVoVR5dtwF+0
fs4oak1BKmONFzN2doRp3eFxGinxi8VDZN08tmRSt5JggXRCA5sI6ZuUL78khdE6
HfdzMcbwyiA2Sk8tIXQ15ub6BoLF4ugj8NGqRAgX8B8fygrTQ9gGM9y9T7hy+1K+
2bAAwlvyd6BbUGpGtjz0RHaN03cr4TwB15pfLhNDnfHorhIwU9xm3LfMKMYBmv+G
wt8C7Ar/QYzLQeBo+a1nA1s9NwnYummZglQjPpmF/QwyasmF0+fpdVjv/BsIsLBg
/fVQ7FvEH/luDcDRfXyistMge8c8fQ==
=mmg/
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Mar 7 09:26:58 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.80.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/5/5.80.0
- Too many changes since 5.79.0, only listing bugfixes:
* Support for Toolbars in standalone pages (kde#432541)
* Do not show animation on pageStack.replace (kde#426770)
* event compress the nav buttons show/hide (kde#413841)
* disable animations during replace (kde#426770)
* support icon.name (kde#433472)
* Fix binding loop (kde#429717)
- Drop 0001-Revert-Watch-for-language-change-events-and-forward-.patch
-------------------------------------------------------------------
Mon Feb 8 08:46:27 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -17,14 +17,14 @@
%define lname libKF5Kirigami2-5
%define _tar_path 5.79
%define _tar_path 5.80
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kirigami2
Version: 5.79.0
Version: 5.80.0
Release: 0
Summary: Set of QtQuick components
License: LGPL-2.1-or-later
@ -35,8 +35,6 @@ Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-OPENSUSE
Patch: 0001-Revert-Watch-for-language-change-events-and-forward-.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
BuildRequires: cmake(Qt5Concurrent) >= 5.14.0