diff --git a/0001-Do-not-find-unused-Wayland-components.patch b/0001-Do-not-find-unused-Wayland-components.patch deleted file mode 100644 index 866de8f..0000000 --- a/0001-Do-not-find-unused-Wayland-components.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3f6a0f0dc8c9f89ab01d4f9e080fedf305ed75fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= -Date: Mon, 13 Oct 2014 13:53:15 +0200 -Subject: [PATCH 1/1] Do not find unused Wayland components - -(cherry picked from commit 2180655167287d94f65af9ecea766aef94489158) ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c15e21084c73c1a926d6f9c6b3fa63c815ef478..8ecc956ed514e5a724eae0e82d5ba6097b834ad8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,7 +28,7 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWAYLAND - set(REQUIRED_QT_VERSION 5.3.0) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) - --find_package(Wayland 1.3 COMPONENTS Client Egl Cursor Server) -+find_package(Wayland 1.3 COMPONENTS Client Server) - set_package_properties(Wayland PROPERTIES - TYPE REQUIRED - ) --- -2.1.2 - diff --git a/baselibs.conf b/baselibs.conf index 1413cd7..0499d7b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,5 @@ libKF5WaylandClient5 +libKF5WaylandServer5 kwayland-devel - requires "libKF5WaylandClient5- = " \ No newline at end of file + requires "libKF5WaylandClient5- = " + requires "libKF5WaylandServer5- = " \ No newline at end of file diff --git a/kwayland-5.1.2.tar.xz b/kwayland-5.1.2.tar.xz deleted file mode 100644 index 5660177..0000000 --- a/kwayland-5.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0562bb309b5c08a5d0584b0cb838da6845a739a71d39e351b509e305577ba76c -size 59656 diff --git a/kwayland-5.2.0.tar.xz b/kwayland-5.2.0.tar.xz new file mode 100644 index 0000000..6cfd554 --- /dev/null +++ b/kwayland-5.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e3fb615728db55f567eda2b7be455f3d74744887af466085f2f7130b51207f1 +size 85100 diff --git a/kwayland.changes b/kwayland.changes index 1756f41..987fd85 100644 --- a/kwayland.changes +++ b/kwayland.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Jan 26 19:49:22 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.2 Final: + * For more details please see: + https://www.kde.org/announcements/plasma-5.2.0.php + +------------------------------------------------------------------- +Tue Jan 13 16:35:03 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.2 Beta aka 5.1.95: + * Undo changes to Plasma desktop layout + * Smarter sorting of results in KRunner + * Breeze window decoration theme adds a new look to your + desktop and is now used by default + * New white mouse cursor theme for Breeze. + * New plasma widgets: 15 puzzle, web browser, show desktop + * Over 300 bugs fixed throughout Plasma modules. + * For more details please see: + https://www.kde.org/announcements/plasma-5.1.95.php +- Drop 0001-Do-not-find-unused-Wayland-components.patch, upstreamed +- Build the server shlib + ------------------------------------------------------------------- Thu Dec 11 17:59:57 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kwayland.spec b/kwayland.spec index 385e5cb..16df1de 100644 --- a/kwayland.spec +++ b/kwayland.spec @@ -1,7 +1,7 @@ # # spec file for package kwayland # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define kwayland_server 0 +%define kwayland_server 1 Name: kwayland -Version: 5.1.2 +Version: 5.2.0 Release: 0 Summary: KDE Wayland library License: LGPL-2.1+ @@ -26,10 +26,8 @@ Group: Development/Libraries/KDE Url: http://www.kde.org Source: %{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-Do-not-find-unused-Wayland-components.patch -Patch0: 0001-Do-not-find-unused-Wayland-components.patch BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.2.0 +BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: wayland-devel >= 1.3.0 @@ -69,7 +67,6 @@ KWayland provides a Qt-style Client and Server library wrapper for the Wayland l %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build