Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2018-06-22 13:22:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Fri Jun 22 13:22:06 2018 rev:44 rq:616779 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2018-05-18 14:22:56.241305772 +0200 +++ /work/SRC/openSUSE:Factory/.kpackage.new/kpackage.changes 2018-06-22 13:22:12.619862097 +0200 @@ -1,0 +2,11 @@ +Tue Jun 12 21:26:06 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * kpackage_install_*package: fix missing dep between .desktop and .json + * make sure paths in rcc are never derived from absolute paths + +------------------------------------------------------------------- Old: ---- kpackage-5.46.0.tar.xz New: ---- kpackage-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.SjUiaJ/_old 2018-06-22 13:22:13.443831651 +0200 +++ /var/tmp/diff_new_pack.SjUiaJ/_new 2018-06-22 13:22:13.447831503 +0200 @@ -17,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.46 +%define _tar_path 5.47 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kpackage -Version: 5.46.0 +Version: 5.47.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ kpackage-5.46.0.tar.xz -> kpackage-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.46.0/CMakeLists.txt new/kpackage-5.47.0/CMakeLists.txt --- old/kpackage-5.46.0/CMakeLists.txt 2018-05-05 14:59:32.000000000 +0200 +++ new/kpackage-5.47.0/CMakeLists.txt 2018-06-02 20:03:13.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts -set(KF5_DEP_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_DEP_VERSION "5.47.0") # handled by release scripts project(KPackage VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/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.46.0/KF5PackageMacros.cmake new/kpackage-5.47.0/KF5PackageMacros.cmake --- old/kpackage-5.46.0/KF5PackageMacros.cmake 2018-05-05 14:59:32.000000000 +0200 +++ new/kpackage-5.47.0/KF5PackageMacros.cmake 2018-06-02 20:03:13.000000000 +0200 @@ -44,10 +44,12 @@ PATTERN dummydata EXCLUDE) set(metadatajson) - if(NOT EXISTS ${component}-${root}-metadata.json AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop) + set(ORIGINAL_METADATA "${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop") + if(NOT EXISTS ${component}-${root}-metadata.json AND EXISTS ${ORIGINAL_METADATA}) set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-${root}-metadata.json") add_custom_command(OUTPUT ${GENERATED_METADATA} - COMMAND KF5::desktoptojson -i ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop -o ${GENERATED_METADATA}) + DEPENDS ${ORIGINAL_METADATA} + COMMAND KF5::desktoptojson -i ${ORIGINAL_METADATA} -o ${GENERATED_METADATA}) add_custom_target(${component}-${root}-metadata-json ALL DEPENDS ${GENERATED_METADATA}) install(FILES ${GENERATED_METADATA} DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component} RENAME metadata.json) set(metadatajson ${GENERATED_METADATA}) @@ -101,10 +103,12 @@ endif() set(metadatajson) - if(NOT EXISTS ${component}-${root}-metadata.json AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop) + set(ORIGINAL_METADATA "${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop") + if(NOT EXISTS ${component}-${root}-metadata.json AND EXISTS ${ORIGINAL_METADATA}) set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-${root}-metadata.json") add_custom_command(OUTPUT ${GENERATED_METADATA} - COMMAND KF5::desktoptojson -i ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop -o ${GENERATED_METADATA}) + DEPENDS ${ORIGINAL_METADATA} + COMMAND KF5::desktoptojson -i ${ORIGINAL_METADATA} -o ${GENERATED_METADATA}) add_custom_target(${component}-${root}-metadata-json ALL DEPENDS ${GENERATED_METADATA}) install(FILES ${GENERATED_METADATA} DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component} RENAME metadata.json) set(metadatajson ${GENERATED_METADATA}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.46.0/po/id/libkpackage5.po new/kpackage-5.47.0/po/id/libkpackage5.po --- old/kpackage-5.46.0/po/id/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 +++ new/kpackage-5.47.0/po/id/libkpackage5.po 2018-06-02 20:03:13.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-03-19 03:21+0100\n" -"PO-Revision-Date: 2018-04-03 06:37+0700\n" +"PO-Revision-Date: 2018-05-31 22:01+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -72,7 +72,7 @@ #: kpackage/packageloader.cpp:66 #, kde-format msgid "Fun and Games" -msgstr "Hiburan dan Permainan" +msgstr "Hiburan dan Game" #: kpackage/packageloader.cpp:67 #, kde-format @@ -128,7 +128,7 @@ #, kde-format msgid "Could not load installer for package of type %1. Error reported was: %2" msgstr "" -"Tak dapat memuat penginstal untuk paket dengan tipe %1. Galat yang " +"Tak dapat memuat penginstal untuk paket dengan tipe %1. Error yang " "dilaporkan adalah: %2" #: kpackage/private/packagejobthread.cpp:221 @@ -169,7 +169,7 @@ #: kpackage/private/packagejobthread.cpp:334 #, kde-format msgid "Package plugin name %1 contains invalid characters" -msgstr "Nama plugin paket %1 berisi karakter yang tidak sah" +msgstr "Nama plugin paket %1 berisi karakter yang tidak absah" #: kpackage/private/packagejobthread.cpp:350 #, kde-format @@ -289,7 +289,7 @@ #: kpackagetool/kpackagetool.cpp:324 #, kde-format msgid "Error: Plugin %1 is not installed." -msgstr "Galat: Plugin %1 tidak terpasang." +msgstr "Error: Plugin %1 tidak terpasang." #: kpackagetool/kpackagetool.cpp:334 #, kde-format @@ -302,7 +302,7 @@ #: kpackagetool/kpackagetool.cpp:385 kpackagetool/kpackagetool.cpp:470 #, kde-format msgid "Error: Can't find plugin metadata: %1\n" -msgstr "Galat: Tak menemukan metadata plugin: %1\n" +msgstr "Error: Tak menemukan metadata plugin: %1\n" #: kpackagetool/kpackagetool.cpp:389 #, kde-format @@ -429,7 +429,7 @@ #: kpackagetool/kpackagetool.cpp:762 #, kde-format msgid "Error: Installation of %1 failed: %2" -msgstr "Galat: Pemasangan %1 gagal: %2" +msgstr "Error: Pemasangan %1 gagal: %2" #: kpackagetool/kpackagetool.cpp:774 #, kde-format @@ -444,7 +444,7 @@ #: kpackagetool/kpackagetool.cpp:781 #, kde-format msgid "Error: Uninstallation of %1 failed: %2" -msgstr "Galat: Mencopot pemasangan %1 gagal: %2" +msgstr "Error: Mencopot pemasangan %1 gagal: %2" #: kpackagetool/main.cpp:49 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.46.0/po/zh_CN/libkpackage5.po new/kpackage-5.47.0/po/zh_CN/libkpackage5.po --- old/kpackage-5.46.0/po/zh_CN/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 +++ new/kpackage-5.47.0/po/zh_CN/libkpackage5.po 2018-06-02 20:03:13.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-03-19 03:21+0100\n" -"PO-Revision-Date: 2018-04-26 05:21-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.46.0/src/kpackage/package.cpp new/kpackage-5.47.0/src/kpackage/package.cpp --- old/kpackage-5.46.0/src/kpackage/package.cpp 2018-05-05 14:59:32.000000000 +0200 +++ new/kpackage-5.47.0/src/kpackage/package.cpp 2018-06-02 20:03:13.000000000 +0200 @@ -549,7 +549,9 @@ if (dir.exists(QStringLiteral("contents.rcc"))) { d->rccPath = dir.absoluteFilePath(QStringLiteral("contents.rcc")); QResource::registerResource(d->rccPath); - dir = QDir(QStringLiteral(":/") + defaultPackageRoot() + path); + + //we need just the plugin name here, never the absolute path + dir = QDir(QStringLiteral(":/") + defaultPackageRoot() + path.midRef(path.lastIndexOf(QLatin1Char('/')))); } d->path = dir.canonicalPath();
