rpm/libproxy
SHA256
1
0
Fork 0
forked from pool/libproxy
Code Pull Requests Activity

Accepting request 441359 from GNOME:Next

Browse Source 
Fix build with cmake 3.7 - somehow this was not spotted in staging

OBS-URL: https://build.opensuse.org/request/show/441359
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=129
This commit is contained in:
Dominique Leuenberger 2016-11-22 12:03:35 +00:00 committed by Git OBS Bridge
parent a969c61ba2
commit 03d52a9489
5 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libproxy-cmake-3.7.patch Normal file
View File

@ -0,0 +1,28 @@
From 72bda7188408bd3c2491ea664da294cc483220bc Mon Sep 17 00:00:00 2001
From: Andrey Rakhmatullin <wrar@wrar.name>
Date: Sun, 20 Nov 2016 18:40:49 +0500
Subject: [PATCH] Set CMP0054 CMake policy to NEW.
CMake 3.7 exports a "t" variable for all projects and because of that
the elseif statement in cmake/CMakeCSharpInformation.cmake:311 works
incorrectly if CMP0054 is not set to NEW (as "t" is expanded to the
variable value).
---
CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5313787..451e7a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6)
if(POLICY CMP0011)
cmake_policy(SET CMP0011 NEW)
endif(POLICY CMP0011)
+if(POLICY CMP0054)
+ cmake_policy(SET CMP0054 NEW)
+endif(POLICY CMP0054)
# Make sure we look in our cmake folder for additional definitions
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )

5
libproxy-plugins.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 22 08:18:37 UTC 2016 - dimstar@opensuse.org
- Add libproxy-cmake-3.7.patch: Fix build with cmake 3.7.
-------------------------------------------------------------------
Thu Sep 29 09:48:02 UTC 2016 - dimstar@opensuse.org

3
libproxy-plugins.spec
View File

@ -49,6 +49,8 @@ Patch0: libproxy-gnome-waitpid.patch
Patch1: libproxy-python3-support.patch
# PATCH-FIX-UPSTREAM libproxy-FindMono-4.6.patch gh#libproxy/libproxy#37 dimstar@opensuse.org -- Fall back to mcs if gmcs cannot be found
Patch2: libproxy-FindMono-4.6.patch
# PATCH-FIX-UPSTREAM libproxy-cmake-3.7.patch gh#libproxy/libproxy#46 dimstar@opensuse.org -- Fix build with cmake 3.7
Patch3: libproxy-cmake-3.7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@ -343,6 +345,7 @@ libproxy offers the following features: * extremely small core
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
mkdir build
%build

5
libproxy.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 22 08:18:37 UTC 2016 - dimstar@opensuse.org
- Add libproxy-cmake-3.7.patch: Fix build with cmake 3.7.
-------------------------------------------------------------------
Thu Sep 29 09:48:02 UTC 2016 - dimstar@opensuse.org

3
libproxy.spec
View File

@ -49,6 +49,8 @@ Patch0: libproxy-gnome-waitpid.patch
Patch1: libproxy-python3-support.patch
# PATCH-FIX-UPSTREAM libproxy-FindMono-4.6.patch gh#libproxy/libproxy#37 dimstar@opensuse.org -- Fall back to mcs if gmcs cannot be found
Patch2: libproxy-FindMono-4.6.patch
# PATCH-FIX-UPSTREAM libproxy-cmake-3.7.patch gh#libproxy/libproxy#46 dimstar@opensuse.org -- Fix build with cmake 3.7
Patch3: libproxy-cmake-3.7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@ -343,6 +345,7 @@ libproxy offers the following features: * extremely small core
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
mkdir build
%build