Accepting request 674329 from home:wolfi323:branches:home:luca_b:kf555
- Add fix-build-with-cmake-3.5.patch to fix build with cmake 3.5.2 on Leap 42.3 OBS-URL: https://build.opensuse.org/request/show/674329 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=189
This commit is contained in:
parent
e3c3e150ee
commit
6df4a6e8fa
29
fix-build-with-cmake-3.5.patch
Normal file
29
fix-build-with-cmake-3.5.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 1632a6972279d150aeb8de9e1cf0000ba1c3c380 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
Date: Tue, 12 Feb 2019 10:31:01 +0100
|
||||||
|
Subject: Fix build with cmake 3.5
|
||||||
|
|
||||||
|
VERSION_GREATER_EQUAL requires cmake 3.7 or higher.
|
||||||
|
So use NOT VERSION_LESS instead, which is logically equivalent and also
|
||||||
|
works with older cmake versions.
|
||||||
|
Differential Revision: https://phabricator.kde.org/D18941
|
||||||
|
---
|
||||||
|
src/extractors/CMakeLists.txt | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/extractors/CMakeLists.txt b/src/extractors/CMakeLists.txt
|
||||||
|
index 8795b48..6b4859c 100644
|
||||||
|
--- a/src/extractors/CMakeLists.txt
|
||||||
|
+++ b/src/extractors/CMakeLists.txt
|
||||||
|
@@ -36,7 +36,7 @@ if(LibExiv2_FOUND)
|
||||||
|
KF5::FileMetaData
|
||||||
|
LibExiv2::LibExiv2
|
||||||
|
)
|
||||||
|
- if(${LibExiv2_VERSION} VERSION_GREATER_EQUAL 0.26)
|
||||||
|
+ if(NOT ${LibExiv2_VERSION} VERSION_LESS 0.26)
|
||||||
|
target_compile_definitions(kfilemetadata_exiv2extractor PRIVATE "-DHAVE_WEBP_SUPPORT")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 12 07:03:30 UTC 2019 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Add fix-build-with-cmake-3.5.patch to fix build with cmake 3.5.2
|
||||||
|
on Leap 42.3
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 10 22:03:07 UTC 2019 - lbeltrame@kde.org
|
Sun Feb 10 22:03:07 UTC 2019 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
@ -32,6 +32,8 @@ Group: Development/Libraries/KDE
|
|||||||
URL: https://www.kde.org
|
URL: https://www.kde.org
|
||||||
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz
|
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch0: fix-build-with-cmake-3.5.patch
|
||||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||||
BuildRequires: karchive-devel >= %{_kf5_bugfix_version}
|
BuildRequires: karchive-devel >= %{_kf5_bugfix_version}
|
||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
@ -69,6 +71,7 @@ A library for extracting file metadata. Development files
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kfilemetadata-%{version}
|
%setup -q -n kfilemetadata-%{version}
|
||||||
|
%autopatch -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user