From 8347a53fc7d6446705026a2ff9a630c35484c2cd068234e24f560a7f6491462d Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Sat, 9 Jan 2016 18:59:02 +0000 Subject: [PATCH] Accepting request 351965 from home:Mailaender:branches:Mono:Factory fix end user packages requiring libgdiplus-devel OBS-URL: https://build.opensuse.org/request/show/351965 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=163 --- libgdiplus0-un-devel.patch | 27 +++++++++++++++++++++++++++ mono-core.changes | 5 +++++ mono-core.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 libgdiplus0-un-devel.patch diff --git a/libgdiplus0-un-devel.patch b/libgdiplus0-un-devel.patch new file mode 100644 index 0000000..6979da3 --- /dev/null +++ b/libgdiplus0-un-devel.patch @@ -0,0 +1,27 @@ +From bec6f78249911294447e975718e8aa2af07a0098 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= + +Date: Sun, 3 Jan 2016 22:06:54 +0100 +Subject: [PATCH] reference libgdiplus with the proper .so name + +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 568cb22..98a9697 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3250,6 +3250,12 @@ AC_ARG_WITH([libgdiplus], + + # default install location + libgdiplus_install_loc=libgdiplus${libsuffix} ++case "$host" in ++ *-*-*linux*) ++ libgdiplus_install_loc=libgdiplus${libsuffix}.0 ++ ;; ++esac ++ + case $with_libgdiplus in + no|installed) + libgdiplus_loc= diff --git a/mono-core.changes b/mono-core.changes index 5b6d7e8..8a166a5 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 3 21:37:33 UTC 2016 - mailaender@opensuse.org + +- add libgdiplus0-un-devel.patch to fix boo#944754 + ------------------------------------------------------------------- Fri Dec 11 08:32:06 UTC 2015 - normand@linux.vnet.ibm.com diff --git a/mono-core.spec b/mono-core.spec index 664d93c..350124f 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -50,6 +50,8 @@ Patch10: update_elf_abiv2_testcases.patch Patch11: partial_sharing_false_4_powerpc.patch Patch12: fix_exception_when_reading_from_timezone_file.patch ################## +# PATCH-FIX-UPSTREAM https://github.com/mono/mono/pull/2394 +Patch13: libgdiplus0-un-devel.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -134,6 +136,7 @@ technologies that have been submitted to the ECMA for standardization. %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %build NOCONFIGURE="yes" ./autogen.sh