From 30b1876b2af8bf8cc0dc9331dc94caf1f25b3960a20c4d7ce7db2e86fa4c7d5a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 5 Dec 2015 01:05:07 +0000 Subject: [PATCH] Accepting request 347490 from home:alarrosa:branches:KDE:Frameworks5 Fixes wayland requirement for SLE12 from 1.3 to 1.2.1 (since it's patched with the required features) OBS-URL: https://build.opensuse.org/request/show/347490 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=6 --- fix-wayland-version-requirement.diff | 13 +++++++++++++ kscreenlocker.spec | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 fix-wayland-version-requirement.diff diff --git a/fix-wayland-version-requirement.diff b/fix-wayland-version-requirement.diff new file mode 100644 index 0000000..9c9972b --- /dev/null +++ b/fix-wayland-version-requirement.diff @@ -0,0 +1,13 @@ +Index: kscreenlocker-5.5.0/CMakeLists.txt +=================================================================== +--- kscreenlocker-5.5.0.orig/CMakeLists.txt ++++ kscreenlocker-5.5.0/CMakeLists.txt +@@ -38,7 +38,7 @@ set_package_properties(KF5Wayland PROPER + TYPE REQUIRED + PURPOSE "Required for building screenlocker") + find_package(WaylandScanner) +-find_package(Wayland 1.3 COMPONENTS Client Server) ++find_package(Wayland 1.2.1 COMPONENTS Client Server) + + set_package_properties(Wayland PROPERTIES + TYPE REQUIRED diff --git a/kscreenlocker.spec b/kscreenlocker.spec index d2725e7..57b6098 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -25,6 +25,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: https://projects.kde.org/kscreenlocker Source: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1 +Patch0: fix-wayland-version-requirement.diff BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem @@ -82,6 +84,10 @@ Development files for Library and components for secure lock screen architecture %lang_package %prep %setup -q -n %{name}-%{version} +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +# SLE12 has a patched 1.2.1 wayland with all features KDE needs from up to 1.7.0 +%patch0 -p1 +%endif %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5