Hello community, here is the log from the commit of package kinfocenter5 for openSUSE:Factory checked in at 2015-11-11 10:28:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kinfocenter5 (Old) and /work/SRC/openSUSE:Factory/.kinfocenter5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinfocenter5" Changes: -------- --- /work/SRC/openSUSE:Factory/kinfocenter5/kinfocenter5.changes 2015-10-19 22:17:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kinfocenter5.new/kinfocenter5.changes 2015-11-11 10:28:44.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Oct 23 17:24:15 UTC 2015 - [email protected] + +- Fix the command line parsing, which was crashing when + calling kinfocenter --version + * kinfocenter-fix-cmdline-parsing.patch + +------------------------------------------------------------------- New: ---- kinfocenter-fix-cmdline-parsing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinfocenter5.spec ++++++ --- /var/tmp/diff_new_pack.296nGl/_old 2015-11-11 10:28:45.000000000 +0100 +++ /var/tmp/diff_new_pack.296nGl/_new 2015-11-11 10:28:45.000000000 +0100 @@ -28,6 +28,8 @@ Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE plasma-session-name.patch Patch0: plasma-session-name.patch +# PATCH-FIX-UPSTREAM kinfocenter-fix-cmdline-parsing.patch -- Fixes crash when run with --version +Patch1: kinfocenter-fix-cmdline-parsing.patch BuildRequires: extra-cmake-modules BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel @@ -71,6 +73,7 @@ %prep %setup -q -n kinfocenter-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ kinfocenter-fix-cmdline-parsing.patch ++++++ From: Antonio Larrosa <[email protected]> Date: Fri, 23 Oct 2015 12:57:44 +0000 Subject: Fix kinfocenter crash when run with --version X-Git-Url: http://quickgit.kde.org/?p=kinfocenter.git&a=commitdiff&h=fe16e35904587266f37114ac682916e449677054 --- Fix kinfocenter crash when run with --version Fix the order in which kinfocenter is initialized to first do all commandline parsing and only then create windows. In other case running "kinfocenter --version" crashes when unloading dynamic libraries that shouldn't have been loaded at all. --- --- a/main.cpp +++ b/main.cpp @@ -37,14 +37,7 @@ { QApplication::setApplicationDisplayName(i18n("KDE Info Center")); QApplication::setOrganizationDomain("kde.org"); - display = new KInfoCenter(); - display->show(); - KDBusService* service = new KDBusService(KDBusService::Unique, this); -} - -int main(int argc, char *argv[]) -{ KLocalizedString::setApplicationDomain("kinfocenter"); KAboutData aboutData( QStringLiteral("kinfocenter"), i18n("KDE Info Center"), @@ -60,14 +53,23 @@ aboutData.addAuthor(i18n("Waldo Bastian"), QString(), QStringLiteral("[email protected]")); aboutData.addAuthor(i18n("Nicolas Ternisien"), QString(), QStringLiteral("[email protected]")); KAboutData::setApplicationData(aboutData); - KicApp Kic(argc, argv); QCommandLineParser parser; parser.addHelpOption(); parser.addVersionOption(); aboutData.setupCommandLine(&parser); - parser.process(Kic); + parser.process(*this); aboutData.processCommandLine(&parser); + + display = new KInfoCenter(); + display->show(); + + KDBusService* service = new KDBusService(KDBusService::Unique, this); +} + +int main(int argc, char *argv[]) +{ + KicApp Kic(argc, argv); return Kic.exec(); }
