commit kf6-kpackage for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/128a7b98d536a9cf9b4d4d5a90d63475.jpg?s=120&d=mm&r=g)
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-kpackage for openSUSE:Factory checked in at 2024-07-14 08:50:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kpackage (Old) and /work/SRC/openSUSE:Factory/.kf6-kpackage.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kf6-kpackage" Sun Jul 14 08:50:03 2024 rev:5 rq:1187129 version:6.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kpackage/kf6-kpackage.changes 2024-06-09 20:23:03.735646821 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-kpackage.new.17339/kf6-kpackage.changes 2024-07-14 08:53:23.130776561 +0200 @@ -1,0 +2,12 @@ +Tue Jul 9 09:41:52 UTC 2024 - Christophe Marin <christophe@krop.fr> + +- Update to 6.4.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.4.0 +- Changes since 6.3.0: + * remove stray lib + * support USE_DBUS option to enable/disable dbus use + * gitignore: add VS Code dir + +------------------------------------------------------------------- Old: ---- kpackage-6.3.0.tar.xz kpackage-6.3.0.tar.xz.sig New: ---- kpackage-6.4.0.tar.xz kpackage-6.4.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kpackage.spec ++++++ --- /var/tmp/diff_new_pack.4GFP8S/_old 2024-07-14 08:53:23.830802138 +0200 +++ /var/tmp/diff_new_pack.4GFP8S/_new 2024-07-14 08:53:23.834802284 +0200 @@ -19,13 +19,13 @@ %define qt6_version 6.6.0 %define rname kpackage -# Full KF6 version (e.g. 6.3.0) +# Full KF6 version (e.g. 6.4.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-kpackage -Version: 6.3.0 +Version: 6.4.0 Release: 0 Summary: Non-binary asset user-installable package managing framework License: GPL-2.0-or-later AND LGPL-2.0-or-later ++++++ kpackage-6.3.0.tar.xz -> kpackage-6.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/.gitignore new/kpackage-6.4.0/.gitignore --- old/kpackage-6.3.0/.gitignore 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/.gitignore 2024-07-05 22:08:26.000000000 +0200 @@ -24,5 +24,6 @@ /compile_commands.json .clangd .idea +.vscode /cmake-build* .cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/CMakeLists.txt new/kpackage-6.4.0/CMakeLists.txt --- old/kpackage-6.3.0/CMakeLists.txt 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/CMakeLists.txt 2024-07-05 22:08:26.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.3.0") # handled by release scripts -set(KF_DEP_VERSION "6.3.0") # handled by release scripts +set(KF_VERSION "6.4.0") # handled by release scripts +set(KF_DEP_VERSION "6.4.0") # handled by release scripts project(KPackage VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 6.3.0 NO_MODULE) +find_package(ECM 6.4.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) @@ -42,7 +42,19 @@ set (REQUIRED_QT_VERSION 6.5.0) -find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core DBus) +find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core) + +# shall we use DBus? +# enabled per default on Linux & BSD systems +set(USE_DBUS_DEFAULT OFF) +if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) + set(USE_DBUS_DEFAULT ON) +endif() +option(USE_DBUS "Build components using DBus" ${USE_DBUS_DEFAULT}) +if(USE_DBUS) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + set(HAVE_DBUS ON) +endif() find_package(KF6Archive ${KF_DEP_VERSION} REQUIRED) find_package(KF6I18n ${KF_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/po/ar/libkpackage6.po new/kpackage-6.4.0/po/ar/libkpackage6.po --- old/kpackage-6.3.0/po/ar/libkpackage6.po 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/po/ar/libkpackage6.po 2024-07-05 22:08:26.000000000 +0200 @@ -16,8 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Lokalize 23.08.1\n" -"X-Project-Style: kde\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/po/ro/libkpackage6.po new/kpackage-6.4.0/po/ro/libkpackage6.po --- old/kpackage-6.3.0/po/ro/libkpackage6.po 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/po/ro/libkpackage6.po 2024-07-05 22:08:26.000000000 +0200 @@ -8,7 +8,7 @@ "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-12-20 01:33+0000\n" "PO-Revision-Date: 2014-05-02 12:06+0300\n" -"Last-Translator: Sergiu Bivol <sergiu@ase.md>\n" +"Last-Translator: Sergiu Bivol <sergiu@cip.md>\n" "Language-Team: Romanian <kde-i18n-ro@kde.org>\n" "Language: ro\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/po/sv/libkpackage6.po new/kpackage-6.4.0/po/sv/libkpackage6.po --- old/kpackage-6.3.0/po/sv/libkpackage6.po 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/po/sv/libkpackage6.po 2024-07-05 22:08:26.000000000 +0200 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022. +# SPDX-FileCopyrightText: 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2024 Stefan Asserhäll <stefan.asserhall@gmail.com> msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-12-20 01:33+0000\n" -"PO-Revision-Date: 2022-08-03 10:11+0200\n" -"Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n" +"PO-Revision-Date: 2024-06-19 22:22+0200\n" +"Last-Translator: Stefan Asserhäll <stefan.asserhall@gmail.com>\n" "Language-Team: Swedish <kde-i18n-doc@kde.org>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 20.08.1\n" +"X-Generator: Lokalize 23.08.5\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -25,7 +25,7 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "stefan.asserhall@bredband.net" +msgstr "stefan.asserhall@gmail.com" #: kpackage/private/packagejobthread.cpp:164 #, kde-format @@ -50,19 +50,17 @@ #: kpackage/private/packagejobthread.cpp:238 #, kde-format msgid "Package is not considered valid" -msgstr "" +msgstr "Paketet anses inte vara giltigt" #: kpackage/private/packagejobthread.cpp:248 -#, fuzzy, kde-format -#| msgid "Package plugin name not specified: %1" +#, kde-format msgid "Package plugin id not specified: %1" -msgstr "Paketets insticksprogramnamn är inte angivet: %1" +msgstr "Paketinsticksprogrammets identifikation är inte angivet: %1" #: kpackage/private/packagejobthread.cpp:258 -#, fuzzy, kde-format -#| msgid "Package plugin name %1 contains invalid characters" +#, kde-format msgid "Package plugin id %1 contains invalid characters" -msgstr "Paketets insticksprogramnamn %1 innehåller ogiltiga tecken" +msgstr "Paketinsticksprogrammets identifikation %1 innehåller ogiltiga tecken" #: kpackage/private/packagejobthread.cpp:277 #, kde-format @@ -130,10 +128,9 @@ msgstr "SHA1-kondensat för paket på %1: '%2'" #: kpackagetool/kpackagetool.cpp:145 -#, fuzzy, kde-format -#| msgid "Listing service types: %1 in %2" +#, kde-format msgid "Listing KPackageType: %1 in %2" -msgstr "Listar tjänsttyper: %1 i %2" +msgstr "Listar pakettyp: %1 i %2" #: kpackagetool/kpackagetool.cpp:198 #, kde-format @@ -159,34 +156,29 @@ msgstr "Visar information för paket: %1" #: kpackagetool/kpackagetool.cpp:260 -#, fuzzy, kde-format -#| msgid " Name : %1" +#, kde-format msgid " Name : %1" -msgstr " Namn: %1" +msgstr " Namn : %1" #: kpackagetool/kpackagetool.cpp:261 -#, fuzzy, kde-format -#| msgid "Service Descriptions" +#, kde-format msgid " Description: %1" -msgstr "Tjänstbeskrivningar" +msgstr " Beskrivning : %1" #: kpackagetool/kpackagetool.cpp:262 -#, fuzzy, kde-format -#| msgid " Plugin : %1" +#, kde-format msgid " Plugin : %1" -msgstr "Insticksprogram: %1" +msgstr " Insticksprogram: %1" #: kpackagetool/kpackagetool.cpp:268 -#, fuzzy, kde-format -#| msgid " Author : %1" +#, kde-format msgid " Author : %1" -msgstr " Upphovsman: %1" +msgstr " Upphovsman : %1" #: kpackagetool/kpackagetool.cpp:269 -#, fuzzy, kde-format -#| msgid " Path : %1" +#, kde-format msgid " Path : %1" -msgstr " Sökväg: %1" +msgstr " Sökväg : %1" #: kpackagetool/kpackagetool.cpp:429 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/src/kpackage/CMakeLists.txt new/kpackage-6.4.0/src/kpackage/CMakeLists.txt --- old/kpackage-6.3.0/src/kpackage/CMakeLists.txt 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/src/kpackage/CMakeLists.txt 2024-07-05 22:08:26.000000000 +0200 @@ -42,11 +42,20 @@ PUBLIC KF6::CoreAddons PRIVATE - Qt6::DBus KF6::Archive KF6::I18n ) +if (HAVE_DBUS) + target_link_libraries(KF6Package + PRIVATE + Qt::DBus # notification + ) + target_compile_definitions(KF6Package PRIVATE -DHAVE_QTDBUS=1) +else() + target_compile_definitions(KF6Package PRIVATE -DHAVE_QTDBUS=0) +endif() + target_include_directories(KF6Package PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/KPackage>" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-6.3.0/src/kpackage/packagejob.cpp new/kpackage-6.4.0/src/kpackage/packagejob.cpp --- old/kpackage-6.3.0/src/kpackage/packagejob.cpp 2024-05-31 15:27:39.000000000 +0200 +++ new/kpackage-6.4.0/src/kpackage/packagejob.cpp 2024-07-05 22:08:26.000000000 +0200 @@ -16,8 +16,11 @@ #include "kpackage_debug.h" +#if HAVE_QTDBUS #include <QDBusConnection> #include <QDBusMessage> +#endif + #include <QDebug> #include <QStandardPaths> #include <QThreadPool> @@ -165,11 +168,13 @@ const QString kpackageType = readKPackageType(d->package.metadata()); auto onJobFinished = [=, this](bool ok, JobError errorCode, const QString &error) { +#if HAVE_QTDBUS if (ok) { auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + kpackageType, QStringLiteral("org.kde.plasma.kpackage"), messageName); msg.setArguments({pluginId}); QDBusConnection::sessionBus().send(msg); } +#endif if (ok) { setError(NoError);
participants (1)
-
Source-Sync