Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kguiaddons for openSUSE:Factory checked in at 2022-02-24 18:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Thu Feb 24 18:19:34 2022 rev:99 rq:954251 version:5.91.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2022-01-11 21:18:54.100943300 +0100 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new.1958/kguiaddons.changes 2022-02-24 18:21:45.238685543 +0100 @@ -1,0 +2,15 @@ +Sun Feb 6 10:17:00 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.91.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.91.0 +- Changes since 5.90.0: + * Add Google Maps Geo URI handler + * Add Qwant Maps to CMakeLists + * Add Qwant Maps Geo URI handler + * Add a fallback handler for the geo: URI scheme + * Install plugins in kf<version> + * Add CI qt6 support + +------------------------------------------------------------------- Old: ---- kguiaddons-5.90.0.tar.xz kguiaddons-5.90.0.tar.xz.sig New: ---- kguiaddons-5.91.0.tar.xz kguiaddons-5.91.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.0WTJIi/_old 2022-02-24 18:21:45.766685401 +0100 +++ /var/tmp/diff_new_pack.0WTJIi/_new 2022-02-24 18:21:45.770685400 +0100 @@ -17,7 +17,7 @@ %define lname libKF5GuiAddons5 -%define _tar_path 5.90 +%define _tar_path 5.91 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without released Name: kguiaddons -Version: 5.90.0 +Version: 5.91.0 Release: 0 Summary: Utilities for graphical user interfaces License: LGPL-2.1-or-later @@ -49,6 +49,7 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) +Requires: %{lname} = %{version} %description The KDE GUI addons provide utilities for graphical user interfaces in the areas @@ -57,6 +58,7 @@ %package -n %{lname} Summary: Utilities for graphical user interfaces Group: System/GUI/KDE +Recommends: %{name} %requires_ge libQt5Gui5 %description -n %{lname} @@ -88,6 +90,14 @@ %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig +%files +%license LICENSES/* +%{_kf5_bindir}/kde-geo-uri-handler +%{_kf5_applicationsdir}/openstreetmap-geo-handler.desktop +%{_kf5_applicationsdir}/wheelmap-geo-handler.desktop +%{_kf5_applicationsdir}/google-maps-geo-handler.desktop +%{_kf5_applicationsdir}/qwant-maps-geo-handler.desktop + %files -n %{lname} %license LICENSES/* %doc README* ++++++ kguiaddons-5.90.0.tar.xz -> kguiaddons-5.91.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/.gitlab-ci.yml new/kguiaddons-5.91.0/.gitlab-ci.yml --- old/kguiaddons-5.90.0/.gitlab-ci.yml 2022-01-01 13:15:08.000000000 +0100 +++ new/kguiaddons-5.91.0/.gitlab-ci.yml 2022-02-05 16:13:21.000000000 +0100 @@ -5,3 +5,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/CMakeLists.txt new/kguiaddons-5.91.0/CMakeLists.txt --- old/kguiaddons-5.90.0/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 +++ new/kguiaddons-5.91.0/CMakeLists.txt 2022-02-05 16:13:21.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_VERSION "5.91.0") # handled by release scripts project(KGuiAddons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.90.0 NO_MODULE) +find_package(ECM 5.91.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) @@ -108,7 +108,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kguiaddons_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KGuiAddons COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/autotests/CMakeLists.txt new/kguiaddons-5.91.0/autotests/CMakeLists.txt --- old/kguiaddons-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 +++ new/kguiaddons-5.91.0/autotests/CMakeLists.txt 2022-02-05 16:13:21.000000000 +0100 @@ -13,3 +13,4 @@ kurlhandlertest.cpp LINK_LIBRARIES KF5::GuiAddons Qt${QT_MAJOR_VERSION}::Test ) +ecm_add_tests(kgeourihandlertest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/autotests/kgeourihandlertest.cpp new/kguiaddons-5.91.0/autotests/kgeourihandlertest.cpp --- old/kguiaddons-5.90.0/autotests/kgeourihandlertest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/autotests/kgeourihandlertest.cpp 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,60 @@ +/* + SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#include "../src/geo-scheme-handler/kgeourihandler.cpp" + +#include <QTest> + +class KGeoUriHandlerTest : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void testHandler_data() + { + QTest::addColumn<QString>("input"); + QTest::addColumn<QString>("output"); + + QTest::newRow("empty") << QString() << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("incomplete-1") << QStringLiteral("geo:") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("incomplete-2") << QStringLiteral("geo:46.1") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("broken-1") << QStringLiteral("geo:a,b") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("broken-2") << QStringLiteral("geo:46.1;7.783") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("lat-out-of-range-1") << QStringLiteral("geo:91.0;-1.0") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("lat-out-of-range-2") << QStringLiteral("geo:-91.0;1.0") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("lon-out-of-range-1") << QStringLiteral("geo:1.0;181.0") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("lon-out-of-range-2") << QStringLiteral("geo:-1.0;-181.0") << QStringLiteral("https://openstreetmap.org";); + + QTest::newRow("2d-coord-only") << QStringLiteral("geo:46.1,7.783") << QStringLiteral("https://www.openstreetmap.org/#map=18/46.1/7.783";); + QTest::newRow("3d-coord") << QStringLiteral("geo:46.1,7.783,1600") << QStringLiteral("https://www.openstreetmap.org/#map=18/46.1/7.783";); + QTest::newRow("2d-coord-with-uncertainty") << QStringLiteral("geo:46.1,7.783;u=100") + << QStringLiteral("https://www.openstreetmap.org/#map=18/46.1/7.783";); + QTest::newRow("2d-coord-with-z") << QStringLiteral("geo:46.1,7.783?z=19") << QStringLiteral("https://www.openstreetmap.org/#map=19/46.1/7.783";); + QTest::newRow("negative-coord") << QStringLiteral("geo:-34.59,-58.375") << QStringLiteral("https://www.openstreetmap.org/#map=18/-34.59/-58.375";); + + QTest::newRow("query") << QStringLiteral("geo:0,0?q=Randa") << QStringLiteral("https://www.openstreetmap.org/search?query=Randa";); + QTest::newRow("query-with-coord") << QStringLiteral("geo:46.1,7.783?q=Randa") << QStringLiteral("https://www.openstreetmap.org/search?query=Randa";); + + // explicit coordinate reference systems + QTest::newRow("WGS84") << QStringLiteral("geo:37.78,-122.4;u=35;crs=wgs84") << QStringLiteral("https://www.openstreetmap.org/#map=18/37.78/-122.4";); + QTest::newRow("EPSG:32618") << QStringLiteral("geo:323482,4306480;crs=EPSG:32618;u=20") << QStringLiteral("https://openstreetmap.org";); + QTest::newRow("moon") << QStringLiteral("geo:37.786971,-122.399677;crs=Moon-2011;u=35") << QStringLiteral("https://openstreetmap.org";); + } + + void testHandler() + { + QFETCH(QString, input); + QFETCH(QString, output); + + KGeoUriHandler handler; + handler.setCoordinateTemplate(QStringLiteral("https://www.openstreetmap.org/#map=<Z>/<LAT>/<LON>")); + handler.setQueryTemplate(QStringLiteral("https://www.openstreetmap.org/search?query=<Q>")); + handler.setFallbackUrl(QStringLiteral("https://openstreetmap.org";)); + QCOMPARE(handler.handleUri(QUrl(input)), output); + } +}; + +QTEST_APPLESS_MAIN(KGeoUriHandlerTest) + +#include "kgeourihandlertest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/CMakeLists.txt new/kguiaddons-5.91.0/src/CMakeLists.txt --- old/kguiaddons-5.90.0/src/CMakeLists.txt 2022-01-01 13:15:08.000000000 +0100 +++ new/kguiaddons-5.91.0/src/CMakeLists.txt 2022-02-05 16:13:21.000000000 +0100 @@ -81,7 +81,7 @@ if (WITH_X11 AND (TARGET Qt5::X11Extras OR TARGET Qt6::Gui)) add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) - install(TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) + install(TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kguiaddons/kmodifierkey/) if (TARGET Qt5::X11Extras) set(_qt_x11_libs Qt5::X11Extras) @@ -216,3 +216,4 @@ ) endif() +add_subdirectory(geo-scheme-handler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/CMakeLists.txt new/kguiaddons-5.91.0/src/geo-scheme-handler/CMakeLists.txt --- old/kguiaddons-5.90.0/src/geo-scheme-handler/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/CMakeLists.txt 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> +# SPDX-License-Identifier: BSD-2-Clause + +add_executable(kde-geo-uri-handler + kgeourihandler.cpp + main.cpp +) +target_include_directories(kde-geo-uri-handler PRIVATE ${CMAKE_BINARY_DIR}) # for kguiaddons_version.h +target_link_libraries(kde-geo-uri-handler PRIVATE Qt${QT_MAJOR_VERSION}::Gui) + +install(TARGETS kde-geo-uri-handler ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + FILES + google-maps-geo-handler.desktop + openstreetmap-geo-handler.desktop + qwant-maps-geo-handler.desktop + wheelmap-geo-handler.desktop + DESTINATION + ${KDE_INSTALL_APPDIR} +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/google-maps-geo-handler.desktop new/kguiaddons-5.91.0/src/geo-scheme-handler/google-maps-geo-handler.desktop --- old/kguiaddons-5.90.0/src/geo-scheme-handler/google-maps-geo-handler.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/google-maps-geo-handler.desktop 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,18 @@ +[Desktop Entry] +Type=Application +Exec=kde-geo-uri-handler --coordinate-template "https://www.google.com/maps/@<LAT>,<LON>,<Z>" --query-template "https://www.google.com/maps/search/<Q>" --fallback "https://www.google.com/maps/"; %u +Name=Google Maps +Name[ca]=Google Maps +Name[es]=Google Maps +Name[fr]=Google Maps +Name[it]=Mappe di Google +Name[nl]=Google Maps +Name[ro]=H??r??i Google +Name[sl]=Google Maps +Name[sv]=Google kartor +Name[uk]=?????????? Google +Name[x-test]=xxGoogle Mapsxx +Icon=map-globe +MimeType=x-scheme-handler/geo; +Terminal=false +NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/google-maps-geo-handler.desktop.license new/kguiaddons-5.91.0/src/geo-scheme-handler/google-maps-geo-handler.desktop.license --- old/kguiaddons-5.90.0/src/geo-scheme-handler/google-maps-geo-handler.desktop.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/google-maps-geo-handler.desktop.license 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2022 Florian Edelmann <[email protected]> +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/kgeourihandler.cpp new/kguiaddons-5.91.0/src/geo-scheme-handler/kgeourihandler.cpp --- old/kguiaddons-5.90.0/src/geo-scheme-handler/kgeourihandler.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/kgeourihandler.cpp 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,69 @@ +/* + SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#include "kgeourihandler_p.h" + +#include <QUrl> +#include <QUrlQuery> + +void KGeoUriHandler::setCoordinateTemplate(const QString &coordTmpl) +{ + m_coordTmpl = coordTmpl; +} + +void KGeoUriHandler::setQueryTemplate(const QString &queryTmpl) +{ + m_queryTmpl = queryTmpl; +} + +void KGeoUriHandler::setFallbackUrl(const QString &fallbackUrl) +{ + m_fallbackUrl = fallbackUrl; +} + +static bool isValidCoordinate(double c, double limit) +{ + return c != 0.0 && c >= -limit && c <= limit; +} + +QString KGeoUriHandler::handleUri(const QUrl &geoUri) +{ + const auto pathElems = geoUri.path().split(QLatin1Char(';')); + const auto coordElems = pathElems.isEmpty() ? QStringList() : pathElems.at(0).split(QLatin1Char(',')); + + const auto lat = coordElems.size() < 2 ? 0.0 : coordElems.at(0).toDouble(); + const auto lon = coordElems.size() < 2 ? 0.0 : coordElems.at(1).toDouble(); + + const auto geoQuery = QUrlQuery(geoUri.query()); + const auto query = geoQuery.queryItemValue(QStringLiteral("q")); + + bool zoomValid = false; + int zoom = geoQuery.queryItemValue(QStringLiteral("z")).toInt(&zoomValid); + if (!zoomValid || zoom < 0 || zoom > 21) { + zoom = 18; + } + + // unsupported coordinate reference system + if (!pathElems.isEmpty() && std::any_of(pathElems.begin() + 1, pathElems.end(), [](const auto &elem) { + return elem.startsWith(QLatin1String("crs="), Qt::CaseInsensitive) && !elem.endsWith(QLatin1String("=wgs84"), Qt::CaseInsensitive); + })) { + return m_fallbackUrl; + } + + QString tmpl; + if (!query.isEmpty()) { + tmpl = m_queryTmpl; + } else if (isValidCoordinate(lat, 90.0) && isValidCoordinate(lon, 180.0)) { + tmpl = m_coordTmpl; + } else { + return m_fallbackUrl; + } + + tmpl.replace(QLatin1String("<LAT>"), QString::number(lat)); + tmpl.replace(QLatin1String("<LON>"), QString::number(lon)); + tmpl.replace(QLatin1String("<Q>"), query); + tmpl.replace(QLatin1String("<Z>"), QString::number(zoom)); + return tmpl; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/kgeourihandler_p.h new/kguiaddons-5.91.0/src/geo-scheme-handler/kgeourihandler_p.h --- old/kguiaddons-5.90.0/src/geo-scheme-handler/kgeourihandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/kgeourihandler_p.h 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,44 @@ +/* + SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#ifndef KGEOURIHANDLER_H +#define KGEOURIHANDLER_H + +#include <QString> + +class QUrl; + +/** Fallback handler for geo: URIs by forwarding them to a web service. + * + * This handles three cases of geo: URIs: + * - when containing a query argument, the query URL template is used + * - when containing valid WGS-84 coordinates, the coordinate URL template is used + * - otherwise the fallback URL is returned + * + * URL templates can contain any number of the following placeholders in angle brackets: + * - @c LAT - the latitude + * - @c LON - the longitude + * - @c Q - the query string + * - @c Z - the zoom level for a Web Mercator map projection + * + * @see https://en.wikipedia.org/wiki/Geo_URI_scheme + * @see https://datatracker.ietf.org/doc/html/rfc5870 + */ +class KGeoUriHandler +{ +public: + void setCoordinateTemplate(const QString &coordTmpl); + void setQueryTemplate(const QString &queryTmpl); + void setFallbackUrl(const QString &fallbackUrl); + + QString handleUri(const QUrl &geoUri); + +private: + QString m_coordTmpl; + QString m_queryTmpl; + QString m_fallbackUrl; +}; + +#endif // KGEOURIHANDLER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/main.cpp new/kguiaddons-5.91.0/src/geo-scheme-handler/main.cpp --- old/kguiaddons-5.90.0/src/geo-scheme-handler/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/main.cpp 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,49 @@ +/* + SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#include "kgeourihandler_p.h" +#include <kguiaddons_version.h> + +#include <QCommandLineParser> +#include <QDesktopServices> +#include <QGuiApplication> +#include <QUrl> + +int main(int argc, char **argv) +{ + QCoreApplication::setApplicationName(QStringLiteral("kde-geo-uri-handler")); + QCoreApplication::setOrganizationName(QStringLiteral("KDE")); + QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org")); + QCoreApplication::setApplicationVersion(QStringLiteral(KGUIADDONS_VERSION_STRING)); + + QGuiApplication app(argc, argv); + + QCommandLineParser parser; + QCommandLineOption coordTmplOpt(QStringLiteral("coordinate-template"), + QStringLiteral("URL template for coordinate-based access."), + QStringLiteral("coordinate-template")); + parser.addOption(coordTmplOpt); + QCommandLineOption queryTmplOpt(QStringLiteral("query-template"), QStringLiteral("URL template for query-based access."), QStringLiteral("query-template")); + parser.addOption(queryTmplOpt); + QCommandLineOption fallbackOpt(QStringLiteral("fallback"), QStringLiteral("URL to use in case of errors."), QStringLiteral("fallback-url")); + parser.addOption(fallbackOpt); + parser.addPositionalArgument(QStringLiteral("uri"), QStringLiteral("geo: URI to handle")); + parser.addHelpOption(); + parser.addVersionOption(); + parser.process(app); + + KGeoUriHandler handler; + handler.setCoordinateTemplate(parser.value(coordTmplOpt)); + handler.setQueryTemplate(parser.value(queryTmplOpt)); + handler.setFallbackUrl(parser.value(fallbackOpt)); + + const auto args = parser.positionalArguments(); + for (const auto &arg : args) { + const auto url = handler.handleUri(QUrl(arg)); + QDesktopServices::openUrl(QUrl(url)); + } + + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop new/kguiaddons-5.91.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop --- old/kguiaddons-5.90.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,19 @@ +[Desktop Entry] +Type=Application +Exec=kde-geo-uri-handler --coordinate-template "https://www.openstreetmap.org/#map=<Z>/<LAT>/<LON>" --query-template "https://www.openstreetmap.org/search?query=<Q>" --fallback "https://www.openstreetmap.org"; %u +Name=OpenStreetMap +Name[ca]=OpenStreetMap +Name[es]=OpenStreetMap +Name[fr]=OpenStreetMap +Name[it]=OpenStreetMap +Name[nl]=OpenStreetMap +Name[ro]=OpenStreetMap +Name[sk]=OpenStreetMap +Name[sl]=OpenStreetMap +Name[sv]=OpenStreetMap +Name[uk]=OpenStreetMap +Name[x-test]=xxOpenStreetMapxx +Icon=map-globe +MimeType=x-scheme-handler/geo; +Terminal=false +NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop.license new/kguiaddons-5.91.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop.license --- old/kguiaddons-5.90.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop.license 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop new/kguiaddons-5.91.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop --- old/kguiaddons-5.90.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,18 @@ +[Desktop Entry] +Type=Application +Exec=kde-geo-uri-handler --coordinate-template "https://www.qwant.com/maps/#map=<Z>/<LAT>/<LON>" --query-template "https://www.qwant.com/maps/?q=<Q>&client=opensearch" --fallback "https://www.qwant.com/maps/"; %u +Name=Qwant Maps +Name[ca]=Qwant Maps +Name[es]=Qwant Maps +Name[fr]=Qwant Maps +Name[it]=Qwant Maps +Name[nl]=Qwant Maps +Name[ro]=H??r??i Qwant +Name[sl]=Qwant Maps +Name[sv]=Qwant kartor +Name[uk]=?????????? Qwant +Name[x-test]=xxQwant Mapsxx +Icon=map-globe +MimeType=x-scheme-handler/geo; +Terminal=false +NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop.license new/kguiaddons-5.91.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop.license --- old/kguiaddons-5.90.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop.license 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2022 Florian Edelmann <[email protected]> +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop new/kguiaddons-5.91.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop --- old/kguiaddons-5.90.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,19 @@ +[Desktop Entry] +Type=Application +Exec=kde-geo-uri-handler --coordinate-template "https://wheelmap.org/?lat=<LAT>&lon=<LON>" --query-template "https://wheelmap.org/search?q=<Q>" --fallback "https://wheelmap.org"; %u +Name=wheelmap.org +Name[ca]=wheelmap.org +Name[es]=wheelmap.org +Name[fr]=wheelmap.org +Name[it]=wheelmap.org +Name[nl]=wheelmap.org +Name[ro]=wheelmap.org +Name[sk]=wheelmap.org +Name[sl]=wheelmap.org +Name[sv]=wheelmap.org +Name[uk]=wheelmap.org +Name[x-test]=xxwheelmap.orgxx +Icon=map-globe +MimeType=x-scheme-handler/geo; +Terminal=false +NoDisplay=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop.license new/kguiaddons-5.91.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop.license --- old/kguiaddons-5.90.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-5.91.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop.license 2022-02-05 16:13:21.000000000 +0100 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021 Volker Krause <[email protected]> +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.90.0/src/util/kmodifierkeyinfo.cpp new/kguiaddons-5.91.0/src/util/kmodifierkeyinfo.cpp --- old/kguiaddons-5.90.0/src/util/kmodifierkeyinfo.cpp 2022-01-01 13:15:08.000000000 +0100 +++ new/kguiaddons-5.91.0/src/util/kmodifierkeyinfo.cpp 2022-02-05 16:13:21.000000000 +0100 @@ -13,7 +13,8 @@ KModifierKeyInfoProvider *createProvider() { - QPluginLoader loader(QStringLiteral("kf5/kguiaddons/kmodifierkey/kmodifierkey_") + qGuiApp->platformName()); + QPluginLoader loader(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kguiaddons/kmodifierkey/kmodifierkey_") + + qGuiApp->platformName()); auto instance = dynamic_cast<KModifierKeyInfoProvider *>(loader.instance()); if (instance) { return instance;
