Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2018-08-24 16:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdbusaddons (Old) and /work/SRC/openSUSE:Factory/.kdbusaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdbusaddons" Fri Aug 24 16:52:08 2018 rev:56 rq:630596 version:5.49.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdbusaddons/kdbusaddons.changes 2018-07-21 10:11:50.795148024 +0200 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new/kdbusaddons.changes 2018-08-24 16:52:12.713227536 +0200 @@ -1,0 +2,11 @@ +Sun Aug 19 09:18:56 UTC 2018 - [email protected] + +- Update to 5.49.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.49.0.php +- Changes since 5.48.0: + * Don't block forever in ensureKdeinitRunning + * Honor BUILD_TESTING + +------------------------------------------------------------------- Old: ---- kdbusaddons-5.48.0.tar.xz New: ---- kdbusaddons-5.49.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.f4EbKF/_old 2018-08-24 16:52:13.661228653 +0200 +++ /var/tmp/diff_new_pack.f4EbKF/_new 2018-08-24 16:52:13.665228658 +0200 @@ -16,46 +16,45 @@ # -%bcond_without lang %define lname libKF5DBusAddons5 -%define _tar_path 5.48 +%define _tar_path 5.49 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%bcond_without lang Name: kdbusaddons -Version: 5.48.0 +Version: 5.49.0 Release: 0 +Summary: Convenience classes for QtDBus +License: LGPL-2.1-or-later +Group: System/GUI/KDE +URL: http://www.kde.org +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source1: baselibs.conf BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem -%if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 -%endif BuildRequires: cmake(Qt5DBus) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 BuildRequires: cmake(Qt5X11Extras) >= 5.6.0 -Summary: Convenience classes for QtDBus -License: LGPL-2.1-or-later -Group: System/GUI/KDE -Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -Source1: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with lang} +BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 +%endif %description KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. -%package -n %lname +%package -n %{lname} Summary: Convenience classes for QtDBus Group: System/GUI/KDE -Recommends: %lname-lang = %{version} -Recommends: %{name}-tools = %{version} %requires_ge libQt5DBus5 +Recommends: %{lname}-lang = %{version} +Recommends: %{name}-tools = %{version} -%description -n %lname +%description -n %{lname} KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. @@ -70,7 +69,7 @@ %package devel Summary: Convenience classes for QtDBus: Build Environment Group: Development/Libraries/KDE -Requires: %lname = %{version} +Requires: %{lname} = %{version} Requires: extra-cmake-modules Requires: cmake(Qt5DBus) >= 5.6.0 @@ -78,7 +77,8 @@ KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. Development files. -%lang_package -n %lname +%lang_package -n %{lname} + %prep %setup -q @@ -94,26 +94,23 @@ %find_lang %{name}5 --with-qt --without-mo %endif -%post -n %lname -p /sbin/ldconfig - -%postun -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %if %{with lang} -%files -n %lname-lang -f %{name}5.lang +%files -n %{lname}-lang -f %{name}5.lang %endif -%files -n %lname -%defattr(-,root,root) -%doc COPYING* README* +%files -n %{lname} +%license COPYING* +%doc README* %{_kf5_libdir}/libKF5DBusAddons.so.* %{_kf5_debugdir}/*.categories %files tools -%defattr(-,root,root) %{_kf5_bindir}/kquitapp5 %files devel -%defattr(-,root,root) %{_kf5_libdir}/libKF5DBusAddons.so %{_kf5_libdir}/cmake/KF5DBusAddons/ %{_kf5_includedir}/ ++++++ kdbusaddons-5.48.0.tar.xz -> kdbusaddons-5.49.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.48.0/CMakeLists.txt new/kdbusaddons-5.49.0/CMakeLists.txt --- old/kdbusaddons-5.48.0/CMakeLists.txt 2018-07-08 00:29:50.000000000 +0200 +++ new/kdbusaddons-5.49.0/CMakeLists.txt 2018-08-04 12:56:52.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.48.0") # handled by release scripts +set(KF5_VERSION "5.49.0") # handled by release scripts project(KDBusAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.48.0 NO_MODULE) +find_package(ECM 5.49.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) @@ -50,8 +50,10 @@ endif() add_subdirectory(src) -add_subdirectory(autotests) -add_subdirectory(tests) +if (BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(tests) +endif() # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DBusAddons") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.48.0/po/uk/kdbusaddons5_qt.po new/kdbusaddons-5.49.0/po/uk/kdbusaddons5_qt.po --- old/kdbusaddons-5.48.0/po/uk/kdbusaddons5_qt.po 2018-07-08 00:29:50.000000000 +0200 +++ new/kdbusaddons-5.49.0/po/uk/kdbusaddons5_qt.po 2018-08-04 12:56:52.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of kdbusaddons5_qt.po to Ukrainian -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.48.0/po/zh_CN/kdbusaddons5_qt.po new/kdbusaddons-5.49.0/po/zh_CN/kdbusaddons5_qt.po --- old/kdbusaddons-5.48.0/po/zh_CN/kdbusaddons5_qt.po 2018-07-08 00:29:50.000000000 +0200 +++ new/kdbusaddons-5.49.0/po/zh_CN/kdbusaddons5_qt.po 2018-08-04 12:56:52.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-07-03 17:35\n" +"PO-Revision-Date: 2018-07-24 08:41\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.48.0/src/kdeinitinterface.cpp new/kdbusaddons-5.49.0/src/kdeinitinterface.cpp --- old/kdbusaddons-5.48.0/src/kdeinitinterface.cpp 2018-07-08 00:29:50.000000000 +0200 +++ new/kdbusaddons-5.49.0/src/kdeinitinterface.cpp 2018-08-04 12:56:52.000000000 +0200 @@ -41,10 +41,17 @@ qCDebug(KDBUSADDONS_LOG) << "klauncher not running... launching kdeinit"; QLockFile lock(QDir::tempPath() + QLatin1Char('/') + QLatin1String("startkdeinitlock")); + // If we can't get the lock, then someone else is already in the process of starting kdeinit. if (!lock.tryLock()) { - lock.lock(); + // Wait for that to happen, by locking again 30 seconds max. + if (!lock.tryLock(30000)) + { + qCWarning(KDBUSADDONS_LOG) << "'kdeinit5' is taking more than 30 seconds to start."; + return; + } + // Check that the DBus name is up, i.e. the other process did manage to do it successfully. if (dbusDaemon->isServiceRegistered(QStringLiteral("org.kde.klauncher5"))) { - return; // whoever held the lock has already started it + return; } } // Try to launch kdeinit. @@ -65,6 +72,7 @@ #ifndef Q_OS_WIN args += QStringLiteral("--suicide"); #endif + // NOTE: kdeinit5 is supposed to finish quickly, certainly in less than 30 seconds. QProcess::execute(srv, args); }
