Hello community,
here is the log from the commit of package kinit for openSUSE:Factory checked in at 2017-03-03 16:58:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kinit (Old)
and /work/SRC/openSUSE:Factory/.kinit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinit"
Fri Mar 3 16:58:37 2017 rev:38 rq:461433 version:5.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kinit/kinit.changes 2017-02-03 17:45:13.356824973 +0100
+++ /work/SRC/openSUSE:Factory/.kinit.new/kinit.changes 2017-03-03 16:58:38.390483676 +0100
@@ -1,0 +2,7 @@
+Thu Feb 9 09:29:52 UTC 2017 - hrvoje.senjan@gmail.com
+
+- Update to 5.31.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.31.0.php
+
+-------------------------------------------------------------------
Old:
----
kinit-5.30.0.tar.xz
New:
----
kinit-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kinit.spec ++++++
--- /var/tmp/diff_new_pack.gvy66K/_old 2017-03-03 16:58:39.258360947 +0100
+++ /var/tmp/diff_new_pack.gvy66K/_new 2017-03-03 16:58:39.258360947 +0100
@@ -17,9 +17,9 @@
%bcond_without lang
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: kinit
-Version: 5.30.0
+Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@@ -34,10 +34,10 @@
BuildRequires: kwindowsystem-devel >= %{_tar_path}
BuildRequires: libcap-devel
BuildRequires: libcap-progs
-BuildRequires: cmake(Qt5Core) >= 5.5.0
-BuildRequires: cmake(Qt5DBus) >= 5.5.0
-BuildRequires: cmake(Qt5Gui) >= 5.5.0
-BuildRequires: cmake(Qt5Widgets) >= 5.5.0
+BuildRequires: cmake(Qt5Core) >= 5.6.0
+BuildRequires: cmake(Qt5DBus) >= 5.6.0
+BuildRequires: cmake(Qt5Gui) >= 5.6.0
+BuildRequires: cmake(Qt5Widgets) >= 5.6.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
%if %{with lang}
++++++ kinit-5.30.0.tar.xz -> kinit-5.31.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/CMakeLists.txt new/kinit-5.31.0/CMakeLists.txt
--- old/kinit-5.30.0/CMakeLists.txt 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/CMakeLists.txt 2017-02-05 12:01:15.000000000 +0100
@@ -3,13 +3,13 @@
project(KInit)
include(FeatureSummary)
-find_package(ECM 5.30.0 NO_MODULE)
+find_package(ECM 5.31.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)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core Gui DBus)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
@@ -19,8 +19,8 @@
include(CMakePackageConfigHelpers)
include(ECMSetupVersion)
-set(KF5_VERSION "5.30.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.30.0") # handled by release scripts
+set(KF5_VERSION "5.31.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.31.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KINIT
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kinit_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/po/ia/kinit5.po new/kinit-5.31.0/po/ia/kinit5.po
--- old/kinit-5.30.0/po/ia/kinit5.po 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/po/ia/kinit5.po 2017-02-05 12:01:15.000000000 +0100
@@ -1,22 +1,22 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# g.sora , 2010, 2011, 2012, 2013, 2014.
+# g.sora , 2010, 2011, 2012, 2013, 2014, 2017.
# Giovanni Sora , 2014.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-12-13 02:41+0100\n"
-"PO-Revision-Date: 2014-04-01 11:41+0200\n"
-"Last-Translator: Giovanni Sora \n"
-"Language-Team: Interlingua \n"
+"PO-Revision-Date: 2017-01-15 19:49+0100\n"
+"Last-Translator: giovanni \n"
+"Language-Team: Interlingua \n"
"Language: ia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#: kdeinit/kinit.cpp:509
#, kde-format
@@ -99,10 +99,9 @@
msgstr "Il non pote trovar le plugin '%1'.\n"
#: klauncher/klauncher.cpp:1128
-#, fuzzy, kde-format
-#| msgid "Error loading '%1'.\n"
+#, kde-format
msgid "Error loading '%1'."
-msgstr "Error in cargamento de '%1'.\n"
+msgstr "Error in cargamento de '%1'."
#: klauncher/klauncher_main.cpp:146
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/po/ko/kinit5.po new/kinit-5.31.0/po/ko/kinit5.po
--- old/kinit-5.30.0/po/ko/kinit5.po 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/po/ko/kinit5.po 2017-02-05 12:01:15.000000000 +0100
@@ -2,14 +2,14 @@
# Copyright (C) Free Software Foundation, Inc.
# Cho Sung Jae , 2007.
# Shinjo Park , 2007, 2008, 2009, 2010, 2011.
-# Shinjo Park , 2011, 2012, 2013, 2014, 2015.
+# Shinjo Park , 2011, 2012, 2013, 2014, 2015, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-12-13 02:41+0100\n"
-"PO-Revision-Date: 2015-06-27 12:00+0200\n"
+"PO-Revision-Date: 2017-01-22 19:38+0100\n"
"Last-Translator: Shinjo Park \n"
"Language-Team: Korean \n"
"Language: ko\n"
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#: kdeinit/kinit.cpp:509
#, kde-format
@@ -101,10 +101,9 @@
msgstr "플러그인 '%1'을(를) 찾을 수 없습니다.\n"
#: klauncher/klauncher.cpp:1128
-#, fuzzy, kde-format
-#| msgid "Error loading '%1'.\n"
+#, kde-format
msgid "Error loading '%1'."
-msgstr "'%1'(을)를 불러오는 중 오류 발생.\n"
+msgstr "'%1'(을)를 불러오는 중 오류 발생."
#: klauncher/klauncher_main.cpp:146
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/po/nb/kinit5.po new/kinit-5.31.0/po/nb/kinit5.po
--- old/kinit-5.30.0/po/nb/kinit5.po 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/po/nb/kinit5.po 2017-02-05 12:01:15.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2016-11-23 02:52+0100\n"
+"POT-Creation-Date: 2016-12-13 02:41+0100\n"
"PO-Revision-Date: 2014-04-25 15:53+0200\n"
"Last-Translator: Bjørn Steensrud \n"
"Language-Team: Norwegian Bokmål \n"
@@ -85,32 +85,30 @@
msgid "Service '%1' must be executable to run."
msgstr "Tjenesten «%1» må være kjørbar for å kunne starte."
-#: klauncher/klauncher.cpp:718 klauncher/klauncher.cpp:755
+#: klauncher/klauncher.cpp:718 klauncher/klauncher.cpp:780
#, kde-format
msgid "Service '%1' is malformatted."
msgstr "Tjenesten «%1» har feil format."
-#: klauncher/klauncher.cpp:844
+#: klauncher/klauncher.cpp:869
#, kde-format
msgid "Launching %1"
msgstr "Starter %1"
-#: klauncher/klauncher.cpp:1031
+#: klauncher/klauncher.cpp:1056
#, kde-format
msgid "Unknown protocol '%1'.\n"
msgstr "Ukjent protokoll «%1».\n"
-#: klauncher/klauncher.cpp:1037
+#: klauncher/klauncher.cpp:1062
#, kde-format
msgid "Could not find the '%1' plugin.\n"
msgstr "Klarte ikke finne programtillegget «%1».\n"
-#: klauncher/klauncher.cpp:1103
+#: klauncher/klauncher.cpp:1128
#, kde-format
-msgid "Error loading '%1'.\n"
+msgid "Error loading '%1'."
msgstr ""
-"Feil ved lasting av fila:\n"
-"%1\n"
#: klauncher/klauncher_main.cpp:146
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/po/nn/kinit5.po new/kinit-5.31.0/po/nn/kinit5.po
--- old/kinit-5.30.0/po/nn/kinit5.po 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/po/nn/kinit5.po 2017-02-05 12:01:15.000000000 +0100
@@ -2,14 +2,14 @@
#
# Gaute Hvoslef Kvalnes , 2003, 2004, 2005, 2006.
# Håvard Korsvoll , 2003, 2005.
-# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
+# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017.
# Eirik U. Birkeland , 2008, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-12-13 02:41+0100\n"
-"PO-Revision-Date: 2015-06-04 18:11+0100\n"
+"PO-Revision-Date: 2017-02-05 10:30+0100\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \n"
"Language: nn\n"
@@ -105,7 +105,7 @@
#: klauncher/klauncher.cpp:1128
#, kde-format
msgid "Error loading '%1'."
-msgstr ""
+msgstr "Feil ved lasting av «%1»."
#: klauncher/klauncher_main.cpp:146
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/po/ru/kinit5.po new/kinit-5.31.0/po/ru/kinit5.po
--- old/kinit-5.30.0/po/ru/kinit5.po 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/po/ru/kinit5.po 2017-02-05 12:01:15.000000000 +0100
@@ -8,7 +8,7 @@
# Andrey Cherepanov , 2005-2007, 2008, 2009, 2011.
# Nick Shaforostoff , 2004, 2006, 2007, 2008, 2009.
# Nick Shaforostoff , 2009.
-# Alexander Potashev , 2009, 2010, 2011, 2014.
+# Alexander Potashev , 2009, 2010, 2011, 2014, 2017.
# Yury G. Kudryashov , 2011.
# Yuri Efremov , 2012.
# Inga Barinova , 2012.
@@ -19,14 +19,14 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-12-13 02:41+0100\n"
-"PO-Revision-Date: 2014-06-30 00:10+0400\n"
+"PO-Revision-Date: 2017-01-20 00:13+0300\n"
"Last-Translator: Alexander Potashev \n"
"Language-Team: Russian \n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Environment: kde\n"
@@ -114,10 +114,9 @@
msgstr "Не удалось найти модуль «%1».\n"
#: klauncher/klauncher.cpp:1128
-#, fuzzy, kde-format
-#| msgid "Error loading '%1'.\n"
+#, kde-format
msgid "Error loading '%1'."
-msgstr "Ошибка загрузки «%1»:\n"
+msgstr "Ошибка загрузки «%1»."
#: klauncher/klauncher_main.cpp:146
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/po/se/kinit5.po new/kinit-5.31.0/po/se/kinit5.po
--- old/kinit-5.30.0/po/se/kinit5.po 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/po/se/kinit5.po 2017-02-05 12:01:15.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2016-11-23 02:52+0100\n"
+"POT-Creation-Date: 2016-12-13 02:41+0100\n"
"PO-Revision-Date: 2012-05-30 23:19+0200\n"
"Last-Translator: Børre Gaup \n"
"Language-Team: Northern Sami \n"
@@ -79,30 +79,30 @@
msgid "Service '%1' must be executable to run."
msgstr "Bálvalus «%1» ferte leat vuojehahtti jus galgá sáhttit vuodjit dan."
-#: klauncher/klauncher.cpp:718 klauncher/klauncher.cpp:755
+#: klauncher/klauncher.cpp:718 klauncher/klauncher.cpp:780
#, kde-format
msgid "Service '%1' is malformatted."
msgstr "Bálvalus «%1» lea boasttohámát."
-#: klauncher/klauncher.cpp:844
+#: klauncher/klauncher.cpp:869
#, kde-format
msgid "Launching %1"
msgstr "Álggaheamen %1"
-#: klauncher/klauncher.cpp:1031
+#: klauncher/klauncher.cpp:1056
#, kde-format
msgid "Unknown protocol '%1'.\n"
msgstr "Amas protokolla «%1».\n"
-#: klauncher/klauncher.cpp:1037
+#: klauncher/klauncher.cpp:1062
#, fuzzy, kde-format
msgid "Could not find the '%1' plugin.\n"
msgstr "Ii gávdnan bálvalusa \"%1\""
-#: klauncher/klauncher.cpp:1103
+#: klauncher/klauncher.cpp:1128
#, kde-format
-msgid "Error loading '%1'.\n"
-msgstr "Meattáhus vieččadettiin «%1»\n"
+msgid "Error loading '%1'."
+msgstr ""
#: klauncher/klauncher_main.cpp:146
#, fuzzy, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/src/kdeinit/kinit.cpp new/kinit-5.31.0/src/kdeinit/kinit.cpp
--- old/kinit-5.30.0/src/kdeinit/kinit.cpp 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/src/kdeinit/kinit.cpp 2017-02-05 12:01:15.000000000 +0100
@@ -116,11 +116,11 @@
#if HAVE_X11
static int X11fd = -1;
-static Display *X11display = 0;
+static Display *X11display = nullptr;
static int X11_startup_notify_fd = -1;
#endif
#if HAVE_XCB
-static xcb_connection_t *s_startup_notify_connection = Q_NULLPTR;
+static xcb_connection_t *s_startup_notify_connection = nullptr;
static int s_startup_notify_screen = 0;
#endif
// Finds size of sun_path without allocating a sockaddr_un to do it.
@@ -263,7 +263,7 @@
void setup_tty(const char *tty)
{
- if (tty == NULL || *tty == '\0') {
+ if (tty == nullptr || *tty == '\0') {
return;
}
QFile f(QFile::decodeName(tty));
@@ -300,7 +300,7 @@
env_l++;
}
}
- return NULL;
+ return nullptr;
}
#if HAVE_XCB
@@ -317,7 +317,7 @@
}
if (xcb_connection_has_error(s_startup_notify_connection)) {
xcb_disconnect(s_startup_notify_connection);
- s_startup_notify_connection = Q_NULLPTR;
+ s_startup_notify_connection = nullptr;
return;
}
X11_startup_notify_fd = xcb_get_file_descriptor(s_startup_notify_connection);
@@ -343,7 +343,7 @@
KStartupInfo::sendChangeXcb(s_startup_notify_connection, s_startup_notify_screen, id, data);
}
xcb_disconnect(s_startup_notify_connection);
- s_startup_notify_connection = Q_NULLPTR;
+ s_startup_notify_connection = nullptr;
s_startup_notify_screen = 0;
X11_startup_notify_fd = -1;
}
@@ -355,7 +355,7 @@
const QRegExp pathSepRegExp(QStringLiteral("[:\b]"));
if (envc > 0) { /* use the passed environment */
const char *path = get_env_var("PATH=", envc, envs);
- if (path != NULL) {
+ if (path != nullptr) {
paths = QFile::decodeName(path).split(pathSepRegExp);
}
} else {
@@ -404,7 +404,7 @@
timeout.tv_sec = 1;
timeout.tv_nsec = 0;
do {
- if (sigtimedwait(&sigs, NULL, &timeout) < 0) { // wait for the signal to come
+ if (sigtimedwait(&sigs, nullptr, &timeout) < 0) { // wait for the signal to come
if (errno == EINTR) {
// other signal
continue;
@@ -421,8 +421,8 @@
fprintf(stderr, "Failed to reset OOM protection: %d\n", pid);
#endif
}
- sigprocmask(SIG_SETMASK, &oldsigs, NULL);
- sigaction(SIGUSR1, &oldact, NULL);
+ sigprocmask(SIG_SETMASK, &oldsigs, nullptr);
+ sigaction(SIGUSR1, &oldact, nullptr);
close(oom_pipe);
oom_pipe = -1;
}
@@ -447,9 +447,9 @@
}
static pid_t launch(int argc, const char *_name, const char *args,
- const char *cwd = 0, int envc = 0, const char *envs = 0,
+ const char *cwd = nullptr, int envc = 0, const char *envs = nullptr,
bool reset_env = false,
- const char *tty = 0, bool avoid_loops = false,
+ const char *tty = nullptr, bool avoid_loops = false,
const char *startup_id_str = "0") // krazy:exclude=doublequote_chars
{
QString lib;
@@ -522,7 +522,7 @@
// find out this path before forking, doing it afterwards
// crashes on some platforms, notably OSX
- d.errorMsg = 0;
+ d.errorMsg = nullptr;
d.fork = fork();
switch (d.fork) {
case -1:
@@ -592,7 +592,7 @@
}
args++;
}
- d.argv[argc] = 0;
+ d.argv[argc] = nullptr;
#ifndef SKIP_PROCTITLE
/** Give the process a new name **/
@@ -820,7 +820,7 @@
act.sa_handler = sig_child_handler;
sigemptyset(&(act.sa_mask));
sigaddset(&(act.sa_mask), SIGCHLD);
- sigprocmask(SIG_UNBLOCK, &(act.sa_mask), 0L);
+ sigprocmask(SIG_UNBLOCK, &(act.sa_mask), nullptr);
act.sa_flags = SA_NOCLDSTOP;
// CC: take care of SunOS which automatically restarts interrupted system
@@ -829,14 +829,14 @@
#ifdef SA_RESTART
act.sa_flags |= SA_RESTART;
#endif
- sigaction(SIGCHLD, &act, 0L);
+ sigaction(SIGCHLD, &act, nullptr);
act.sa_handler = SIG_IGN;
sigemptyset(&(act.sa_mask));
sigaddset(&(act.sa_mask), SIGPIPE);
- sigprocmask(SIG_UNBLOCK, &(act.sa_mask), 0L);
+ sigprocmask(SIG_UNBLOCK, &(act.sa_mask), nullptr);
act.sa_flags = 0;
- sigaction(SIGPIPE, &act, 0L);
+ sigaction(SIGPIPE, &act, nullptr);
}
static void init_kdeinit_socket()
@@ -1031,7 +1031,7 @@
(void)who; // for NDEBUG
klauncher_header request_header;
- char *request_data = 0L;
+ char *request_data = nullptr;
int result = read_socket(sock, (char *) &request_header, sizeof(request_header));
if (result != 0) {
return false;
@@ -1065,10 +1065,10 @@
int argc = l;
const char *name = request_data + sizeof(long);
const char *args = name + strlen(name) + 1;
- const char *cwd = 0;
+ const char *cwd = nullptr;
int envc = 0;
- const char *envs = 0;
- const char *tty = 0;
+ const char *envs = nullptr;
+ const char *tty = nullptr;
int avoid_loops = 0;
const char *startup_id_str = "0"; // krazy:exclude=doublequote_chars
@@ -1203,7 +1203,7 @@
fprintf(stderr, "kdeinit5: terminate KDE.\n");
#endif
#if HAVE_X11
- kdeinit_xio_errhandler(0L);
+ kdeinit_xio_errhandler(nullptr);
#endif
} else if (request_header.cmd == LAUNCHER_TERMINATE_KDEINIT) {
#ifndef NDEBUG
@@ -1311,7 +1311,7 @@
}
#endif
- result = select(max_sock, &rd_set, &wr_set, &e_set, 0);
+ result = select(max_sock, &rd_set, &wr_set, &e_set, nullptr);
if (result < 0) {
if (errno == EINTR || errno == EAGAIN) {
continue;
@@ -1346,7 +1346,7 @@
#if HAVE_X11
/* Look for incoming X11 events */
if (X11fd >= 0 && FD_ISSET(X11fd, &rd_set)) {
- if (X11display != 0) {
+ if (X11display != nullptr) {
XEvent event_return;
while (XPending(X11display)) {
XNextEvent(X11display, &event_return);
@@ -1512,8 +1512,8 @@
// Borrowed from kdebase/kaudio/kaudioserver.cpp
static int initXconnection()
{
- X11display = XOpenDisplay(NULL);
- if (X11display != 0) {
+ X11display = XOpenDisplay(nullptr);
+ if (X11display != nullptr) {
XCreateSimpleWindow(X11display, DefaultRootWindow(X11display), 0, 0, 1, 1, \
0,
BlackPixelOfScreen(DefaultScreenOfDisplay(X11display)),
@@ -1551,7 +1551,7 @@
static void secondary_child_handler(int)
{
- waitpid(-1, 0, WNOHANG);
+ waitpid(-1, nullptr, WNOHANG);
}
}
@@ -1674,7 +1674,7 @@
d.accepted_fd = -1;
d.debug_wait = false;
d.launcher_ok = false;
- children = NULL;
+ children = nullptr;
init_signals();
#if HAVE_X11
setupX();
@@ -1722,14 +1722,14 @@
if (XSupportsLocale()) {
// Similar to QApplication::create_xim()
// but we need to use our own display
- XOpenIM(X11display, 0, 0, 0);
+ XOpenIM(X11display, nullptr, nullptr, nullptr);
}
#endif
}
if (launch_kded) {
qputenv("KDED_STARTED_BY_KDEINIT", "1");
- pid = launch(1, KDED_EXENAME, 0);
+ pid = launch(1, KDED_EXENAME, nullptr);
unsetenv("KDED_STARTED_BY_KDEINIT");
#ifndef NDEBUG
fprintf(stderr, "kdeinit5: Launched KDED, pid = %ld result = %d\n", (long) pid, d.result);
@@ -1741,7 +1741,7 @@
for (int i = 1; i < argc; i++) {
if (safe_argv[i][0] == '+') {
- pid = launch(1, safe_argv[i] + 1, 0);
+ pid = launch(1, safe_argv[i] + 1, nullptr);
#ifndef NDEBUG
fprintf(stderr, "kdeinit5: Launched '%s', pid = %ld result = %d\n", safe_argv[i] + 1, (long) pid, d.result);
#endif
@@ -1753,7 +1753,7 @@
) {
// Ignore
} else {
- pid = launch(1, safe_argv[i], 0);
+ pid = launch(1, safe_argv[i], nullptr);
#ifndef NDEBUG
fprintf(stderr, "kdeinit5: Launched '%s', pid = %ld result = %d\n", safe_argv[i], (long) pid, d.result);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/src/kdeinit/proctitle.cpp new/kinit-5.31.0/src/kdeinit/proctitle.cpp
--- old/kinit-5.30.0/src/kdeinit/proctitle.cpp 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/src/kdeinit/proctitle.cpp 2017-02-05 12:01:15.000000000 +0100
@@ -66,7 +66,7 @@
#endif
#if PT_TYPE == PT_REUSEARGV
-static char *argv_start = NULL;
+static char *argv_start = nullptr;
static size_t argv_env_len = 0;
#endif
@@ -97,11 +97,11 @@
#endif
#if PT_TYPE == PT_REUSEARGV
- if (argc == 0 || argv[0] == NULL)
+ if (argc == 0 || argv[0] == nullptr)
return;
extern char **environ;
- char *lastargv = NULL;
+ char *lastargv = nullptr;
char **envp = environ;
int i;
@@ -112,9 +112,9 @@
*/
/* Fail if we can't allocate room for the new environment */
- for (i = 0; envp[i] != NULL; i++)
+ for (i = 0; envp[i] != nullptr; i++)
;
- if ((environ = (char**)calloc(i + 1, sizeof(*environ))) == NULL) {
+ if ((environ = (char**)calloc(i + 1, sizeof(*environ))) == nullptr) {
environ = envp; /* put it back */
return;
}
@@ -124,15 +124,15 @@
* our process memory area.
*/
for (i = 0; i < argc; i++) {
- if (lastargv == NULL || lastargv + 1 == argv[i])
+ if (lastargv == nullptr || lastargv + 1 == argv[i])
lastargv = argv[i] + strlen(argv[i]);
}
- for (i = 0; envp[i] != NULL; i++) {
+ for (i = 0; envp[i] != nullptr; i++) {
if (lastargv + 1 == envp[i])
lastargv = envp[i] + strlen(envp[i]);
}
- argv[1] = NULL;
+ argv[1] = nullptr;
argv_start = argv[0];
argv_env_len = lastargv - argv[0] - 1;
@@ -140,9 +140,9 @@
* Copy environment
* XXX - will truncate env on strdup fail
*/
- for (i = 0; envp[i] != NULL; i++)
+ for (i = 0; envp[i] != nullptr; i++)
environ[i] = strdup(envp[i]);
- environ[i] = NULL;
+ environ[i] = nullptr;
#endif /* PT_REUSEARGV */
}
@@ -156,7 +156,7 @@
#endif
bool skip_proctitle = false;
- if (fmt != NULL && fmt[0] == '-') {
+ if (fmt != nullptr && fmt[0] == '-') {
skip_proctitle = true;
++fmt;
}
@@ -168,14 +168,14 @@
if (!skip_proctitle) {
strncpy(ptitle, __progname, sizeof(ptitle)-1);
len = strlen(ptitle);
- if (fmt != NULL && sizeof(ptitle) - len > 2) {
+ if (fmt != nullptr && sizeof(ptitle) - len > 2) {
strcpy(ptitle + len, ": ");
len += 2;
}
}
#endif
- if (fmt != NULL) {
+ if (fmt != nullptr) {
int r = -1;
if (len < sizeof(ptitle) - 1) {
va_list ap;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/src/klauncher/klauncher.cpp new/kinit-5.31.0/src/klauncher/klauncher.cpp
--- old/kinit-5.30.0/src/klauncher/klauncher.cpp 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/src/klauncher/klauncher.cpp 2017-02-05 12:01:15.000000000 +0100
@@ -102,7 +102,7 @@
#ifndef USE_KPROCESS_FOR_KIOSLAVES
KLauncher::KLauncher(int _kdeinitSocket)
- : QObject(0),
+ : QObject(nullptr),
kdeinitSocket(_kdeinitSocket)
#else
KLauncher::KLauncher()
@@ -112,7 +112,7 @@
#if HAVE_X11
mIsX11 = QGuiApplication::platformName() == QStringLiteral("xcb");
#endif
- Q_ASSERT(g_klauncher_self == NULL);
+ Q_ASSERT(g_klauncher_self == nullptr);
g_klauncher_self = this;
mAutoTimer.setSingleShot(true);
@@ -141,7 +141,7 @@
this, SLOT(slotKDEInitData(int)));
kdeinitNotifier->setEnabled(true);
#endif
- lastRequest = 0;
+ lastRequest = nullptr;
bProcessingQueue = false;
mSlaveDebug = QString::fromLocal8Bit(qgetenv("KDE_SLAVE_DEBUG_WAIT"));
@@ -174,7 +174,7 @@
KLauncher::~KLauncher()
{
close();
- g_klauncher_self = NULL;
+ g_klauncher_self = nullptr;
}
void KLauncher::close()
@@ -235,7 +235,7 @@
timeval tm = { 30, 0 }; // 30 seconds timeout, so we're not stuck in case kdeinit dies on us
FD_ZERO(&in);
FD_SET(sock, &in);
- select(sock + 1, &in, 0, 0, &tm);
+ select(sock + 1, &in, nullptr, nullptr, &tm);
if (!FD_ISSET(sock, &in)) {
qCDebug(KLAUNCHER) << "read_socket" << sock << "nothing to read, kdeinit5 must be dead";
return -1;
@@ -304,7 +304,7 @@
lastRequest->status = KLaunchRequest::Launching;
break;
}
- lastRequest = 0;
+ lastRequest = nullptr;
return;
}
if (lastRequest && (status == LAUNCHER_ERROR)) {
@@ -313,7 +313,7 @@
if (!requestData.isEmpty()) {
lastRequest->errorMsg = QString::fromUtf8((char *) requestData.data());
}
- lastRequest = 0;
+ lastRequest = nullptr;
return;
}
@@ -635,7 +635,7 @@
lastRequest = request;
do {
slotKDEInitData(kdeinitSocket);
- } while (lastRequest != 0);
+ } while (lastRequest != nullptr);
#endif
}
@@ -682,7 +682,7 @@
if (!service) {
requestResult.result = ENOENT;
requestResult.error = i18n("Could not find service '%1'.", serviceName);
- cancel_service_startup_info(NULL, startup_id.toLocal8Bit(), envs); // cancel it if any
+ cancel_service_startup_info(nullptr, startup_id.toLocal8Bit(), envs); // cancel it if any
return false;
}
return start_service(service, urls, envs, startup_id.toLocal8Bit(), blind, false, msg);
@@ -696,7 +696,7 @@
if (!service) {
requestResult.result = ENOENT;
requestResult.error = i18n("Could not find service '%1'.", serviceName);
- cancel_service_startup_info(NULL, startup_id.toLocal8Bit(), envs); // cancel it if any
+ cancel_service_startup_info(nullptr, startup_id.toLocal8Bit(), envs); // cancel it if any
return false;
}
return start_service(service, urls, envs, startup_id.toLocal8Bit(), blind, false, msg);
@@ -717,7 +717,7 @@
} else {
requestResult.error = i18n("Service '%1' is malformatted.", service->entryPath());
}
- cancel_service_startup_info(NULL, startup_id, envs); // cancel it if any
+ cancel_service_startup_info(nullptr, startup_id, envs); // cancel it if any
return false;
}
KLaunchRequest *request = new KLaunchRequest;
@@ -779,7 +779,7 @@
requestResult.result = ENOEXEC;
requestResult.error = i18n("Service '%1' is malformatted.", service->entryPath());
delete request;
- cancel_service_startup_info(NULL, startup_id, _envs);
+ cancel_service_startup_info(nullptr, startup_id, _envs);
return false;
}
@@ -887,7 +887,7 @@
const QStringList &envs)
{
#if HAVE_XCB
- if (request != NULL) {
+ if (request != nullptr) {
request->startup_id = "0"; // krazy:exclude=doublequote_chars
}
if (!startup_id.isEmpty() && startup_id != "0" && mIsX11) {
@@ -1001,7 +1001,7 @@
KLauncher::requestHoldSlave(const QString &urlStr, const QString &app_socket)
{
const QUrl url(urlStr);
- IdleSlave *slave = 0;
+ IdleSlave *slave = nullptr;
foreach (IdleSlave *p, mSlaveList) {
if (p->onHold(url)) {
slave = p;
@@ -1022,7 +1022,7 @@
const QString &app_socket,
QString &error)
{
- IdleSlave *slave = 0;
+ IdleSlave *slave = nullptr;
foreach (IdleSlave *p, mSlaveList) {
if (p->match(protocol, host, true)) {
slave = p;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/src/klauncher/klauncher.h new/kinit-5.31.0/src/klauncher/klauncher.h
--- old/kinit-5.30.0/src/klauncher/klauncher.h 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/src/klauncher/klauncher.h 2017-02-05 12:01:15.000000000 +0100
@@ -260,10 +260,10 @@
private:
#if HAVE_XCB
struct XCBConnection {
- XCBConnection() : conn(Q_NULLPTR), screen(0) { }
+ XCBConnection() : conn(nullptr), screen(0) { }
operator bool() const {
- return conn != Q_NULLPTR;
+ return conn != nullptr;
}
xcb_connection_t *conn;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.30.0/src/wrapper.cpp new/kinit-5.31.0/src/wrapper.cpp
--- old/kinit-5.30.0/src/wrapper.cpp 2017-01-08 21:54:56.000000000 +0100
+++ new/kinit-5.31.0/src/wrapper.cpp 2017-02-05 12:01:15.000000000 +0100
@@ -182,7 +182,7 @@
sigemptyset(&sa.sa_mask);
sigaddset(&sa.sa_mask, signo);
sa.sa_flags = 0; /* don't use SA_RESTART */
- sigaction(signo, &sa, 0);
+ sigaction(signo, &sa, nullptr);
}
static void sig_pass_handler(int signo)
@@ -247,7 +247,7 @@
}
buffer = (char *) malloc(header.arg_length);
- if (buffer == NULL) {
+ if (buffer == nullptr) {
perror("Error: malloc() failed\n");
exit(255);
}
@@ -275,9 +275,9 @@
klauncher_header header;
char *start, *p, *buffer;
char cwd[8192];
- const char *tty = NULL;
+ const char *tty = nullptr;
long avoid_loops = 0;
- const char *startup_id = NULL;
+ const char *startup_id = nullptr;
int sock;
long size = 0;
@@ -386,7 +386,7 @@
if (!wrapper) {
startup_id = getenv("DESKTOP_STARTUP_ID");
- if (startup_id == NULL) {
+ if (startup_id == nullptr) {
startup_id = "";
}
size += strlen(startup_id) + 1;
@@ -403,7 +403,7 @@
write_socket(sock, (char *) &header, sizeof(header));
buffer = (char *) malloc(size);
- if (buffer == NULL) {
+ if (buffer == nullptr) {
perror("Error: malloc() failed.");
exit(255);
}
@@ -470,7 +470,7 @@
if (header.cmd == LAUNCHER_OK) {
long pid;
buffer = (char *) malloc(header.arg_length);
- if (buffer == NULL) {
+ if (buffer == nullptr) {
perror("Error: malloc() failed\n");
exit(255);
}