libraries/libgdiplus: Updated for version 2.4.2

4 files changed, 31 insertions, 29 deletions

diff --git a/libraries/libgdiplus/cairo-type1-include.patch b/libraries/libgdiplus/cairo-type1-include.patch
deleted file mode 100644
index 8be7e94421b6..000000000000
--- a/libraries/libgdiplus/cairo-type1-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgdiplus-1.2.4~/cairo/src/cairo-type1-subset.c	2007-05-03 20:40:26.000000000 +0000
-+++ libgdiplus-1.2.4/cairo/src/cairo-type1-subset.c	2007-07-23 09:30:11.000000000 +0000
-@@ -46,6 +46,8 @@
- #include FT_OUTLINE_H
- #include FT_TYPE1_TABLES_H
- 
-+#include <ctype.h>
-+
- typedef struct _cairo_type1_font_subset {
- 
-     cairo_scaled_font_subset_t *scaled_font_subset;
diff --git a/libraries/libgdiplus/libgdiplus.SlackBuild b/libraries/libgdiplus/libgdiplus.SlackBuild
index 0baeacc2a717..942f876edbea 100644
--- a/libraries/libgdiplus/libgdiplus.SlackBuild
+++ b/libraries/libgdiplus/libgdiplus.SlackBuild
@@ -25,10 +25,11 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=libgdiplus
-VERSION=1.2.4
+VERSION=2.4.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,8 +37,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -48,7 +54,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-patch -p1 < $CWD/cairo-type1-include.patch
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -57,13 +62,19 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
   
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE MPL-1.1.html NEWS README TODO \
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL LICENSE MPL-1.1.html NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -71,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libgdiplus/libgdiplus.info b/libraries/libgdiplus/libgdiplus.info
index 6511c3585dae..f9cf7abbcd65 100644
--- a/libraries/libgdiplus/libgdiplus.info
+++ b/libraries/libgdiplus/libgdiplus.info
@@ -1,8 +1,10 @@
 PRGNAM="libgdiplus"
-VERSION="1.2.4"
+VERSION="2.4.2"
 HOMEPAGE="http://www.go-mono.org"
-DOWNLOAD="http://go-mono.com/sources/libgdiplus/libgdiplus-1.2.4.tar.bz2"
-MD5SUM="cf86212084a7b9cc3660efa5baf1cb98"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@gmail.com"
+DOWNLOAD="http://ftp.novell.com/pub/mono/sources/libgdiplus/libgdiplus-2.4.2.tar.bz2"
+MD5SUM="703210950bce2ed0a9824f897f774925"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="nobody"
+EMAIL="nobody@nowhere"
 APPROVED="rworkman"
diff --git a/libraries/libgdiplus/slack-desc b/libraries/libgdiplus/slack-desc
index 48fa23676787..4cd76d998ccd 100644
--- a/libraries/libgdiplus/slack-desc
+++ b/libraries/libgdiplus/slack-desc
@@ -7,13 +7,13 @@
 
           |-----handy-ruler------------------------------------------------------|
 libgdiplus: libgdiplus (Open Source implementation of the GDI+ API)
-libgdiplus: 
+libgdiplus:
 libgdiplus: An Open Source implementation of the GDI+ API.
 libgdiplus: This package is part of the Mono project.
-libgdiplus: 
-libgdiplus: 
-libgdiplus: 
-libgdiplus: 
-libgdiplus: 
-libgdiplus: 
-libgdiplus: 
+libgdiplus:
+libgdiplus:
+libgdiplus:
+libgdiplus:
+libgdiplus:
+libgdiplus:
+libgdiplus: