Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2015-07-08 06:58:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2015-06-23 12:13:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2015-07-08 06:58:45.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Jul 6 18:22:10 UTC 2015 - [email protected] + +- Added build-kcminput-without-libusb-compat.patch: we need libusb + only for logitech mouse support, the rest of the kcm can build + fine w/o it + +------------------------------------------------------------------- +Mon Jul 6 13:24:08 UTC 2015 - [email protected] + +- Drop libusb-0.1 BuildRequires, used for Logitech mouse systemsettings + * it requires forbidden direct device access, see bnc#787063 + * it is one of the last users of the old libusb-0.1 API + +------------------------------------------------------------------- +Sun Jun 28 18:32:27 UTC 2015 - [email protected] + +- Update to 5.3.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.3.2.php +- Drop 0001-Require-xorg-evdev-2.8.99.1.patch, merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Require-xorg-evdev-2.8.99.1.patch plasma-desktop-5.3.1.tar.xz New: ---- build-kcminput-without-libusb-compat.patch plasma-desktop-5.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.VklMJK/_old 2015-07-08 06:58:46.000000000 +0200 +++ /var/tmp/diff_new_pack.VklMJK/_new 2015-07-08 06:58:46.000000000 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-desktop -Version: 5.3.1 +Version: 5.3.2 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0 @@ -26,8 +26,8 @@ Url: http://www.kde.org/ Source: plasma-desktop-%{version}.tar.xz Source99: %{name}-rpmlintrc -# PATCH-FIX-UPSTREAM 0001-Require-xorg-evdev-2.8.99.1.patch -Patch0: 0001-Require-xorg-evdev-2.8.99.1.patch +# PATCH-FIX-OPENSUSE build-kcminput-without-libusb-compat.patch -- we need libusb only for logitech mouse support, the rest of the kcm can build fine w/o it +Patch0: build-kcminput-without-libusb-compat.patch # PATCHES 100-200 and above are from upstream 5.3 branch # PATCHES 201-300 and above are from upstream master/5.4 branch BuildRequires: attica-qt5-devel >= 5.9.0 @@ -57,13 +57,16 @@ BuildRequires: libcanberra-devel BuildRequires: libksysguard5-devel >= %{version} BuildRequires: libpulse-devel -BuildRequires: libusb-devel BuildRequires: libxcb-devel BuildRequires: phonon4qt5-devel BuildRequires: plasma-framework-devel >= 5.9.0 BuildRequires: plasma5-workspace-devel >= %{version} BuildRequires: pkgconfig(xkbfile) -#BuildRequires: pkgconfig(libusb) +# Needed for Logitech specific mouse systemsettings. Only supports +# ancient (pre 2004) mice, requires direct device access +%if 0%{?suse_version} <= 1320 +BuildRequires: pkgconfig(libusb) +%endif BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(Qt5Concurrent) >= 5.4.0 @@ -160,9 +163,11 @@ %config %{_kf5_configdir}/icons.knsrc %config %{_kf5_configdir}/kfontinst.knsrc %config %{_kf5_configdir}/plasma-themes.knsrc +%if 0%{?suse_version} >= 1320 %config %{_kf5_configdir}/xcursor.knsrc -%{_kf5_bindir}/kaccess %{_kf5_bindir}/kapplymousetheme +%endif +%{_kf5_bindir}/kaccess %{_kf5_bindir}/kfontinst %{_kf5_bindir}/kfontview %{_kf5_bindir}/knetattach @@ -208,7 +213,9 @@ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_sharedir}/ksmserver/ +%if 0%{?suse_version} >= 1320 %{_kf5_sharedir}/kcminput/ +%endif %{_kf5_sharedir}/solid/ %{_kf5_plasmadir}/ %exclude %{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents/layout.js ++++++ build-kcminput-without-libusb-compat.patch ++++++ diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt index a8df2ff..8ce967a 100644 --- a/kcms/CMakeLists.txt +++ b/kcms/CMakeLists.txt @@ -14,7 +14,7 @@ if(X11_Xkb_FOUND AND XCB_XKB_FOUND) add_subdirectory( keyboard ) endif() -if (LIBUSB_FOUND AND EVDEV_FOUND) +if (EVDEV_FOUND) add_subdirectory( input ) endif() diff --git a/kcms/input/CMakeLists.txt b/kcms/input/CMakeLists.txt index 7bed9b7..b50d70e 100644 --- a/kcms/input/CMakeLists.txt +++ b/kcms/input/CMakeLists.txt @@ -9,7 +9,9 @@ add_subdirectory( pics ) configure_file (config-kcontrol-input.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kcontrol-input.h ) +if (LIBUSB_FOUND) include_directories( ${LIBUSB_INCLUDE_DIR} ) +endif () if(X11_Xcursor_FOUND) set( libnoinst_SRCS @@ -50,8 +52,11 @@ install(TARGETS kapplymousetheme ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### -set(kcm_input_PART_SRCS mouse.cpp main.cpp logitechmouse.cpp) +set(kcm_input_PART_SRCS mouse.cpp main.cpp) +if (LIBUSB_FOUND) + set(kcm_input_PART_SRCS ${kcm_input_PART_SRCS} logitechmouse.cpp) +endif () ki18n_wrap_ui(kcm_input_PART_SRCS kmousedlg.ui logitechmouse_base.ui ) qt5_add_dbus_interface(kcm_input_PART_SRCS ${klauncher_xml} klauncher_iface) @@ -72,7 +77,6 @@ target_link_libraries(kcm_input KF5::KDELibs4Support ${X11_X11_LIB} ${X11_Xinput_LIB} - ${LIBUSB_LIBRARIES} ) if (X11_Xcursor_FOUND) target_link_libraries(kcm_input ${X11_Xcursor_LIB}) @@ -81,6 +85,10 @@ if (X11_Xfixes_FOUND) target_link_libraries(kcm_input ${X11_Xfixes_LIB}) endif () +if (LIBUSB_FOUND) + target_link_libraries(kcm_input ${LIBUSB_LIBRARIES}) +endif () + install(TARGETS kcm_input DESTINATION ${PLUGIN_INSTALL_DIR} ) ++++++ plasma-desktop-5.3.1.tar.xz -> plasma-desktop-5.3.2.tar.xz ++++++ ++++ 21234 lines of diff (skipped)
