diff options
-rw-r--r-- | development/mono/libgdiplus-libdir.patch | 12 | ||||
-rw-r--r-- | development/mono/mono.SlackBuild | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/development/mono/libgdiplus-libdir.patch b/development/mono/libgdiplus-libdir.patch new file mode 100644 index 0000000000..6b7580028b --- /dev/null +++ b/development/mono/libgdiplus-libdir.patch @@ -0,0 +1,12 @@ +diff -Naur mono-3.2.3.orig/data/config.in mono-3.2.3/data/config.in +--- mono-3.2.3.orig/data/config.in 2013-09-13 22:20:29.000000000 +0000 ++++ mono-3.2.3/data/config.in 2014-01-19 22:31:49.545304766 +0000 +@@ -26,6 +26,6 @@ + <dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/> + <dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/> + </dllmap> +- <dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" /> +- <dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" /> ++ <dllmap dll="gdiplus" target="@libdir@/libgdiplus@libsuffix@" /> ++ <dllmap dll="gdiplus.dll" target="@libdir@/libgdiplus@libsuffix@" /> + </configuration> diff --git a/development/mono/mono.SlackBuild b/development/mono/mono.SlackBuild index 67abbfa664..f4fe78ec23 100644 --- a/development/mono/mono.SlackBuild +++ b/development/mono/mono.SlackBuild @@ -5,7 +5,7 @@ PRGNAM=mono VERSION=${VERSION:-3.2.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -50,6 +50,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix libgdiplus library path +patch -p1 < $CWD/libgdiplus-libdir.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |