From 7c8f3645ac5823ab6d65e8270a5e8658c520c2ca Mon Sep 17 00:00:00 2001
From: Binh Nguyen <binhnguyen@fastmail.fm>
Date: Wed, 12 Sep 2012 22:21:56 +0700
Subject: misc/stardict: Fixed to build against gcc-4.7.x (+new maintainer)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 misc/stardict/patches/stardict-3.0.1-gcc47.patch | 24 ++++++++++++++++++++++++
 misc/stardict/stardict.SlackBuild                |  8 +++++---
 misc/stardict/stardict.info                      |  4 ++--
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 misc/stardict/patches/stardict-3.0.1-gcc47.patch

(limited to 'misc')

diff --git a/misc/stardict/patches/stardict-3.0.1-gcc47.patch b/misc/stardict/patches/stardict-3.0.1-gcc47.patch
new file mode 100644
index 0000000000..ddd22f8191
--- /dev/null
+++ b/misc/stardict/patches/stardict-3.0.1-gcc47.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sigc++/signal_base.h b/src/sigc++/signal_base.h
+index 582a8f4..0d77ac5 100644
+--- a/src/sigc++/signal_base.h
++++ b/src/sigc++/signal_base.h
+@@ -21,6 +21,7 @@
+ #ifndef _SIGC_SIGNAL_BASE_H_
+ #define _SIGC_SIGNAL_BASE_H_
+ 
++#include <cstddef>
+ #include <list>
+ #include <sigc++config.h>
+ #include <sigc++/type_traits.h>
+diff --git a/stardict-plugins/stardict-wordnet-plugin/scene.hpp b/stardict-plugins/stardict-wordnet-plugin/scene.hpp
+index 54003ca..270b2e2 100644
+--- a/stardict-plugins/stardict-wordnet-plugin/scene.hpp
++++ b/stardict-plugins/stardict-wordnet-plugin/scene.hpp
+@@ -9,6 +9,7 @@
+ #include "partic.hpp"
+ #include "spring.hpp"
+ 
++#include <cstdlib>
+ #include <vector>
+ using namespace std;
+ 
diff --git a/misc/stardict/stardict.SlackBuild b/misc/stardict/stardict.SlackBuild
index f4d460e579..3673835a17 100644
--- a/misc/stardict/stardict.SlackBuild
+++ b/misc/stardict/stardict.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for StarDict
 
 # Copyright 2008-2009  Murat D. Kadirov <banderols@gmail.com>
+# Copyright 2012  Binh Nguyen <binhnguyen@fastmail.fm>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,15 +25,13 @@
 
 PRGNAM=stardict
 VERSION=${VERSION:-3.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -77,6 +76,9 @@ patch src/eggtrayicon.c -p1 < $CWD/patches/stardict-transparent.patch
 # Incorporate some fixes for gcc44 into a deb patch for gcc43
 patch -p1 < $CWD/patches/fixup_build_on_gcc44.patch
 
+# Fix building against gcc-4.7.x
+patch -p1 < $CWD/patches/stardict-3.0.1-gcc47.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/misc/stardict/stardict.info b/misc/stardict/stardict.info
index c755d602ac..8aa73028c5 100644
--- a/misc/stardict/stardict.info
+++ b/misc/stardict/stardict.info
@@ -6,5 +6,5 @@ MD5SUM="93bb2d7825bc9d52a4f9ba4c1c506d1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Murat D. Kadirov"
-EMAIL="banderols@gmail.com"
+MAINTAINER="Binh Nguyen"
+EMAIL="binhnguyen@fastmail.fm"
-- 
cgit v1.2.3