pool/libproxy
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 431223 from GNOME:Next

Browse Source 
- Add libproxy-FindMono-4.6.patch: Fall back to mcs if gmcs cannot
  be found. Fixes issues with mono 4.6, which no longer ships the
  wrapper by default.

- Add libproxy-FindMono-4.6.patch: Fall back to mcs if gmcs cannot
  be found. Fixes issues with mono 4.6, which no longer ships the
  wrapper by default.

OBS-URL: https://build.opensuse.org/request/show/431223
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=127
This commit is contained in:
Bjørn Lie
2016-09-30 12:02:38 +00:00
committed by Git OBS Bridge
parent 1cf9ae7374
commit a969c61ba2
5 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libproxy-FindMono-4.6.patch Normal file
View File

@@ -0,0 +1,31 @@
From 2e4546b3cde31d657df34f6d247c92c47c83bf81 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 29 Sep 2016 11:36:50 +0200
Subject: [PATCH 5/5] FindMono: fall back to mcs when gmcs cannot be found
With mono 4.6, gmcs is no longer an upstream shipped wrapper.
Just fallback to 'mcs' if gmcs cannot be found. Distros still shipping
gmcs are assumed to know why they do so - in this case we favor their
local scripts.
Fixes issue #37.
---
cmake/FindMono.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindMono.cmake b/cmake/FindMono.cmake
index 95930b0..d4aa0ca 100644
--- a/cmake/FindMono.cmake
+++ b/cmake/FindMono.cmake
@@ -12,7 +12,7 @@
# Redistribution and use is allowed according to the terms of the GPL license.
FIND_PROGRAM (MONO_EXECUTABLE mono)
-FIND_PROGRAM (GMCS_EXECUTABLE gmcs)
+FIND_PROGRAM (GMCS_EXECUTABLE NAMES gmcs mcs)
FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil)
SET (MONO_FOUND FALSE CACHE INTERNAL "")
--
2.10.0

7
libproxy-plugins.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 29 09:48:02 UTC 2016 - dimstar@opensuse.org
- Add libproxy-FindMono-4.6.patch: Fall back to mcs if gmcs cannot
be found. Fixes issues with mono 4.6, which no longer ships the
wrapper by default.
-------------------------------------------------------------------
Mon Aug 8 13:16:48 UTC 2016 - dimstar@opensuse.org

3
libproxy-plugins.spec
View File

@@ -47,6 +47,8 @@ Source99: baselibs.conf
Patch0: libproxy-gnome-waitpid.patch
# PATCH-FIX-UPSTREAM libproxy-python3-support.patch dimstar@opensuse.org -- Add support to build python2 and python3 bindings together
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -340,6 +342,7 @@ libproxy offers the following features: * extremely small core
%setup -q -n %{_sourcename}
%patch0 -p1
%patch1 -p1
%patch2 -p1
mkdir build
%build

7
libproxy.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 29 09:48:02 UTC 2016 - dimstar@opensuse.org
- Add libproxy-FindMono-4.6.patch: Fall back to mcs if gmcs cannot
be found. Fixes issues with mono 4.6, which no longer ships the
wrapper by default.
-------------------------------------------------------------------
Mon Aug 8 13:16:48 UTC 2016 - dimstar@opensuse.org

3
libproxy.spec
View File

@@ -47,6 +47,8 @@ Source99: baselibs.conf
Patch0: libproxy-gnome-waitpid.patch
# PATCH-FIX-UPSTREAM libproxy-python3-support.patch dimstar@opensuse.org -- Add support to build python2 and python3 bindings together
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -340,6 +342,7 @@ libproxy offers the following features: * extremely small core
%setup -q -n %{_sourcename}
%patch0 -p1
%patch1 -p1
%patch2 -p1
mkdir build
%build