This commit is contained in:
parent
25c7d4610e
commit
26c5c832e3
15
cmake-policy.patch
Normal file
15
cmake-policy.patch
Normal file
@ -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)
|
||||||
|
|
@ -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()
|
Simply adding dbusmenu-qt5 to the target_link_libraries()
|
||||||
call takes care of defining the include directory.
|
call takes care of defining the include directory.
|
||||||
- Rebase noqDebug-qWarnings.patch
|
- Rebase noqDebug-qWarnings.patch
|
||||||
|
- Added cmake-policy.patch for openSUSE 13.1
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 2 21:37:10 UTC 2014 - hrvoje.senjan@gmail.com
|
Mon Jun 2 21:37:10 UTC 2014 - hrvoje.senjan@gmail.com
|
||||||
|
@ -30,6 +30,8 @@ Source1: baselibs.conf
|
|||||||
# PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings,
|
# 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
|
# which are useless, and annoy users, so this patch just disables them in release mode
|
||||||
Patch1: noqDebug-qWarnings.patch
|
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
|
#Needed for DISABLE_FIND_PACKAGE
|
||||||
BuildRequires: cmake >= 2.8.6
|
BuildRequires: cmake >= 2.8.6
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -69,6 +71,7 @@ This package contains development files for libdbusmenu-qt5.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{rname}-%{version}
|
%setup -q -n %{rname}-%{version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# Remove build time references so build-compare can do its work
|
# Remove build time references so build-compare can do its work
|
||||||
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in
|
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in
|
||||||
|
Loading…
Reference in New Issue
Block a user