cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mono-addins-mono-addins-1.3 but keep BROKEN (needs thread local

Browse Source 
storage).
This commit is contained in:
ajacoutot 2017-04-28 16:58:40 +00:00
parent 3481df258f
commit b3bb3c38af
10 changed files with 148 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
devel/mono-addins/Makefile
View File

@ -1,35 +1,34 @@
# $OpenBSD: Makefile,v 1.16 2016/11/07 10:36:50 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2017/04/28 16:58:40 ajacoutot Exp $
BROKEN= failing since mono update
BROKEN= needs thread local storage
COMMENT= framework for creating extensible applications
COMMENT= framework for creating extensible applications
DISTNAME= mono-addins-1.2
CATEGORIES= devel lang
GH_ACCOUNT= mono
GH_PROJECT= mono-addins
GH_TAGNAME= ${GH_PROJECT}-1.3
HOMEPAGE= http://www.mono-project.com/Mono.Addins
CATEGORIES= devel lang
GH_ACCOUNT= mono
GH_PROJECT= mono-addins
GH_TAGNAME= ${DISTNAME}
HOMEPAGE= http://www.mono-project.com/Mono.Addins
# MIT X11, MPL
PERMIT_PACKAGE_CDROM= Yes
USE_GMAKE= Yes
MODULES= lang/mono
MODULES= lang/mono
BUILD_DEPENDS= x11/mono-gtk2
RUN_DEPENDS= x11/mono-gtk2
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.14
BUILD_DEPENDS= ${RUN_DEPENDS} \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
RUN_DEPENDS= x11/mono-gtk2
CONFIGURE_STYLE=gnu
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
pre-configure:
perl -pi -e 's,^prefix=.*,prefix=\@prefix\@,g' \
@ -37,7 +36,10 @@ pre-configure:
${WRKSRC}/Mono.Addins.Gui/mono-addins-gui.pc.in \
${WRKSRC}/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in \
${WRKSRC}/Mono.Addins.Setup/mono-addins-setup.pc.in
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
do-configure:
cd ${WRKSRC} && ${SETENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include <bsd.port.mk>

4
devel/mono-addins/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mono-addins-1.2.tar.gz) = yh+3ZbvyGt8Yi4uUByebvPKZGfKzr6590eaAc3olfmI=
SIZE (mono-addins-1.2.tar.gz) = 616250
SHA256 (mono-addins-mono-addins-1.3.tar.gz) = 4sTbn9Egh7eV3QOgNcarja/+FXaU2Y3P4icGeRPbVYA=
SIZE (mono-addins-mono-addins-1.3.tar.gz) = 672166

18
devel/mono-addins/patches/patch-Mono_Addins_CecilReflector_Mono_Addins_CecilReflector_csproj Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-Mono_Addins_CecilReflector_Mono_Addins_CecilReflector_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $
From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Sat, 17 Sep 2016 13:12:28 +0800
Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1)
--- Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj.orig Wed Jul 27 00:26:26 2016
+++ Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj Wed Nov 9 11:32:00 2016
@@ -11,7 +11,7 @@
<RootNamespace>Mono.Addins.CecilReflector</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>

37
devel/mono-addins/patches/patch-Mono_Addins_Gui_Mono_Addins_Gui_csproj
View File

@ -1,19 +1,18 @@
$OpenBSD: patch-Mono_Addins_Gui_Mono_Addins_Gui_csproj,v 1.2 2015/10/03 11:56:05 robert Exp $
--- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig Sat Oct 3 13:26:57 2015
+++ Mono.Addins.Gui/Mono.Addins.Gui.csproj Sat Oct 3 13:27:09 2015
@@ -52,7 +52,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="Mono.Posix" />
- <Reference Include="Mono.Cairo" />
+ <Reference Include="Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
@@ -166,4 +166,4 @@
<None Include="ChangeLog" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
$OpenBSD: patch-Mono_Addins_Gui_Mono_Addins_Gui_csproj,v 1.3 2017/04/28 16:58:40 ajacoutot Exp $
From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Sat, 17 Sep 2016 13:12:28 +0800
Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1)
--- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig Wed Jul 27 00:26:26 2016
+++ Mono.Addins.Gui/Mono.Addins.Gui.csproj Wed Nov 9 11:32:00 2016
@@ -11,7 +11,7 @@
<RootNamespace>Mono.Addins.Gui</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>

17
devel/mono-addins/patches/patch-Mono_Addins_MSBuild_Mono_Addins_MSBuild_csproj Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-Mono_Addins_MSBuild_Mono_Addins_MSBuild_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $
From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Sat, 17 Sep 2016 13:12:28 +0800
Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1)
--- Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj.orig Wed Jul 27 00:26:26 2016
+++ Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj Wed Nov 9 11:32:00 2016
@@ -11,6 +11,7 @@
<RootNamespace>Mono.Addins.MSBuild</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>

18
devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_Addin_cs Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-Mono_Addins_Mono_Addins_Addin_cs,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $
From 877e8d901a35672b371140121f27773768d36ad4 Mon Sep 17 00:00:00 2001
From: Marius Ungureanu <teromario@yahoo.com>
Date: Sun, 25 Sep 2016 21:05:47 +0300
Subject: [PATCH] [Addin] Simplify linq
--- Mono.Addins/Mono.Addins/Addin.cs.orig Wed Jul 27 00:26:26 2016
+++ Mono.Addins/Mono.Addins/Addin.cs Wed Nov 9 11:33:07 2016
@@ -178,7 +178,7 @@ namespace Mono.Addins
string id, version;
Addin.GetIdParts (AddinInfo.Id, out id, out version);
var addins = database.GetInstalledAddins (null, AddinSearchFlagsInternal.IncludeAll | AddinSearchFlagsInternal.LatestVersionsOnly);
- isLatestVersion = addins.Where (a => Addin.GetIdName (a.Id) == id && a.Version == version).Any ();
+ isLatestVersion = addins.Any (a => Addin.GetIdName (a.Id) == id && a.Version == version);
}
return isLatestVersion.Value;
}

18
devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_csproj Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-Mono_Addins_Mono_Addins_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $
From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Sat, 17 Sep 2016 13:12:28 +0800
Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1)
--- Mono.Addins/Mono.Addins.csproj.orig Wed Jul 27 00:26:26 2016
+++ Mono.Addins/Mono.Addins.csproj Wed Nov 9 11:32:00 2016
@@ -11,7 +11,7 @@
<RootNamespace>Mono.Addins</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>

18
devel/mono-addins/patches/patch-Mono_Addins_Setup_Mono_Addins_Setup_csproj Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-Mono_Addins_Setup_Mono_Addins_Setup_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $
From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Sat, 17 Sep 2016 13:12:28 +0800
Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1)
--- Mono.Addins.Setup/Mono.Addins.Setup.csproj.orig Wed Jul 27 00:26:26 2016
+++ Mono.Addins.Setup/Mono.Addins.Setup.csproj Wed Nov 9 11:32:00 2016
@@ -11,7 +11,7 @@
<RootNamespace>Mono.Addins.Setup</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>

12
devel/mono-addins/patches/patch-configure_ac
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2015/10/03 11:56:05 robert Exp $
--- configure.ac.orig Sat Oct 3 13:40:01 2015
+++ configure.ac Sat Oct 3 13:40:09 2015
@@ -18,7 +18,7 @@ AC_SUBST(POLICY_VERSIONS)
AC_PROG_INSTALL
-AC_PATH_PROG(MCS, gmcs, no)
+AC_PATH_PROG(MCS, mcs, no)
if test "x$MCS" = "xno"; then
AC_MSG_ERROR([mcs Not found])
fi

17
devel/mono-addins/patches/patch-mautil_mautil_csproj Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-mautil_mautil_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $
From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Sat, 17 Sep 2016 13:12:28 +0800
Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1)
--- mautil/mautil.csproj.orig Wed Jul 27 00:26:26 2016
+++ mautil/mautil.csproj Wed Nov 9 11:32:00 2016
@@ -9,6 +9,7 @@
<AssemblyName>mautil</AssemblyName>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace>mautil</RootNamespace>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>