SHA256
1
0
forked from pool/kirigami2
Christophe Giboudeaux 2021-02-13 13:03:46 +00:00 committed by Git OBS Bridge
parent 5c7ed2c482
commit ba2129e90b
7 changed files with 43 additions and 32 deletions

View File

@ -13,11 +13,11 @@ References: boo#1167690, kde#419008
src/kirigamiplugin.h | 5 ----- src/kirigamiplugin.h | 5 -----
2 files changed, 38 deletions(-) 2 files changed, 38 deletions(-)
diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp Index: kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.cpp
index acdefbc4..4670eb86 100644 ===================================================================
--- a/src/kirigamiplugin.cpp --- kirigami2-5.56.0git.20210118T122536~4ea74c86.orig/src/kirigamiplugin.cpp 2021-01-18 11:25:36.000000000 +0100
+++ b/src/kirigamiplugin.cpp +++ kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.cpp 2021-01-19 09:48:47.310333643 +0100
@@ -50,33 +50,6 @@ class CopyHelperPrivate : public QObject @@ -51,33 +51,6 @@
} }
}; };
@ -30,7 +30,7 @@ index acdefbc4..4670eb86 100644
- bool eventFilter(QObject *receiver, QEvent *event) override - bool eventFilter(QObject *receiver, QEvent *event) override
- { - {
- if (event->type() == QEvent::LanguageChange && receiver == QCoreApplication::instance()) { - if (event->type() == QEvent::LanguageChange && receiver == QCoreApplication::instance()) {
- emit languageChangeEvent(); - Q_EMIT languageChangeEvent();
- } - }
- return QObject::eventFilter(receiver, event); - return QObject::eventFilter(receiver, event);
- } - }
@ -51,7 +51,7 @@ index acdefbc4..4670eb86 100644
QUrl KirigamiPlugin::componentUrl(const QString &fileName) const QUrl KirigamiPlugin::componentUrl(const QString &fileName) const
{ {
for (const QString &style : qAsConst(m_stylesFallbackChain)) { for (const QString &style : qAsConst(m_stylesFallbackChain)) {
@@ -266,10 +239,4 @@ void KirigamiPlugin::registerTypes(const char *uri) @@ -279,10 +252,4 @@
qmlProtectModule(uri, 2); qmlProtectModule(uri, 2);
} }
@ -62,11 +62,11 @@ index acdefbc4..4670eb86 100644
-} -}
- -
#include "kirigamiplugin.moc" #include "kirigamiplugin.moc"
diff --git a/src/kirigamiplugin.h b/src/kirigamiplugin.h Index: kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.h
index 22279421..caa95f1e 100644 ===================================================================
--- a/src/kirigamiplugin.h --- kirigami2-5.56.0git.20210118T122536~4ea74c86.orig/src/kirigamiplugin.h 2021-01-18 11:25:36.000000000 +0100
+++ b/src/kirigamiplugin.h +++ kirigami2-5.56.0git.20210118T122536~4ea74c86/src/kirigamiplugin.h 2021-01-19 09:48:47.310333643 +0100
@@ -20,9 +20,7 @@ class KirigamiPlugin : public QQmlExtensionPlugin @@ -24,9 +24,7 @@
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public: public:
@ -76,7 +76,7 @@ index 22279421..caa95f1e 100644
#ifdef KIRIGAMI_BUILD_TYPE_STATIC #ifdef KIRIGAMI_BUILD_TYPE_STATIC
static KirigamiPlugin& getInstance() static KirigamiPlugin& getInstance()
@@ -39,9 +37,6 @@ public: @@ -46,9 +44,6 @@
} }
#endif #endif
@ -86,6 +86,3 @@ index 22279421..caa95f1e 100644
private: private:
QUrl componentUrl(const QString &fileName) const; QUrl componentUrl(const QString &fileName) const;
QString resolveFilePath(const QString &path) const QString resolveFilePath(const QString &path) const
--
2.26.2

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl/wejAACgkQWNDuZIpI
s7s8EwgAkPpakPSYR3b+LsD50Q7dEGg+7h8jLfnnLRkhvPSgXSgbygTJ35tsEjV7
I4So9rfB6B7yiL+oj8lPShRB4ILCaNKB/TOqWbirWmx+ZbJq7DeCKT4IaYIrfpS5
CNqkXepEBRON6MoPs8rDWAmz8EF7tYmb+Cc+6hYdGp5YiboIbnLtDWXnNb8wdsEI
g53IMRHO3/GldKw5DImfqLXiKnEIQDuRZyLhYL30+2uZJRBnFvoPx3LWtQxuWGq3
ewiqWhzPg50zhUowOQn2DsQyEdQ+itAUJuLi6xJe42HU++PDDyBA7Dif9mFV6QXm
tAffNjk62T7SP9kjAqosZMIBv5WVSw==
=Mzzk
-----END PGP SIGNATURE-----

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

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

View File

@ -0,0 +1,11 @@
-----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-----

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Feb 8 08:46:27 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.79.0
* New feature release
* For more details please see:
* https://kde.org/announcements/kde-frameworks-5.79.0
- Too many changes since 5.78.0, only listing bugfixes:
* Don't manually call reverseTwinsChanged when destructing FormLayout (kde#431419)
* Don't consider Synthetized mouse events as Mouse (kde#431542)
* correctly update header size (kde#429235)
* [controls/OverlaySheet]: Respect Layout.maximumWidth (kde#431089)
* [controls/ListItemDragHandle] Fix wrong arrangement on no-scrolling case (kde#431214)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 6 10:47:45 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr> Wed Jan 6 10:47:45 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -17,14 +17,14 @@
%define lname libKF5Kirigami2-5 %define lname libKF5Kirigami2-5
%define _tar_path 5.78 %define _tar_path 5.79
# Full KF5 version (e.g. 5.33.0) # Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}} %{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33) # 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}')} %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
Name: kirigami2 Name: kirigami2
Version: 5.78.0 Version: 5.79.0
Release: 0 Release: 0
Summary: Set of QtQuick components Summary: Set of QtQuick components
License: LGPL-2.1-or-later License: LGPL-2.1-or-later