Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2016-10-18 09:56:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2016-09-14 23:26:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kpackage.new/kpackage.changes 2016-10-18 09:56:44.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 7 15:28:54 UTC 2016 - [email protected] + +- Add fix-package-remove-definition.diff: + Removes package discoveries too when removing a definition, so + old data is not kept forever around. + +------------------------------------------------------------------- New: ---- fix-package-remove-definition.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.jM8bXs/_old 2016-10-18 09:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jM8bXs/_new 2016-10-18 09:56:44.000000000 +0200 @@ -42,6 +42,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM fix-package-remove-definition.diff -- Fix removal of package discoveries as well as definitions +Patch0: fix-package-remove-definition.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +63,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ fix-package-remove-definition.diff ++++++ Index: kpackage-5.26.0/src/kpackage/package.cpp =================================================================== --- kpackage-5.26.0.orig/src/kpackage/package.cpp +++ kpackage-5.26.0/src/kpackage/package.cpp @@ -677,6 +677,11 @@ void Package::removeDefinition(const QBy d.detach(); d->contents.remove(key); } + + if (d->discoveries.contains(key)) { + d.detach(); + d->discoveries.remove(key); + } } void Package::setRequired(const QByteArray &key, bool required)
