Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2023-02-13 16:38:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new.1848 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Mon Feb 13 16:38:38 2023 rev:101 rq:1064606 version:5.103.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2023-01-16 18:00:40.211411170 +0100 +++ /work/SRC/openSUSE:Factory/.kpackage.new.1848/kpackage.changes 2023-02-13 16:40:42.935271682 +0100 @@ -1,0 +2,11 @@ +Wed Feb 8 09:13:00 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 5.103.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.103.0 +- Changes since 5.102.0: + * Update README with new json metadata + * Show deprecation message about the desktop to json conversion being removed + +------------------------------------------------------------------- Old: ---- kpackage-5.102.0.tar.xz kpackage-5.102.0.tar.xz.sig New: ---- kpackage-5.103.0.tar.xz kpackage-5.103.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.aef29G/_old 2023-02-13 16:40:43.439274944 +0100 +++ /var/tmp/diff_new_pack.aef29G/_new 2023-02-13 16:40:43.443274970 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.102 +%define _tar_path 5.103 # 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 released Name: kpackage -Version: 5.102.0 +Version: 5.103.0 Release: 0 Summary: Non-binary asset user-installable package managing framework License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -71,8 +71,7 @@ %find_lang %{name} --with-man --all-name -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files lang -f %{name}.lang ++++++ kpackage-5.102.0.tar.xz -> kpackage-5.103.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.102.0/CMakeLists.txt new/kpackage-5.103.0/CMakeLists.txt --- old/kpackage-5.102.0/CMakeLists.txt 2023-01-07 03:24:43.000000000 +0100 +++ new/kpackage-5.103.0/CMakeLists.txt 2023-02-05 10:24:51.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.102.0") # handled by release scripts -set(KF_DEP_VERSION "5.102.0") # handled by release scripts +set(KF_VERSION "5.103.0") # handled by release scripts +set(KF_DEP_VERSION "5.103.0") # handled by release scripts project(KPackage VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.102.0 NO_MODULE) +find_package(ECM 5.103.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.102.0/KF5PackageMacros.cmake new/kpackage-5.103.0/KF5PackageMacros.cmake --- old/kpackage-5.102.0/KF5PackageMacros.cmake 2023-01-07 03:24:43.000000000 +0100 +++ new/kpackage-5.103.0/KF5PackageMacros.cmake 2023-02-05 10:24:51.000000000 +0100 @@ -43,6 +43,7 @@ set(metadatajson) set(ORIGINAL_METADATA "${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop") if(NOT EXISTS ${component}-${root}-metadata.json AND EXISTS ${ORIGINAL_METADATA}) + message(WARNING "Providing metadata with .desktop files is deprecated. Please run \"desktoptojson -i ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop\" to convert the file to json and remove the desktop file") set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-${root}-metadata.json") add_custom_target(${component}-${root}-metadata-json ALL DEPENDS ${GENERATED_METADATA}) kcoreaddons_desktop_to_json(${component}-${root}-metadata-json ${ORIGINAL_METADATA} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.102.0/README.md new/kpackage-5.103.0/README.md --- old/kpackage-5.102.0/README.md 2023-01-07 03:24:43.000000000 +0100 +++ new/kpackage-5.103.0/README.md 2023-02-05 10:24:51.000000000 +0100 @@ -34,11 +34,11 @@ | `-- config.xml |-- images | `-- background.png -`-- metadata.desktop +`-- metadata.json ``` -The special, main and always required for every package structure file is the "metadata" file, which describes the package with values such as name, description, pluginname etc. It is in any format accepted by KPluginMetadata, meaning at the moment either a .desktop or json files. The metadata is accessible with Package::metadata(). +The special, main and always required for every package structure file is the "metadata" file, which describes the package with values such as name, description, pluginname etc. It is in the JSON format accepted by KPluginMetadata. The metadata is accessible with Package::metadata(). All the other files are under the contents/ subdirectory: a folder under addDirectoryDefinition will be registered under contents/. @@ -74,21 +74,24 @@ The line K_PLUGIN_CLASS_WITH_JSON is important in order to export the PackageStructure subclass MyStructure as a standalone plugin library using the KPluginLoader architecture, in order to be loadable and recognizable by a PackageLoader instance from any process (without the need to explicitly link to a library containing the MyStructure implementation). -In order to build the plugin, it is also needed a .desktop file describing the metadata for the plugin: +In order to build the plugin, it is also needed a .json file describing the metadata for the plugin: + +```json +{ + "KPlugin": { + "Authors": [ + { + "Email": "[email protected]", + "Name": "John Doe" + } + ], + "Id": "MyApp/MyStructure", + "Name": "My package type", + "Version": "1" + }, + "X-KDE-ParentApp": "org.kde.myapp" +} -``` -[Desktop Entry] -Name=My package type -Type=Service -X-KDE-ServiceTypes=KPackage/PackageStructure -X-KDE-Library=myapp_packagestructure_mystructure - -X-KDE-PluginInfo-Author=John Doe [email protected] -#X-KDE-PluginInfo-Name will be used for loading, so PackageLoader::loadPackage("MyApp/MyStructure); -X-KDE-PluginInfo-Name=MyApp/MyStructure -X-KDE-PluginInfo-Version=1 -X-KDE-ParentApp=org.kde.myapp ``` @@ -103,15 +106,12 @@ KF5::Package ) -#Qt plugins needs metadata in json format baked into the library -kcoreaddons_desktop_to_json(myapp_packagestructure_mystructure myapp-packagestructure-mystructure.desktop) - #install the plugin where PackageLoader looks for them install(TARGETS myapp_packagestructure_mystructure DESTINATION ${KDE_INSTALL_PLUGINDIR}/kpackage/packagestructure) ``` -The c++ implementation with its cmake and desktop files are recommended to be in their own subdirectory, for separation respect to the code of the parent application. +The C++ implementation with its CMake and JSON files are recommended to be in their own subdirectory, for separation respect to the code of the parent application. ## Package structures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.102.0/po/tr/libkpackage5.po new/kpackage-5.103.0/po/tr/libkpackage5.po --- old/kpackage-5.102.0/po/tr/libkpackage5.po 2023-01-07 03:24:43.000000000 +0100 +++ new/kpackage-5.103.0/po/tr/libkpackage5.po 2023-02-05 10:24:51.000000000 +0100 @@ -4,13 +4,13 @@ # Volkan, 2013. # Volkan Gezer <[email protected]>, 2013, 2014, 2015. # Kaan Ozdincer <[email protected]>, 2014. -# Emir SARI <[email protected]>, 2022. +# Emir SARI <[email protected]>, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-15 00:41+0000\n" -"PO-Revision-Date: 2022-07-26 12:20+0300\n" +"PO-Revision-Date: 2023-01-31 01:15+0300\n" "Last-Translator: Emir SARI <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" "Language: tr\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 22.04.2\n" +"X-Generator: Lokalize 22.12.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -38,7 +38,7 @@ #: kpackage/packageloader.cpp:255 #, kde-format msgid "Could not load installer for package of type %1. Error reported was: %2" -msgstr "%1 paket türü için kurucu yüklenemedi. Hata bildirildi: %2" +msgstr "%1 paket türü için kurucu yüklenemedi. Bildirilen hata: %2" #: kpackage/private/packagejobthread.cpp:144 #, kde-format @@ -84,7 +84,8 @@ #, kde-format msgid "" "The new package has a different type from the old version already installed." -msgstr "Yeni paket zaten yüklü olan eski sürümden farklı bir türe sahip." +msgstr "" +"Yeni paketin halihazırda kurulu olan eski sürümden farklı bir türü var." #: kpackage/private/packagejobthread.cpp:285 #, kde-format @@ -95,17 +96,17 @@ #: kpackage/private/packagejobthread.cpp:289 #, kde-format msgid "Not installing version %1 of %2. Version %3 already installed." -msgstr "%2'nin %1 sürümü yüklenmiyor. Sürüm %3 zaten yüklü." +msgstr "%1/%2 sürümü kurulmuyor. %3 sürümü halihazırda kurulu." #: kpackage/private/packagejobthread.cpp:293 #, kde-format msgid "%1 already exists" -msgstr "%1 zaten mevcut" +msgstr "%1 halihazırda var" #: kpackage/private/packagejobthread.cpp:314 #, kde-format msgid "Could not install dependency: '%1'" -msgstr "BaÄımlılık yüklenemedi: '%1'" +msgstr "BaÄımlılık kurulamadı: '%1'" #: kpackage/private/packagejobthread.cpp:326 #, kde-format @@ -175,7 +176,7 @@ #: kpackage/private/packages.cpp:76 #, kde-format msgid "Main UI File" -msgstr "Ana UI Dosyası" +msgstr "Ana Kullanıcı Arayüzü Dosyası" #: kpackagetool/kpackagetool.cpp:91 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.102.0/po/zh_CN/libkpackage5.po new/kpackage-5.103.0/po/zh_CN/libkpackage5.po --- old/kpackage-5.102.0/po/zh_CN/libkpackage5.po 2023-01-07 03:24:43.000000000 +0100 +++ new/kpackage-5.103.0/po/zh_CN/libkpackage5.po 2023-02-05 10:24:51.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-15 00:41+0000\n" -"PO-Revision-Date: 2023-01-02 07:11\n" +"PO-Revision-Date: 2023-01-12 10:30\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
