From ccf9f84f5f42c16e059ed7d52910613a2bd56d1c9fbfa41adbf7ca83655a3fcb Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 8 Nov 2015 16:58:57 +0000 Subject: [PATCH 1/4] 5.16.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kded?expand=0&rev=68 --- kded-5.15.0.tar.xz | 3 --- kded-5.16.0.tar.xz | 3 +++ kded.changes | 7 +++++++ kded.spec | 7 ++----- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 kded-5.15.0.tar.xz create mode 100644 kded-5.16.0.tar.xz diff --git a/kded-5.15.0.tar.xz b/kded-5.15.0.tar.xz deleted file mode 100644 index 4f89e72..0000000 --- a/kded-5.15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98330b8512dbc06f35b93edd85ac6777c84c960a9492dd38c670d567ba749490 -size 35812 diff --git a/kded-5.16.0.tar.xz b/kded-5.16.0.tar.xz new file mode 100644 index 0000000..d5f277a --- /dev/null +++ b/kded-5.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18752b8928f97fba456d8badb1c378a45b24447ed503ac622136cd8492ea155c +size 35832 diff --git a/kded.changes b/kded.changes index db1b069..570431f 100644 --- a/kded.changes +++ b/kded.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Nov 8 16:58:54 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.16.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php + ------------------------------------------------------------------- Fri Oct 23 17:50:20 UTC 2015 - alarrosa@suse.com diff --git a/kded.spec b/kded.spec index c5071e2..12542f2 100644 --- a/kded.spec +++ b/kded.spec @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.15 +%define _tar_path 5.16 Name: kded -Version: 5.15.0 +Version: 5.16.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -48,8 +48,6 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE kded-fix-cmdline-parsing.patch alarrosa@suse.com -- Removes a warning and fixes command line parsing -Patch0: kded-fix-cmdline-parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,7 +68,6 @@ Development files. %lang_package %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build From 5e8b0afeadb81efcbef43417a19497ea8313be8a8d0d60d0e378701d0089702d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 8 Nov 2015 17:04:02 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kded?expand=0&rev=69 --- kded-fix-cmdline-parsing.patch | 59 ---------------------------------- kded.changes | 1 + 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 kded-fix-cmdline-parsing.patch diff --git a/kded-fix-cmdline-parsing.patch b/kded-fix-cmdline-parsing.patch deleted file mode 100644 index b8154e7..0000000 --- a/kded-fix-cmdline-parsing.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/src/kded.cpp b/src/kded.cpp -index 6929d7d3f24d3556f1b227d5a9bfb5b02b1c295e..082d3863dcf484a6d609e2c639c49788d9576007 100644 ---- a/src/kded.cpp -+++ b/src/kded.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -672,6 +673,7 @@ static void setupAppInfo(QCoreApplication *app) - { - app->setApplicationName("kded5"); - app->setOrganizationDomain("kde.org"); -+ app->setApplicationVersion(KDED_VERSION_STRING); - } - - extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) -@@ -679,24 +681,27 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) - //options.add("check", qi18n("Check Sycoca database only once")); - - // WABA: Make sure not to enable session management. -- putenv(qstrdup("SESSION_MANAGER=")); -+ qunsetenv("SESSION_MANAGER"); -+ -+ QApplication app(argc, argv); -+ app.setApplicationDisplayName("KDE Daemon"); -+ setupAppInfo(&app); -+ app.setQuitOnLastWindowClosed(false); -+ -+ QCommandLineParser parser; -+ parser.addHelpOption(); -+ parser.addVersionOption(); -+ parser.addOption(QCommandLineOption(QStringLiteral("check"), QStringLiteral("Check cache validity"))); -+ parser.process(app); - - // Parse command line before checking D-Bus -- if (argc > 1 && QByteArray(argv[1]) == "--check") { -+ if (parser.isSet(QStringLiteral("check"))) { - // KDBusService not wanted here. -- QCoreApplication app(argc, argv); -- setupAppInfo(&app); -- - KSycoca::self()->ensureCacheValid(); - runKonfUpdate(); - return 0; - } - -- QApplication app(argc, argv); -- setupAppInfo(&app); -- app.setApplicationDisplayName("KDE Daemon"); -- app.setQuitOnLastWindowClosed(false); -- - KDBusService service(KDBusService::Unique); - - KSharedConfig::Ptr config = KSharedConfig::openConfig(); - diff --git a/kded.changes b/kded.changes index 570431f..06a8c5e 100644 --- a/kded.changes +++ b/kded.changes @@ -4,6 +4,7 @@ Sun Nov 8 16:58:54 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.16.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.16.0.php +- Drop kded-fix-cmdline-parsing.patch, upstreamed ------------------------------------------------------------------- Fri Oct 23 17:50:20 UTC 2015 - alarrosa@suse.com From eae0b32bf6f1fd7dd7b4f645477c4a58671b0d2425a1d74e656abce223abb714 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 11 Nov 2015 09:28:37 +0000 Subject: [PATCH 3/4] Updating link to change in openSUSE:Factory/kded revision 22.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kded?expand=0&rev=d7afd3797b6f6c6327b0359a49c4deed --- kded-fix-cmdline-parsing.patch | 59 ++++++++++++++++++++++++++++++++++ kded.spec | 3 ++ 2 files changed, 62 insertions(+) create mode 100644 kded-fix-cmdline-parsing.patch diff --git a/kded-fix-cmdline-parsing.patch b/kded-fix-cmdline-parsing.patch new file mode 100644 index 0000000..b8154e7 --- /dev/null +++ b/kded-fix-cmdline-parsing.patch @@ -0,0 +1,59 @@ +diff --git a/src/kded.cpp b/src/kded.cpp +index 6929d7d3f24d3556f1b227d5a9bfb5b02b1c295e..082d3863dcf484a6d609e2c639c49788d9576007 100644 +--- a/src/kded.cpp ++++ b/src/kded.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -672,6 +673,7 @@ static void setupAppInfo(QCoreApplication *app) + { + app->setApplicationName("kded5"); + app->setOrganizationDomain("kde.org"); ++ app->setApplicationVersion(KDED_VERSION_STRING); + } + + extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) +@@ -679,24 +681,27 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) + //options.add("check", qi18n("Check Sycoca database only once")); + + // WABA: Make sure not to enable session management. +- putenv(qstrdup("SESSION_MANAGER=")); ++ qunsetenv("SESSION_MANAGER"); ++ ++ QApplication app(argc, argv); ++ app.setApplicationDisplayName("KDE Daemon"); ++ setupAppInfo(&app); ++ app.setQuitOnLastWindowClosed(false); ++ ++ QCommandLineParser parser; ++ parser.addHelpOption(); ++ parser.addVersionOption(); ++ parser.addOption(QCommandLineOption(QStringLiteral("check"), QStringLiteral("Check cache validity"))); ++ parser.process(app); + + // Parse command line before checking D-Bus +- if (argc > 1 && QByteArray(argv[1]) == "--check") { ++ if (parser.isSet(QStringLiteral("check"))) { + // KDBusService not wanted here. +- QCoreApplication app(argc, argv); +- setupAppInfo(&app); +- + KSycoca::self()->ensureCacheValid(); + runKonfUpdate(); + return 0; + } + +- QApplication app(argc, argv); +- setupAppInfo(&app); +- app.setApplicationDisplayName("KDE Daemon"); +- app.setQuitOnLastWindowClosed(false); +- + KDBusService service(KDBusService::Unique); + + KSharedConfig::Ptr config = KSharedConfig::openConfig(); + diff --git a/kded.spec b/kded.spec index 12542f2..ba445d5 100644 --- a/kded.spec +++ b/kded.spec @@ -48,6 +48,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE kded-fix-cmdline-parsing.patch alarrosa@suse.com -- Removes a warning and fixes command line parsing +Patch0: kded-fix-cmdline-parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -68,6 +70,7 @@ Development files. %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build From 5e143826c59f03de069e46ca6e6848f609704f82708f9e40f6e3c9c0a7247c21 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 15 Nov 2015 16:14:10 +0000 Subject: [PATCH 4/4] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kded?expand=0&rev=70 --- kded.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kded.changes b/kded.changes index 06a8c5e..489006a 100644 --- a/kded.changes +++ b/kded.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sun Nov 8 16:58:54 UTC 2015 - hrvoje.senjan@gmail.com -- Update to 5.16.0 +- Update to 5.16.0 (boo#955067) + * Make doctools optional * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.16.0.php - Drop kded-fix-cmdline-parsing.patch, upstreamed