From 26c5c832e34df35b721e3784685e0c1b4806901dff399f5d4e5fd3c5ae9e0cbd Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 15 Sep 2014 19:56:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=15 --- cmake-policy.patch | 15 +++++++++++++++ libdbusmenu-qt5.changes | 1 + libdbusmenu-qt5.spec | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 cmake-policy.patch diff --git a/cmake-policy.patch b/cmake-policy.patch new file mode 100644 index 0000000..de6e07b --- /dev/null +++ b/cmake-policy.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 597a7de..38bd7f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,10 @@ project(dbusmenu-qt) + cmake_minimum_required(VERSION 2.8.11) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") + ++if (POLICY CMP0021) ++ cmake_policy(SET CMP0021 OLD) ++endif (POLICY CMP0021) ++ + # Build options + option(WITH_DOC "Build documentation (requires Doxygen)" ON) + diff --git a/libdbusmenu-qt5.changes b/libdbusmenu-qt5.changes index 3f07fe0..da7716c 100644 --- a/libdbusmenu-qt5.changes +++ b/libdbusmenu-qt5.changes @@ -7,6 +7,7 @@ Mon Sep 15 19:31:29 UTC 2014 - hrvoje.senjan@gmail.com Simply adding dbusmenu-qt5 to the target_link_libraries() call takes care of defining the include directory. - Rebase noqDebug-qWarnings.patch +- Added cmake-policy.patch for openSUSE 13.1 ------------------------------------------------------------------- Mon Jun 2 21:37:10 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libdbusmenu-qt5.spec b/libdbusmenu-qt5.spec index 9049427..268a1a4 100644 --- a/libdbusmenu-qt5.spec +++ b/libdbusmenu-qt5.spec @@ -30,6 +30,8 @@ Source1: baselibs.conf # PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings, # which are useless, and annoy users, so this patch just disables them in release mode Patch1: noqDebug-qWarnings.patch +# PATCH-FIX-UPSTREAM cmake-policy.patch -- CMake 2.8.12 creates a fatal error on relative include dirs for a target. silence that policy +Patch2: cmake-policy.patch #Needed for DISABLE_FIND_PACKAGE BuildRequires: cmake >= 2.8.6 BuildRequires: doxygen @@ -69,6 +71,7 @@ This package contains development files for libdbusmenu-qt5. %prep %setup -q -n %{rname}-%{version} %patch1 -p1 +%patch2 -p1 # Remove build time references so build-compare can do its work sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in