diff --git a/0001-Do-not-find-unused-Wayland-components.patch b/0001-Do-not-find-unused-Wayland-components.patch new file mode 100644 index 0000000..866de8f --- /dev/null +++ b/0001-Do-not-find-unused-Wayland-components.patch @@ -0,0 +1,26 @@ +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/kwayland-5.1.0.1.tar.xz b/kwayland-5.1.0.1.tar.xz deleted file mode 100644 index 7bc5456..0000000 --- a/kwayland-5.1.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be238b8f5ba79a6fcc742bcf6ce677dcb697446268cd624d840051bb06baf708 -size 59668 diff --git a/kwayland-5.1.1.tar.xz b/kwayland-5.1.1.tar.xz new file mode 100644 index 0000000..e6a6852 --- /dev/null +++ b/kwayland-5.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05dafb3715f65893a543247293e5b194cc9e3bcf1aa0de719ce7580dad7b6783 +size 59680 diff --git a/kwayland.changes b/kwayland.changes index 568e26f..3210266 100644 --- a/kwayland.changes +++ b/kwayland.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Nov 6 20:14:15 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.1.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.1.1.php + +------------------------------------------------------------------- +Mon Nov 3 19:48:17 UTC 2014 - hrvoje.senjan@gmail.com + +- Added 0001-Do-not-find-unused-Wayland-components.patch to drop + not needed BuildRequires, pkgconfig(wayland-egl) + ------------------------------------------------------------------- Thu Oct 9 21:24:32 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kwayland.spec b/kwayland.spec index 8d742c2..1438e18 100644 --- a/kwayland.spec +++ b/kwayland.spec @@ -18,14 +18,16 @@ %define kwayland_server 0 Name: kwayland -Version: 5.1.0 +Version: 5.1.1 Release: 0 Summary: KDE Wayland library License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://www.kde.org -Source: %{name}-%{version}.1.tar.xz +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: fdupes @@ -33,7 +35,6 @@ BuildRequires: kf5-filesystem BuildRequires: wayland-devel >= 1.3.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(wayland-egl) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -68,6 +69,7 @@ KWayland provides a Qt-style Client and Server library wrapper for the Wayland l %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build