upgrade kguiaddons (5.115.0-4) unstable

.gitignore

@@ -1 +1,28 @@
-.pc/
+# Ignore the following files
+*~
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+avail
+random_seed
+/build*/
+CMakeLists.txt.user*
+*.unc-backup*
+.cmake/
+/.clang-format
+/compile_commands.json
+.clangd
+.idea
+/cmake-build*
+.cache

.gitlab-ci.yml

@@ -2,6 +2,11 @@
 # SPDX-License-Identifier: CC0-1.0
 
 include:
-  - 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
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/linux.yml
+      - /gitlab-templates/linux-static.yml
+      - /gitlab-templates/android.yml
+      - /gitlab-templates/freebsd.yml
+      - /gitlab-templates/windows.yml
+      - /gitlab-templates/windows-static.yml

.kde-ci.yml

@@ -3,5 +3,10 @@ Dependencies:
   'require':
     'frameworks/extra-cmake-modules': '@same'
 
+- 'on': ['Linux', 'FreeBSD']
+  'require':
+    'libraries/plasma-wayland-protocols': '@latest'
+
 Options:
   test-before-installing: True
+  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "5.103.0") # handled by release scripts
+set(KF_VERSION "5.115.0") # handled by release scripts
 project(KGuiAddons VERSION ${KF_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 5.103.0  NO_MODULE)
+find_package(ECM 5.115.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)
 
@@ -21,9 +21,11 @@ include(ECMQtDeclareLoggingCategory)
 include(ECMDeprecationSettings)
 include(ECMAddQch)
 include(GenerateExportHeader)
+include(ECMMarkNonGuiExecutable)
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+option(BUILD_GEO_SCHEME_HANDLER "Build the geo: URI scheme handler. Disable this if you are building two major versions for co-installability in the older variant." ON)
 
 if (UNIX AND NOT ANDROID AND NOT APPLE)
     option(WITH_WAYLAND "Build with support for KModifierKeyInfo, KSystemClipboard and KeySequenceRecorder inhibiting shortcuts on Wayland" ON)

autotests/kcolorutilstest.cpp

@@ -149,3 +149,5 @@ void tst_KColorUtils::testShading()
 }
 
 QTEST_MAIN(tst_KColorUtils)
+
+#include "moc_kcolorutilstest.cpp"

autotests/kcursorsavertest.cpp

@@ -32,3 +32,5 @@ void KCursorSaverTest::ignoreWarning()
         saverB.restoreCursor();
     }
 }
+
+#include "moc_kcursorsavertest.cpp"

autotests/keysequencerecordertest.cpp

@@ -210,3 +210,5 @@ void KeySequenceRecorderTest::testMultiKeyAllowed()
     QCOMPARE(resultSpy.count(), 1);
     QCOMPARE(resultSpy.takeAt(0).at(0).value<QKeySequence>(), QKeySequence(Qt::Key_A | Qt::ControlModifier));
 }
+
+#include "moc_keysequencerecordertest.cpp"

autotests/kiconutilstest.cpp

@@ -187,3 +187,5 @@ void KIconUtilsTest::addOverlaysTest()
     QCOMPARE(bluePixels, 3072);
     QCOMPARE(redPixels, 6144);
 }
+
+#include "moc_kiconutilstest.cpp"

autotests/kurlhandlertest.cpp

@@ -56,3 +56,5 @@ void KUrlHandlerTest::testOpeningDocsUrls()
 }
 
 QTEST_MAIN(KUrlHandlerTest)
+
+#include "moc_kurlhandlertest.cpp"

debian/changelog

@@ -1,3 +1,55 @@
+kguiaddons (5.115.0-4) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * Release to unstable.
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 18 Aug 2024 16:29:43 +0200
+
+kguiaddons (5.115.0-3) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Disable the geo scheme handler to allow co-installability with KF6.
+
+ -- Patrick Franz <[email protected]>  Sat, 15 Jun 2024 11:54:13 +0200
+
+kguiaddons (5.115.0-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <[email protected]>  Sun, 05 May 2024 00:10:10 +0200
+
+kguiaddons (5.115.0-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (5.115.0).
+  * Update build-deps and deps with the info from cmake.
+  * Add myself to Uploaders.
+  * Build-depend on pkgconf instead of pkg-config as the latter has been
+    superseded by the former.
+
+ -- Patrick Franz <[email protected]>  Sat, 16 Mar 2024 11:21:11 +0100
+
+kguiaddons (5.107.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.105.0).
+  * Update build-deps and deps with the info from cmake.
+  * Update symbols from build for 5.105.0.
+  * New upstream release (5.107.0).
+  * Update build-deps and deps with the info from cmake.
+  * Release to unstable.
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 18 Jun 2023 16:08:27 +0200
+
+kguiaddons (5.104.0-1) experimental; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.104.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <[email protected]>  Wed, 15 Mar 2023 16:09:48 +0100
+
 kguiaddons (5.103.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]

debian/control

@@ -3,19 +3,20 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Aurélien COUDERC <[email protected]>,
+           Patrick Franz <[email protected]>,
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
                dh-sequence-kf5,
                dh-sequence-pkgkde-symbolshelper,
                doxygen,
-               extra-cmake-modules (>= 5.103.0~),
+               extra-cmake-modules (>= 5.115.0~),
                libqt5sql5-sqlite:native,
                libqt5waylandclient5-dev (>= 5.15.2~) [linux-any],
                libqt5x11extras5-dev (>= 5.15.2~),
                libwayland-dev (>= 1.9~) [linux-any],
                libx11-dev,
                libxcb1-dev,
-               pkg-config,
+               pkgconf,
                plasma-wayland-protocols (>= 1.7.0~),
                qtbase5-dev (>= 5.15.2~),
                qtbase5-private-dev (>= 5.15.2~),
@@ -28,16 +29,6 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kguiaddons
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kguiaddons.git
 Rules-Requires-Root: no
 
-Package: libkf5guiaddons-bin
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Breaks: libkf5guiaddons-data (<< 5.96.0-1),
-Replaces: libkf5guiaddons-data (<< 5.96.0-1),
-Description: additional addons for QtGui
- Qt widgets for colours, fonts and text
- .
- This package contains kde-geo-uri-handler.
-
 Package: libkf5guiaddons-data
 Architecture: all
 Multi-Arch: foreign
@@ -77,6 +68,6 @@ Multi-Arch: same
 Depends: libkf5guiaddons-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: libkf5guiaddons-bin (= ${binary:Version}),
+Recommends: libkf6guiaddons-bin,
 Description: additional addons for QtGui
  Qt widgets for colours, fonts and text

debian/libkf5guiaddons5.symbols

@@ -146,9 +146,7 @@ libKF5GuiAddons.so.5 libkf5guiaddons5 #MINVER#
  _ZN9KWordWrap10formatTextER12QFontMetricsRK5QRectiRK7QStringi@Base 4.96.0
  _ZN9KWordWrap15drawFadeoutTextEP8QPainteriiiRK7QString@Base 4.96.0
  _ZN9KWordWrap16drawTruncateTextEP8QPainteriiiRK7QString@Base 4.96.0
- _ZN9KWordWrapC1ERK5QRect@Base 4.96.0
  _ZN9KWordWrapC1ERKS_@Base 4.98.0
- _ZN9KWordWrapC2ERK5QRect@Base 4.96.0
  _ZN9KWordWrapC2ERKS_@Base 4.98.0
  _ZN9KWordWrapD1Ev@Base 4.96.0
  _ZN9KWordWrapD2Ev@Base 4.96.0

debian/rules

@@ -5,14 +5,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/architecture.mk
 
 ifneq (linux,$(DEB_HOST_ARCH_OS))
-EXTRA_CMAKE_ARGS += -DWITH_WAYLAND=OFF
+	EXTRA_CMAKE_ARGS += -DWITH_WAYLAND=OFF
 endif
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF $(EXTRA_CMAKE_ARGS)
+	dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_TESTING=OFF -DBUILD_GEO_SCHEME_HANDLER=OFF $(EXTRA_CMAKE_ARGS)
 
 override_dh_auto_test:
 	# Disable auto tests at build time

debian/salsa-ci.yml

@@ -1,9 +1,7 @@
 include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 variables:
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'
-  SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'
-  EXTRA_REPOSITORY: 'debian/salsa/extra_repository.list'
-  EXTRA_REPOSITORY_KEY: 'debian/salsa/qt-kde-team.debian.net.asc'
+  EXTRA_REPOSITORY: debian/salsa/extra_repository.list
+  EXTRA_REPOSITORY_KEY: debian/salsa/qt-kde-team.debian.net.asc
+  SALSA_CI_REPROTEST_ARGS: --variations=-build-path

src/CMakeLists.txt

@@ -243,6 +243,6 @@ if(BUILD_TESTING)
     )
 endif()
 
-if (NOT ANDROID)
+if (NOT ANDROID AND BUILD_GEO_SCHEME_HANDLER)
     add_subdirectory(geo-scheme-handler)
 endif()

src/colors/kcolorschemewatcher.cpp

@@ -58,3 +58,5 @@ KColorSchemeWatcher::ColorPreference KColorSchemeWatcher::systemPreference() con
 
     return NoPreference;
 }
+
+#include "moc_kcolorschemewatcher.cpp"

src/colors/kcolorschemewatcher_mac.mm

@@ -47,3 +47,5 @@
 
     return appearance.name == NSAppearanceNameDarkAqua ? KColorSchemeWatcher::PreferDark : KColorSchemeWatcher::PreferLight;
 }
+
+#include "moc_kcolorschemewatcher_mac.cpp"

src/colors/kcolorschemewatcher_win.cpp

@@ -47,3 +47,5 @@ KColorSchemeWatcher::ColorPreference KColorSchemeWatcherWin::systemPreference()
 {
     return m_preferDarkMode ? KColorSchemeWatcher::PreferDark : KColorSchemeWatcher::PreferLight;
 }
+
+#include "moc_kcolorschemewatcher_win.cpp"

src/colors/kcolorschemewatcher_xdg.cpp

@@ -64,3 +64,5 @@ KColorSchemeWatcher::ColorPreference KColorSchemeWatcherXDG::fdoToInternal(uint
         return KColorSchemeWatcher::NoPreference;
     }
 }
+
+#include "moc_kcolorschemewatcher_xdg.cpp"

src/colors/kcolorschemewatcherbackend.cpp

@@ -5,3 +5,5 @@
  */
 
 #include "kcolorschemewatcherbackend.h"
+
+#include "moc_kcolorschemewatcherbackend.cpp"

src/geo-scheme-handler/CMakeLists.txt

@@ -6,6 +6,7 @@ add_executable(kde-geo-uri-handler
     kgeourihandler_p.h
     main.cpp
 )
+ecm_mark_nongui_executable(kde-geo-uri-handler)
 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)
 

src/geo-scheme-handler/google-maps-geo-handler.desktop

@@ -1,17 +1,19 @@
 [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
+Exec=kde-geo-uri-handler --coordinate-template "https://www.google.com/maps/@<LAT>,<LON>,<Z>z" --query-template "https://www.google.com/maps/search/<Q>" --fallback "https://www.google.com/maps/" %u
 Name=Google Maps
 Name[ar]=خرائط غوغل
 Name[ca]=Google Maps
 Name[ca@valencia]=Google Maps
 Name[cs]=Mapy Google
 Name[de]=Google Maps
 Name[en_GB]=Google Maps
+Name[eo]=Google Maps
 Name[es]=Google Maps
 Name[eu]=Google Maps
 Name[fi]=Google Maps
 Name[fr]=Google Maps
+Name[gl]=Google Maps
 Name[hi]=गूगल मैप्स
 Name[it]=Mappe di Google
 Name[ka]=Google Maps
@@ -31,6 +33,7 @@ Name[uk]=Карти Google
 Name[vi]=Google Bản đồ
 Name[x-test]=xxGoogle Mapsxx
 Name[zh_CN]=Google Maps
+Name[zh_TW]=Google 地圖
 Icon=map-globe
 MimeType=x-scheme-handler/geo;
 Terminal=false

src/geo-scheme-handler/openstreetmap-geo-handler.desktop

@@ -8,10 +8,12 @@ Name[ca@valencia]=OpenStreetMap
 Name[cs]=OpenStreetMap
 Name[de]=OpenStreetMap
 Name[en_GB]=OpenStreetMap
+Name[eo]=OpenStreetMap
 Name[es]=OpenStreetMap
 Name[eu]=OpenStreetMap
 Name[fi]=OpenStreetMap
 Name[fr]=OpenStreetMap
+Name[gl]=OpenStreetMap
 Name[hi]=ओपनस्ट्रीटमैप
 Name[it]=OpenStreetMap
 Name[ka]=OpenStreetMap
@@ -31,6 +33,7 @@ Name[uk]=OpenStreetMap
 Name[vi]=OpenStreetMap
 Name[x-test]=xxOpenStreetMapxx
 Name[zh_CN]=OpenStreetMap
+Name[zh_TW]=OpenStreetMap 開放街圖
 Icon=map-globe
 MimeType=x-scheme-handler/geo;
 Terminal=false

src/geo-scheme-handler/qwant-maps-geo-handler.desktop

@@ -8,10 +8,12 @@ Name[ca@valencia]=Qwant Maps
 Name[cs]=Mapy Qwant
 Name[de]=Qwant Maps
 Name[en_GB]=Qwant Maps
+Name[eo]=Qwant Maps
 Name[es]=Qwant Maps
 Name[eu]=Qwant Maps
 Name[fi]=Qwant Maps
 Name[fr]=Qwant Maps
+Name[gl]=Qwant Maps
 Name[hi]=क्वान्ट मैप्स
 Name[it]=Qwant Maps
 Name[ka]=Qwant Maps
@@ -31,6 +33,7 @@ Name[uk]=Карти Qwant
 Name[vi]=Bản đồ Qwant
 Name[x-test]=xxQwant Mapsxx
 Name[zh_CN]=Qwant Maps
+Name[zh_TW]=Qwant 地圖
 Icon=map-globe
 MimeType=x-scheme-handler/geo;
 Terminal=false