Hello community, here is the log from the commit of package dtkcore for openSUSE:Factory checked in at 2019-07-11 13:17:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dtkcore (Old) and /work/SRC/openSUSE:Factory/.dtkcore.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dtkcore" Thu Jul 11 13:17:49 2019 rev:7 rq:714326 version:2.0.15 Changes: -------- --- /work/SRC/openSUSE:Factory/dtkcore/dtkcore.changes 2019-04-30 13:02:50.922122120 +0200 +++ /work/SRC/openSUSE:Factory/.dtkcore.new.4615/dtkcore.changes 2019-07-11 13:18:12.494770892 +0200 @@ -1,0 +2,8 @@ +Sun Jul 7 14:51:51 UTC 2019 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 2.0.15 + * Fix DSettings: crash when calling getOption() if option doesn't exist + * refactor: use commit count for the package version + * feat: allow dtk-settings-tools skip json key translation + +------------------------------------------------------------------- Old: ---- dtkcore-2.0.12.1.tar.gz New: ---- dtkcore-2.0.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtkcore.spec ++++++ --- /var/tmp/diff_new_pack.gJntTf/_old 2019-07-11 13:18:13.090770704 +0200 +++ /var/tmp/diff_new_pack.gJntTf/_new 2019-07-11 13:18:13.098770702 +0200 @@ -13,14 +13,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define libver 2 Name: dtkcore -Version: 2.0.12.1 +Version: 2.0.15 Release: 0 Summary: Deepin Tool Kit Core License: GPL-3.0-or-later @@ -83,7 +83,8 @@ %files %defattr(-,root,root,-) -%doc LICENSE README.md +%doc README.md CHANGELOG.md +%license LICENSE %dir %{_libexecdir}/dtk2 %{_libexecdir}/dtk2/* %{_libdir}/libdtk-2.0.6 ++++++ dtkcore-2.0.12.1.tar.gz -> dtkcore-2.0.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcore-2.0.12.1/.release.json new/dtkcore-2.0.15/.release.json --- old/dtkcore-2.0.12.1/.release.json 2019-04-18 03:12:10.000000000 +0200 +++ new/dtkcore-2.0.15/.release.json 2019-07-05 08:42:48.000000000 +0200 @@ -1,7 +1,7 @@ { "commit": { "quilt": false, - "pkgver": "echo $(git tag | sort -V | tail -n1)'+r'$(date '+%%y%%m%%d%%H%%M%%S')'+g'$(git rev-parse --short HEAD);", + "pkgver": "echo $(git tag | sort -V | tail -n1)'+r'$(git log $(git describe --abbrev=0 --tags)..HEAD --oneline|wc -l)'+g'$(git rev-parse --short HEAD);", "dist": "experimental" }, "release": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcore-2.0.12.1/CHANGELOG.md new/dtkcore-2.0.15/CHANGELOG.md --- old/dtkcore-2.0.12.1/CHANGELOG.md 2019-04-18 03:12:10.000000000 +0200 +++ new/dtkcore-2.0.15/CHANGELOG.md 2019-07-05 08:42:48.000000000 +0200 @@ -1,3 +1,13 @@ +<a name="2.0.14"></a> +## 2.0.14 (2019-05-23) + + +#### Bug Fixes + +* **DSettings:** crash when calling getOption() if option doesn't exist ([90ac734b](https://github.com/linuxdeepin/dtkcore/commit/90ac734b872203ea698808a7197aa7a9c7e2b5bd)) + + + <a name="2.0.12"></a> ## 2.0.12 (2019-04-18) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcore-2.0.12.1/src/settings/dsettings.cpp new/dtkcore-2.0.15/src/settings/dsettings.cpp --- old/dtkcore-2.0.12.1/src/settings/dsettings.cpp 2019-04-18 03:12:10.000000000 +0200 +++ new/dtkcore-2.0.15/src/settings/dsettings.cpp 2019-07-05 08:42:48.000000000 +0200 @@ -388,7 +388,11 @@ QVariant DSettings::getOption(const QString &key) const { - return option(key)->value(); + QPointer<DSettingsOption> optionPointer = option(key); + if (optionPointer) { + return optionPointer->value(); + } + return QVariant(); } void DSettings::setOption(const QString &key, const QVariant &value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcore-2.0.12.1/tools/deepin-os-release/main.cpp new/dtkcore-2.0.15/tools/deepin-os-release/main.cpp --- old/dtkcore-2.0.12.1/tools/deepin-os-release/main.cpp 2019-04-18 03:12:10.000000000 +0200 +++ new/dtkcore-2.0.15/tools/deepin-os-release/main.cpp 2019-07-05 08:42:48.000000000 +0200 @@ -35,7 +35,7 @@ Q_UNUSED(app) QCommandLineParser parser; - QCommandLineOption option_all("all", "Print All Informations"); + QCommandLineOption option_all("all", "Print All Information"); QCommandLineOption option_deepin_type("deepin-type", " "); QCommandLineOption option_deepin_version("deepin-version", " "); QCommandLineOption option_deepin_edition("deepin-edition", " ");
