diff options
| author | Binh Nguyen <binhnguyen@fastmail.fm> | 2012-09-12 22:21:56 +0700 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-09-12 14:20:43 -0500 |
| commit | 7c8f3645ac5823ab6d65e8270a5e8658c520c2ca (patch) | |
| tree | d5d96980aa08897b9649e3968f891a9bb978bdbc /misc/stardict | |
| parent | 47844931dd9ddb24cdee91062c29b6f47629e8ca (diff) | |
misc/stardict: Fixed to build against gcc-4.7.x (+new maintainer)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'misc/stardict')
| -rw-r--r-- | misc/stardict/patches/stardict-3.0.1-gcc47.patch | 24 | ||||
| -rw-r--r-- | misc/stardict/stardict.SlackBuild | 8 | ||||
| -rw-r--r-- | misc/stardict/stardict.info | 4 |
3 files changed, 31 insertions, 5 deletions
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 000000000000..ddd22f819171 --- /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 f4d460e57994..3673835a1772 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 c755d602acaa..8aa73028c59f 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" |