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

Accepting request 140959 from home:cgiboudeaux:branches:GNOME:Factory

Browse Source 
Fix build with cmake 2.8.10 (bnc#789219)

OBS-URL: https://build.opensuse.org/request/show/140959
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=89
This commit is contained in:
Dominique Leuenberger 2012-11-12 13:39:48 +00:00 committed by Git OBS Bridge
parent 17d0333ea4
commit c3730174c7
5 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake-2.8.10-compat.diff Normal file
View File

@ -0,0 +1,15 @@
--- cmake/CMakeDetermineCSharpCompiler.cmake.old 2012-11-12 12:17:02.099397946 +0100
+++ cmake/CMakeDetermineCSharpCompiler.cmake 2012-11-12 12:19:46.425382193 +0100
@@ -92,7 +92,11 @@
endif (CMAKE_CSharp_COMPILER)
# configure variables set in this file for fast reload later on
+if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10
+ set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
+endif()
+
configure_file(${CMAKE_SOURCE_DIR}/cmake/CMakeCSharpCompiler.cmake.in
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
+ ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC")

7
libproxy-plugins.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 12 11:26:35 UTC 2012 - cgiboudeaux@gmx.com
- Add cmake-2.8.10-compat.diff
Fixes a CMake error with CMake >= 2.8.10 (bnc#789219)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 16 07:15:34 UTC 2012 - dimstar@opensuse.org Tue Oct 16 07:15:34 UTC 2012 - dimstar@opensuse.org

3
libproxy-plugins.spec
View File

@ -47,6 +47,8 @@ Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz
# Script used for automatic snapshot updates # Script used for automatic snapshot updates
Source98: update-from-svn.sh Source98: update-from-svn.sh
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE -- cmake-2.8.10-compat.diff [bnc#789219] -- http://mail.kde.org/pipermail/kde-buildsystem/2012-November/008948.html
Patch0: cmake-2.8.10-compat.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -310,6 +312,7 @@ about network configuration changes.
%prep %prep
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0
mkdir build mkdir build
%build %build

7
libproxy.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 12 11:26:35 UTC 2012 - cgiboudeaux@gmx.com
- Add cmake-2.8.10-compat.diff
Fixes a CMake error with CMake >= 2.8.10 (bnc#789219)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 16 07:15:34 UTC 2012 - dimstar@opensuse.org Tue Oct 16 07:15:34 UTC 2012 - dimstar@opensuse.org

3
libproxy.spec
View File

@ -47,6 +47,8 @@ Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz
# Script used for automatic snapshot updates # Script used for automatic snapshot updates
Source98: update-from-svn.sh Source98: update-from-svn.sh
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE -- cmake-2.8.10-compat.diff [bnc#789219] -- http://mail.kde.org/pipermail/kde-buildsystem/2012-November/008948.html
Patch0: cmake-2.8.10-compat.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -310,6 +312,7 @@ about network configuration changes.
%prep %prep
%setup -q -n %{_sourcename} %setup -q -n %{_sourcename}
%patch0
mkdir build mkdir build
%build %build