Hello community, here is the log from the commit of package lxqt-session for openSUSE:Factory checked in at 2017-03-13 15:32:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-session (Old) and /work/SRC/openSUSE:Factory/.lxqt-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-session" Mon Mar 13 15:32:17 2017 rev:7 rq:460152 version:0.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-session/lxqt-session.changes 2016-10-06 12:44:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-session.new/lxqt-session.changes 2017-03-13 15:33:29.306234450 +0100 @@ -1,0 +2,15 @@ +Fri Feb 24 01:38:49 UTC 2017 - [email protected] + +- Update to 0.11.1: + * Adds an nullptr check when restarting a module (#90) + * Fixes a session logout crash (#88) + * Updated da.desktop files and removed da_DK.desktop files + * Moves FindUDev to the lxqt-build-tools repo + * Reworks X11 CMake libraries + * Removes all XCB stuff from CMake + * Update french desktop entries + * lxqt-config-session: Use localized comment + * Make CMakeLists.txt more uniform. + * Remove cpack (#83) + +------------------------------------------------------------------- Old: ---- lxqt-session-0.11.0.tar.xz lxqt-session-0.11.0.tar.xz.asc New: ---- lxqt-session-0.11.1.tar.xz lxqt-session-0.11.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-session.spec ++++++ --- /var/tmp/diff_new_pack.4e2U3l/_old 2017-03-13 15:33:29.970140624 +0100 +++ /var/tmp/diff_new_pack.4e2U3l/_new 2017-03-13 15:33:29.974140059 +0100 @@ -17,7 +17,7 @@ Name: lxqt-session -Version: 0.11.0 +Version: 0.11.1 Release: 0 Summary: LXQt Session Manager License: LGPL-2.1+ @@ -29,6 +29,7 @@ BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: lxqt-build-tools-devel BuildRequires: cmake(KF5WindowSystem) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5Xdg) ++++++ lxqt-session-0.11.0.tar.xz -> lxqt-session-0.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/.gitignore new/lxqt-session-0.11.1/.gitignore --- old/lxqt-session-0.11.0/.gitignore 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -build -*.kdev4 -*/translations/lxqt-session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/CHANGELOG new/lxqt-session-0.11.1/CHANGELOG --- old/lxqt-session-0.11.0/CHANGELOG 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/CHANGELOG 2017-01-01 23:22:21.000000000 +0100 @@ -1,7 +1,22 @@ -lxqt-session-0.11.0 / 2016-09-24 +lxqt-session-0.11.1 / 2017-01-01 ================================ + * Adds an nullptr check when restarting a module (#90) + * Fixes a session logout crash (#88) + * Updated da.desktop files and removed da_DK.desktop files + * Moves FindUDev to the lxqt-build-tools repo + * Reworks X11 CMake libraries + * Removes all XCB stuff from CMake + * Update french desktop entries + * lxqt-config-session: Use localized comment + * Make CMakeLists.txt more uniform. + * Remove cpack (#83) + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * lockscreenmanager: always listen to the session provider's lock signal (#79) * Update Polish translation * Add README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/CMakeLists.txt new/lxqt-session-0.11.1/CMakeLists.txt --- old/lxqt-session-0.11.0/CMakeLists.txt 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/CMakeLists.txt 2017-01-01 23:22:21.000000000 +0100 @@ -2,44 +2,38 @@ project(lxqt-session) -option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) -option(WITH_LIBUDEV "Build with libudev support" ON) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) +include(GNUInstallDirs) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) -include(GNUInstallDirs) +option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) +option(WITH_LIBUDEV "Build with libudev support" ON) -find_package(KF5WindowSystem REQUIRED) -find_package(Qt5Widgets REQUIRED QUIET) -find_package(Qt5DBus REQUIRED QUIET) -find_package(Qt5X11Extras REQUIRED QUIET) +find_package(X11 REQUIRED) + +find_package(Qt5DBus REQUIRED) find_package(Qt5LinguistTools REQUIRED QUIET) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5X11Extras REQUIRED) +message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") + +find_package(KF5WindowSystem REQUIRED) -find_package(lxqt REQUIRED QUIET) -find_package(XdgUserDirs REQUIRED QUIET) +find_package(lxqt REQUIRED) + +# Please don't move, must be after lxqt +find_package(XdgUserDirs REQUIRED) include(LXQtCompilerSettings NO_POLICY_SCOPE) -include(LXQtTranslate) -find_package(PkgConfig REQUIRED QUIET) -pkg_check_modules(XCB REQUIRED xcb) -find_package(X11 REQUIRED) +# Translations ********************************** +include(LXQtTranslate) add_subdirectory(lxqt-session) add_subdirectory(lxqt-config-session) add_subdirectory(lxqt-leave) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/cmake/FindUDev.cmake new/lxqt-session-0.11.1/cmake/FindUDev.cmake --- old/lxqt-session-0.11.0/cmake/FindUDev.cmake 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/cmake/FindUDev.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -# - Try to find the UDev library -# Once done this will define -# -# UDEV_FOUND - system has UDev -# UDEV_INCLUDE_DIR - the libudev include directory -# UDEV_LIBS - The libudev libraries - -# Copyright (c) 2010, Rafael Fernández López, <[email protected]> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -find_path(UDEV_INCLUDE_DIR libudev.h) -find_library(UDEV_LIBS udev) - -if(UDEV_INCLUDE_DIR AND UDEV_LIBS) - include(CheckFunctionExists) - include(CMakePushCheckState) - cmake_push_check_state() - set(CMAKE_REQUIRED_LIBRARIES ${UDEV_LIBS} ) - - cmake_pop_check_state() - -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(UDev DEFAULT_MSG UDEV_INCLUDE_DIR UDEV_LIBS) - -mark_as_advanced(UDEV_INCLUDE_DIR UDEV_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-config-session/modulemodel.cpp new/lxqt-session-0.11.1/lxqt-config-session/modulemodel.cpp --- old/lxqt-session-0.11.0/lxqt-config-session/modulemodel.cpp 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/lxqt-config-session/modulemodel.cpp 2017-01-01 23:22:21.000000000 +0100 @@ -77,7 +77,7 @@ case Qt::CheckStateRole: return mItemMap.value(name).isEnabled() ? Qt::Checked : Qt::Unchecked; case Qt::ToolTipRole: - return mItemMap.value(name).file().value("Comment"); + return mItemMap.value(name).file().comment(); } } else if (index.column() == 1 && (role == Qt::DisplayRole || role == Qt::DecorationRole)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_da.desktop new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_da.desktop --- old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_da.desktop 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -1,4 +1,3 @@ # Translations -Comment[da]=Indstil LXQt Sessionsmodul -GenericName[da]=Indstilling af LXQt-sessioner -Name[da]=Indstilling af LXQt-sessioner +Name[da]=Sessionsindstillinger +Comment[da]=Konfiguration af LXQt-sessioner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_da_DK.desktop new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_da_DK.desktop --- old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_da_DK.desktop 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_da_DK.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Translations -Comment[da_DK]=Indstilling af LXQt sessionsmodul -GenericName[da_DK]=Indstilling af LXQt Session -Name[da_DK]=Indstilling af LXQt Session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_fr.desktop new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_fr.desktop --- old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Comment[fr]=Configurer le module 'session' de LXQt +GenericName[fr]=Paramétreur de session LXQt +Name[fr]=Paramétreur de session LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_fr_FR.desktop new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_fr_FR.desktop --- old/lxqt-session-0.11.0/lxqt-config-session/translations/lxqt-config-session_fr_FR.desktop 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/lxqt-config-session/translations/lxqt-config-session_fr_FR.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Translations -Comment[fr_FR]=Configurer le module 'session' de LXQt -GenericName[fr_FR]=Paramétreur de session LXQt -Name[fr_FR]=Paramétreur de session LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-hibernate_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-hibernate_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-hibernate_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-hibernate_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Dvale +Comment[da]=Sæt maskinen i dvale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-hibernate_fr.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-hibernate_fr.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-hibernate_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-hibernate_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[fr]=Hivernation +GenericName[fr]=Hivernation +Comment[fr]=Hivernation de l'ordinateur diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-leave_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-leave_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-leave_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-leave_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Afslut +Comment[da]=Afslut-dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-leave_fr.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-leave_fr.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-leave_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-leave_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[fr]=Quitter +GenericName[fr]=Quitter +Comment[fr]=Dialogue pour quitter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-lockscreen_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-lockscreen_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-lockscreen_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-lockscreen_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Lås skærmen +Comment[da]=Lås den aktuelle session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-logout_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-logout_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-logout_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-logout_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Log ud +Comment[da]=Log ud fra den aktuelle session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-logout_fr.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-logout_fr.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-logout_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-logout_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[fr]=Déconnecter +GenericName[fr]=Déconnecter +Comment[fr]=Déconnecter de cette session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-reboot_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-reboot_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-reboot_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-reboot_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Genstart +Comment[da]=Genstart maskinen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-reboot_fr.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-reboot_fr.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-reboot_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-reboot_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[fr]=Redémarrer +GenericName[fr]=Redémarrer +Comment[fr]=Redémarrer l'ordinateur diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-shutdown_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-shutdown_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-shutdown_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-shutdown_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Luk ned +Comment[da]=Luk maskinen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-shutdown_fr.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-shutdown_fr.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-shutdown_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-shutdown_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[fr]=Arrêter +GenericName[fr]=Arrêter +Comment[fr]=Arrêter l'ordinateur diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-suspend_da.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-suspend_da.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-suspend_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-suspend_da.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,3 @@ +# Translations +Name[da]=Hvile +Comment[da]=Sæt maskinen i hvile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-suspend_fr.desktop new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-suspend_fr.desktop --- old/lxqt-session-0.11.0/lxqt-leave/translations/lxqt-suspend_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.11.1/lxqt-leave/translations/lxqt-suspend_fr.desktop 2017-01-01 23:22:21.000000000 +0100 @@ -0,0 +1,4 @@ +#TRANSLATIONS +Name[fr]=Suspendre +GenericName[fr]=Suspendre +Comment[fr]=Suspendre l'ordinateur diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-session/CMakeLists.txt new/lxqt-session-0.11.1/lxqt-session/CMakeLists.txt --- old/lxqt-session-0.11.0/lxqt-session/CMakeLists.txt 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/lxqt-session/CMakeLists.txt 2017-01-01 23:22:21.000000000 +0100 @@ -12,7 +12,6 @@ endif() include_directories( - ${XCB_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ) @@ -73,9 +72,8 @@ Qt5::Widgets Qt5::DBus Qt5::X11Extras - ${XCB_LDFLAGS} - X11 lxqt + ${X11_LIBRARIES} KF5::WindowSystem ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.11.0/lxqt-session/src/lxqtmodman.cpp new/lxqt-session-0.11.1/lxqt-session/src/lxqtmodman.cpp --- old/lxqt-session-0.11.0/lxqt-session/src/lxqtmodman.cpp 2016-09-24 00:46:51.000000000 +0200 +++ new/lxqt-session-0.11.1/lxqt-session/src/lxqtmodman.cpp 2017-01-01 23:22:21.000000000 +0100 @@ -280,7 +280,10 @@ void LXQtModuleManager::restartModules(int exitCode, QProcess::ExitStatus exitStatus) { LXQtModule* proc = qobject_cast<LXQtModule*>(sender()); - Q_ASSERT(proc); + if (nullptr == proc) { + qCWarning(SESSION) << "Got an invalid (null) module to restart. Ignoring it"; + return; + } if (!proc->isTerminating()) { @@ -319,7 +322,25 @@ LXQtModuleManager::~LXQtModuleManager() { qApp->removeNativeEventFilter(this); - qDeleteAll(mNameMap); + + // We disconnect the finished signal before deleting the process. We do + // this to prevent a crash that results from a state change signal being + // emmited while deleting a crashing module. + // If the module is still connect restartModules will be called with a + // invalid sender. + + ModulesMapIterator i(mNameMap); + while (i.hasNext()) + { + i.next(); + + auto p = i.value(); + disconnect(p, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0); + + delete p; + mNameMap[i.key()] = nullptr; + } + delete mWmProcess; }
