Hello community, here is the log from the commit of package khotkeys5 for openSUSE:Factory checked in at 2017-08-24 18:08:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khotkeys5 (Old) and /work/SRC/openSUSE:Factory/.khotkeys5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "khotkeys5" Thu Aug 24 18:08:03 2017 rev:50 rq:518262 version:5.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/khotkeys5/khotkeys5.changes 2017-07-25 11:36:51.834271493 +0200 +++ /work/SRC/openSUSE:Factory/.khotkeys5.new/khotkeys5.changes 2017-08-24 18:08:05.447834448 +0200 @@ -1,0 +2,32 @@ +Tue Aug 22 19:11:30 CEST 2017 - [email protected] + +- Update to 5.10.5 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.10.5.php +- Changes since 5.10.4: + * Make sure the dbus xml interface file exists before it's used +- Remove patches, now upstream: + * 0002-Make-sure-the-dbus-xml-interface-file-exists-before-.patch + +------------------------------------------------------------------- +Sat Aug 19 22:23:45 UTC 2017 - [email protected] + +- Add 0002-Make-sure-the-dbus-xml-interface-file-exists-before-.patch. +Fixes build with CMake >= 3.9 + +------------------------------------------------------------------- +Thu Aug 17 16:43:55 UTC 2017 - [email protected] + +- Add Requires: libqt5-qdbus +- Fix typos in descriptions +- Mention package name in 0001-Use-qdbus-qt5-and-qdbusviewer-qt5.patch + +------------------------------------------------------------------- +Thu Aug 17 13:12:35 UTC 2017 - [email protected] + +- Add 0001-Use-qdbus-qt5-and-qdbusviewer-qt5.patch to use qdbus-qt5 + and qdbusviewer-qt5 instead of the Qt4 versions that might not be + installed + +------------------------------------------------------------------- Old: ---- khotkeys-5.10.4.tar.xz New: ---- 0001-Use-qdbus-qt5-and-qdbusviewer-qt5.patch khotkeys-5.10.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khotkeys5.spec ++++++ --- /var/tmp/diff_new_pack.0HE6Ly/_old 2017-08-24 18:08:08.663381709 +0200 +++ /var/tmp/diff_new_pack.0HE6Ly/_new 2017-08-24 18:08:08.667381146 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: khotkeys5 -Version: 5.10.4 +Version: 5.10.5 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -29,6 +29,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/plasma/%{version}/khotkeys-%{version}.tar.xz +# PATCH-FIX-OPENSUSE +Patch0: 0001-Use-qdbus-qt5-and-qdbusviewer-qt5.patch BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: kf5-filesystem BuildRequires: xz @@ -43,13 +45,14 @@ BuildRequires: cmake(LibKWorkspace) >= %{_plasma5_version} BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(x11) +Requires: libqt5-qdbus %if %{with lang} Recommends: %{name}-lang %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -KDE's hotkey daemon.module It allows you to configure custom +KDE's hotkey daemon module. It allows you to configure custom keyboard shortcuts and mouse gestures. %package devel @@ -59,13 +62,13 @@ Conflicts: kdebase4-workspace-devel %description devel -KDE's hotkey daemon.module It allows you to configure custom -keyboard shortcuts and mouse gestures. Development files. +Files to develop with KDE's hotkey daemon module. %lang_package %prep %setup -q -n khotkeys-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Use-qdbus-qt5-and-qdbusviewer-qt5.patch ++++++ >From 44722a4ec5f54803f092d81b4c08e055052aa138 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Thu, 17 Aug 2017 16:13:31 +0200 Subject: [PATCH] Use qdbus-qt5 and qdbusviewer-qt5 The Qt4 version might not be installed any more, and it's needed for D-BUS actions like spectacle's "Print Screen" shortcuts. --- kcm_hotkeys/actions/dbus_action_widget.cpp | 2 +- libkhotkeysprivate/actions/dbus_action.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: khotkeys-5.10.4/kcm_hotkeys/actions/dbus_action_widget.cpp =================================================================== --- khotkeys-5.10.4.orig/kcm_hotkeys/actions/dbus_action_widget.cpp +++ khotkeys-5.10.4/kcm_hotkeys/actions/dbus_action_widget.cpp @@ -117,9 +117,9 @@ bool DbusActionWidget::isChanged() const void DbusActionWidget::launchDbusBrowser() const { - if( KRun::runCommand( "qdbusviewer", window()) == 0 ) + if( KRun::runCommand( "qdbusviewer-qt5", window()) == 0 ) { - KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" )); + KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer-qt5, maybe you need to install libqt5-qttools?" )); } } Index: khotkeys-5.10.4/libkhotkeysprivate/actions/dbus_action.cpp =================================================================== --- khotkeys-5.10.4.orig/libkhotkeysprivate/actions/dbus_action.cpp +++ khotkeys-5.10.4/libkhotkeysprivate/actions/dbus_action.cpp @@ -133,7 +133,7 @@ void DBusAction::execute() } qDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list; KProcess proc; - proc << "qdbus" << _application << _object << _function << args_list; + proc << "qdbus-qt5" << _application << _object << _function << args_list; proc.startDetached(); } ++++++ khotkeys-5.10.4.tar.xz -> khotkeys-5.10.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khotkeys-5.10.4/CMakeLists.txt new/khotkeys-5.10.5/CMakeLists.txt --- old/khotkeys-5.10.4/CMakeLists.txt 2017-07-18 13:10:36.000000000 +0200 +++ new/khotkeys-5.10.5/CMakeLists.txt 2017-08-22 16:07:56.000000000 +0200 @@ -1,5 +1,5 @@ project(khotkeys) -set(PROJECT_VERSION "5.10.4") +set(PROJECT_VERSION "5.10.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khotkeys-5.10.4/app/CMakeLists.txt new/khotkeys-5.10.5/app/CMakeLists.txt --- old/khotkeys-5.10.4/app/CMakeLists.txt 2017-07-18 13:09:48.000000000 +0200 +++ new/khotkeys-5.10.5/app/CMakeLists.txt 2017-08-22 16:07:16.000000000 +0200 @@ -1,10 +1,14 @@ ########### next target ############### +set(dbus_interface_name org.kde.khotkeys.xml) set(kded_khotkeys_PART_SRCS kded.cpp - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.khotkeys.xml) + ${CMAKE_CURRENT_BINARY_DIR}/${dbus_interface_name}) -qt5_generate_dbus_interface(kded.h org.kde.khotkeys.xml ) +qt5_generate_dbus_interface(kded.h ${dbus_interface_name}) +set(dbus_interface_xml ${CMAKE_CURRENT_BINARY_DIR}/${dbus_interface_name}) + +add_custom_target(khotkeysdbusinterface ALL DEPENDS ${dbus_interface_name}) add_library(kded_khotkeys MODULE ${kded_khotkeys_PART_SRCS}) set_target_properties(kded_khotkeys PROPERTIES OUTPUT_NAME khotkeys) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khotkeys-5.10.4/kcm_hotkeys/CMakeLists.txt new/khotkeys-5.10.5/kcm_hotkeys/CMakeLists.txt --- old/khotkeys-5.10.4/kcm_hotkeys/CMakeLists.txt 2017-07-18 13:09:48.000000000 +0200 +++ new/khotkeys-5.10.5/kcm_hotkeys/CMakeLists.txt 2017-08-22 16:07:16.000000000 +0200 @@ -82,6 +82,7 @@ MODULE ${kcm_hotkeys_PART_SRCS} ) +add_dependencies(kcm_hotkeys khotkeysdbusinterface) target_compile_definitions(kcm_hotkeys PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khotkeys-5.10.4/po/zh_CN/khotkeys.po new/khotkeys-5.10.5/po/zh_CN/khotkeys.po --- old/khotkeys-5.10.4/po/zh_CN/khotkeys.po 2017-07-18 13:10:19.000000000 +0200 +++ new/khotkeys-5.10.5/po/zh_CN/khotkeys.po 2017-08-22 16:07:44.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:20+0100\n" -"PO-Revision-Date: 2017-07-11 06:33-0400\n" +"PO-Revision-Date: 2017-08-14 08:05-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
