Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2020-12-15 12:28:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Tue Dec 15 12:28:40 2020 rev:89 rq:855432 version:5.77.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2020-11-25 19:28:56.218458944 +0100 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.2328/kglobalaccel.changes 2020-12-15 12:30:47.768020211 +0100 @@ -1,0 +2,10 @@ +Sat Dec 5 18:56:33 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.77.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.77.0 +- Changes since 5.76.0: + * Load statically linked kglobalacceld interface plugins + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.76.0.tar.xz kglobalaccel-5.76.0.tar.xz.sig New: ---- kglobalaccel-5.77.0.tar.xz kglobalaccel-5.77.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.auvAQB/_old 2020-12-15 12:30:48.416020733 +0100 +++ /var/tmp/diff_new_pack.auvAQB/_new 2020-12-15 12:30:48.424020739 +0100 @@ -17,14 +17,14 @@ %define lname libKF5GlobalAccel5 -%define _tar_path 5.76 +%define _tar_path 5.77 # 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: kglobalaccel -Version: 5.76.0 +Version: 5.77.0 Release: 0 Summary: Global desktop keyboard shortcuts License: LGPL-2.1-or-later @@ -37,26 +37,25 @@ %endif Source99: baselibs.conf # PATCH-FIX-OPENSUSE -Patch1: 0001-Revert-systemd-dbus-activation.patch +Patch0: 0001-Revert-systemd-dbus-activation.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libxcb-devel BuildRequires: pkgconfig -BuildRequires: systemd-rpm-macros BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5Crash) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5DBusAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5DBus) >= 5.12.0 -BuildRequires: cmake(Qt5Test) >= 5.12.0 -BuildRequires: cmake(Qt5Widgets) >= 5.12.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.12.0 +BuildRequires: cmake(Qt5DBus) >= 5.13.0 +BuildRequires: cmake(Qt5Test) >= 5.13.0 +BuildRequires: cmake(Qt5Widgets) >= 5.13.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.13.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-keysyms) %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.12.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.13.0 %endif %description @@ -94,8 +93,8 @@ Requires: %{lname} = %{version} Requires: extra-cmake-modules Requires: libKF5GlobalAccelPrivate5 = %{version} -Requires: cmake(Qt5DBus) >= 5.12.0 -Requires: cmake(Qt5Widgets) >= 5.12.0 +Requires: cmake(Qt5DBus) >= 5.13.0 +Requires: cmake(Qt5Widgets) >= 5.13.0 %description devel KGlobalAccel allows you to have global accelerators that are independent of @@ -114,8 +113,7 @@ %lang_package -n %{lname} %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert @@ -134,15 +132,6 @@ %post -n libKF5GlobalAccelPrivate5 -p /sbin/ldconfig %postun -n libKF5GlobalAccelPrivate5 -p /sbin/ldconfig -%post -%{systemd_user_post plasma-kglobalaccel.service} - -%preun -%{systemd_user_preun} - -%postun -%{systemd_user_postun} - %if %{with lang} %files -n %{lname}-lang -f %{name}5.lang %endif @@ -174,7 +163,5 @@ %{_kf5_plugindir}/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateXcb.so %{_kf5_sharedir}/dbus-1/services/org.kde.kglobalaccel.service %{_kf5_servicesdir}/kglobalaccel5.desktop -#Disabled by Patch1 -#%{_userunitdir}/plasma-kglobalaccel.service %changelog ++++++ kglobalaccel-5.76.0.tar.xz -> kglobalaccel-5.77.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.76.0/CMakeLists.txt new/kglobalaccel-5.77.0/CMakeLists.txt --- old/kglobalaccel-5.76.0/CMakeLists.txt 2020-11-07 13:06:40.000000000 +0100 +++ new/kglobalaccel-5.77.0/CMakeLists.txt 2020-12-05 13:45:02.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.76.0") # handled by release scripts -set(KF5_DEP_VERSION "5.76.0") # handled by release scripts +set(KF5_VERSION "5.77.0") # handled by release scripts +set(KF5_DEP_VERSION "5.77.0") # handled by release scripts project(KGlobalAccel VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.76.0 NO_MODULE) +find_package(ECM 5.77.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -36,7 +36,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.12.0) +set(REQUIRED_QT_VERSION 5.13.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets) # Dependencies of runtime component diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.76.0/po/ml/kglobalaccel5_qt.po new/kglobalaccel-5.77.0/po/ml/kglobalaccel5_qt.po --- old/kglobalaccel-5.76.0/po/ml/kglobalaccel5_qt.po 2020-11-07 13:06:40.000000000 +0100 +++ new/kglobalaccel-5.77.0/po/ml/kglobalaccel5_qt.po 2020-12-05 13:45:02.000000000 +0100 @@ -20,8 +20,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" -"X-Poedit-Country: INDIA\n" "X-Qt-Contexts: true\n" #: kglobalaccel.cpp:542 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.76.0/po/zh_CN/kglobalaccel5_qt.po new/kglobalaccel-5.77.0/po/zh_CN/kglobalaccel5_qt.po --- old/kglobalaccel-5.76.0/po/zh_CN/kglobalaccel5_qt.po 2020-11-07 13:06:40.000000000 +0100 +++ new/kglobalaccel-5.77.0/po/zh_CN/kglobalaccel5_qt.po 2020-12-05 13:45:02.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-10-08 19:21\n" +"PO-Revision-Date: 2020-11-10 15:00\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.76.0/src/runtime/globalshortcutsregistry.cpp new/kglobalaccel-5.77.0/src/runtime/globalshortcutsregistry.cpp --- old/kglobalaccel-5.76.0/src/runtime/globalshortcutsregistry.cpp 2020-11-07 13:06:40.000000000 +0100 +++ new/kglobalaccel-5.77.0/src/runtime/globalshortcutsregistry.cpp 2020-12-05 13:45:02.000000000 +0100 @@ -24,26 +24,51 @@ #include <QKeySequence> #include <QDBusConnection> +static bool checkPlatform(const QJsonObject &metadata, const QString &platformName) +{ + const QJsonArray platforms = metadata.value(QStringLiteral("MetaData")) + .toObject().value(QStringLiteral("platforms")).toArray(); + return std::any_of(platforms.begin(), platforms.end(), [&platformName](const QJsonValue &value) { + return QString::compare(platformName, value.toString(), Qt::CaseInsensitive) == 0; + }); +} + static KGlobalAccelInterface *loadPlugin(GlobalShortcutsRegistry *parent) { - const QVector<KPluginMetaData> candidates = KPluginLoader::findPlugins(QStringLiteral("org.kde.kglobalaccel5.platforms")); QString platformName = QString::fromLocal8Bit(qgetenv("KGLOBALACCELD_PLATFORM")); if (platformName.isEmpty()) { platformName = QGuiApplication::platformName(); } + + const QVector<QStaticPlugin> staticPlugins = QPluginLoader::staticPlugins(); + for (const QStaticPlugin &staticPlugin : staticPlugins) { + const QJsonObject metadata = staticPlugin.metaData(); + if (metadata.value(QLatin1String("IID")) != QLatin1String(KGlobalAccelInterface_iid)) { + continue; + } + if (checkPlatform(metadata, platformName)) { + KGlobalAccelInterface *interface = qobject_cast<KGlobalAccelInterface *>(staticPlugin.instance()); + if (interface) { + qCDebug(KGLOBALACCELD) << "Loaded a static plugin for platform" << platformName; + interface->setRegistry(parent); + return interface; + } + } + } + + const QVector<KPluginMetaData> candidates = KPluginLoader::findPlugins(QStringLiteral("org.kde.kglobalaccel5.platforms")); for (const KPluginMetaData &candidate : candidates) { - const QJsonArray platforms = candidate.rawData().value(QStringLiteral("platforms")).toArray(); - for (auto it = platforms.begin(); it != platforms.end(); ++it) { - if (QString::compare(platformName, (*it).toString(), Qt::CaseInsensitive) == 0) { - KGlobalAccelInterface *interface = qobject_cast< KGlobalAccelInterface* >(candidate.instantiate()); - if (interface) { - qCDebug(KGLOBALACCELD) << "Loaded plugin" << candidate.fileName() << "for platform" << platformName; - interface->setRegistry(parent); - return interface; - } + QPluginLoader loader(candidate.fileName()); + if (checkPlatform(loader.metaData(), platformName)) { + KGlobalAccelInterface *interface = qobject_cast<KGlobalAccelInterface *>(loader.instance()); + if (interface) { + qCDebug(KGLOBALACCELD) << "Loaded plugin" << candidate.fileName() << "for platform" << platformName; + interface->setRegistry(parent); + return interface; } } } + qCWarning(KGLOBALACCELD) << "Could not find any platform plugin"; return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.76.0/src/runtime/kglobalaccel_interface.h new/kglobalaccel-5.77.0/src/runtime/kglobalaccel_interface.h --- old/kglobalaccel-5.76.0/src/runtime/kglobalaccel_interface.h 2020-11-07 13:06:40.000000000 +0100 +++ new/kglobalaccel-5.77.0/src/runtime/kglobalaccel_interface.h 2020-12-05 13:45:02.000000000 +0100 @@ -15,6 +15,8 @@ class GlobalShortcutsRegistry; +#define KGlobalAccelInterface_iid "org.kde.kglobalaccel5.KGlobalAccelInterface" + /** * Abstract interface for plugins to implement */ @@ -68,6 +70,6 @@ QScopedPointer<Private> d; }; -Q_DECLARE_INTERFACE(KGlobalAccelInterface, "org.kde.kglobalaccel5.KGlobalAccelInterface") +Q_DECLARE_INTERFACE(KGlobalAccelInterface, KGlobalAccelInterface_iid) #endif _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
