wok diff stardict/stuff/sigc++.patch @ rev 10040

Up: GConf to 2.32.3. Add $CONFIGURE_ARGS.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri May 20 01:59:04 2011 +0000 (2011-05-20)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/stardict/stuff/sigc++.patch	Fri May 20 01:59:04 2011 +0000
     1.3 @@ -0,0 +1,177 @@
     1.4 +diff -Naur stardict-3.0.1.orig/src/gconf_file.cpp stardict-3.0.1/src/gconf_file.cpp
     1.5 +--- stardict-3.0.1.orig/src/gconf_file.cpp	2007-07-10 08:16:04.000000000 +0100
     1.6 ++++ stardict-3.0.1/src/gconf_file.cpp	2008-04-11 18:18:43.000000000 +0100
     1.7 +@@ -22,6 +22,8 @@
     1.8 + #  include "config.h"
     1.9 + #endif
    1.10 + 
    1.11 ++#include <memory>
    1.12 ++
    1.13 + #include <glib/gi18n.h>
    1.14 + 
    1.15 + #include "gconf_file.hpp"
    1.16 +diff -Naur stardict-3.0.1.orig/src/inifile.cpp stardict-3.0.1/src/inifile.cpp
    1.17 +--- stardict-3.0.1.orig/src/inifile.cpp	2007-08-01 10:43:00.000000000 +0100
    1.18 ++++ stardict-3.0.1/src/inifile.cpp	2008-04-11 18:18:43.000000000 +0100
    1.19 +@@ -25,6 +25,7 @@
    1.20 + #include <vector>
    1.21 + #include <cerrno>
    1.22 + #include <cstring>
    1.23 ++#include <cstdlib>
    1.24 + #include <cstdio>
    1.25 + #include <glib/gi18n.h>
    1.26 + #include <glib/gstdio.h>
    1.27 +diff -Naur stardict-3.0.1.orig/src/pangoview.cpp stardict-3.0.1/src/pangoview.cpp
    1.28 +--- stardict-3.0.1.orig/src/pangoview.cpp	2007-09-25 08:11:48.000000000 +0100
    1.29 ++++ stardict-3.0.1/src/pangoview.cpp	2008-04-11 18:18:43.000000000 +0100
    1.30 +@@ -22,6 +22,8 @@
    1.31 + #  include "config.h"
    1.32 + #endif
    1.33 + 
    1.34 ++#include <cstring>
    1.35 ++
    1.36 + #include "gtktextviewpango.h"
    1.37 + #include "utils.h"
    1.38 + #include "skin.h"//for SkinCursor definition
    1.39 +diff -Naur stardict-3.0.1.orig/src/prefsdlg.cpp stardict-3.0.1/src/prefsdlg.cpp
    1.40 +--- stardict-3.0.1.orig/src/prefsdlg.cpp	2007-10-30 08:14:07.000000000 +0000
    1.41 ++++ stardict-3.0.1/src/prefsdlg.cpp	2008-04-11 18:18:43.000000000 +0100
    1.42 +@@ -21,6 +21,8 @@
    1.43 + #  include "config.h"
    1.44 + #endif
    1.45 + 
    1.46 ++#include <cstdlib>
    1.47 ++
    1.48 + #include <glib/gi18n.h>
    1.49 + #include <glib/gstdio.h>
    1.50 + 
    1.51 +diff -Naur stardict-3.0.1.orig/src/readword.cpp stardict-3.0.1/src/readword.cpp
    1.52 +--- stardict-3.0.1.orig/src/readword.cpp	2007-07-10 08:16:04.000000000 +0100
    1.53 ++++ stardict-3.0.1/src/readword.cpp	2008-04-11 17:53:43.000000000 +0100
    1.54 +@@ -3,6 +3,7 @@
    1.55 + #endif
    1.56 + 
    1.57 + #include <cstring>
    1.58 ++#include <cstdlib>
    1.59 + #include <string>
    1.60 + 
    1.61 + #include <glib/gi18n.h>
    1.62 +diff -Naur stardict-3.0.1.orig/src/sigc++/signal.h stardict-3.0.1/src/sigc++/signal.h
    1.63 +--- stardict-3.0.1.orig/src/sigc++/signal.h	2007-07-10 08:16:01.000000000 +0100
    1.64 ++++ stardict-3.0.1/src/sigc++/signal.h	2008-04-11 17:50:11.000000000 +0100
    1.65 +@@ -18,7 +18,7 @@
    1.66 +   //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
    1.67 +   //do not allow a typedef to have the same name as a class in the typedef's definition.
    1.68 +   //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
    1.69 +-  #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
    1.70 ++//  #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
    1.71 + #endif
    1.72 + 
    1.73 + namespace sigc {
    1.74 +diff -Naur stardict-3.0.1.orig/src/utils.cpp stardict-3.0.1/src/utils.cpp
    1.75 +--- stardict-3.0.1.orig/src/utils.cpp	2007-10-22 03:25:02.000000000 +0100
    1.76 ++++ stardict-3.0.1/src/utils.cpp	2008-04-11 18:18:43.000000000 +0100
    1.77 +@@ -22,6 +22,8 @@
    1.78 + #  include "config.h"
    1.79 + #endif
    1.80 + 
    1.81 ++#include <cstring>
    1.82 ++
    1.83 + #include <glib.h>
    1.84 + #include <glib/gi18n.h>
    1.85 + #include <cstdlib>
    1.86 +diff -Naur stardict-3.0.1.orig/src/x11_iskeyspressed.hpp stardict-3.0.1/src/x11_iskeyspressed.hpp
    1.87 +--- stardict-3.0.1.orig/src/x11_iskeyspressed.hpp	2007-07-10 08:16:04.000000000 +0100
    1.88 ++++ stardict-3.0.1/src/x11_iskeyspressed.hpp	2008-04-11 17:57:08.000000000 +0100
    1.89 +@@ -1,6 +1,8 @@
    1.90 + #ifndef _X11_ISKEYSPRESSED_HPP_
    1.91 + #define _X11_ISKEYSPRESSED_HPP_
    1.92 + 
    1.93 ++#include <memory>
    1.94 ++
    1.95 + #include <gdk/gdkx.h>
    1.96 + #include <X11/keysym.h>
    1.97 + #include <gtk/gtk.h>
    1.98 +
    1.99 + #ifdef _WIN32
   1.100 +diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
   1.101 +--- stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp	2007-09-19 09:27:18.000000000 +0100
   1.102 ++++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp	2008-04-11 18:02:55.000000000 +0100
   1.103 +@@ -1,4 +1,5 @@
   1.104 + #include "stardict_espeak.h"
   1.105 ++#include <cstring>
   1.106 + #include <espeak/speak_lib.h>
   1.107 + #include <glib/gi18n.h>
   1.108 + 
   1.109 +diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
   1.110 +--- stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp	2007-09-13 08:51:55.000000000 +0100
   1.111 ++++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp	2008-04-11 17:59:50.000000000 +0100
   1.112 +@@ -1,4 +1,6 @@
   1.113 + #include "stardict_html_parsedata.h"
   1.114 ++#include <cstring>
   1.115 ++#include <cstdlib>
   1.116 + #include <glib/gi18n.h>
   1.117 + 
   1.118 + #ifdef _WIN32
   1.119 +
   1.120 +diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
   1.121 +--- stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp	2007-09-19 09:29:21.000000000 +0100
   1.122 ++++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp	2008-04-11 18:02:38.000000000 +0100
   1.123 +@@ -1,4 +1,5 @@
   1.124 + #include "stardict_spell.h"
   1.125 ++#include <cstring>
   1.126 + #include <glib.h>
   1.127 + #include <glib/gi18n.h>
   1.128 + #include <enchant.h>
   1.129 +
   1.130 +diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
   1.131 +--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp	2007-10-18 02:36:22.000000000 +0100
   1.132 ++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp	2008-04-11 18:01:10.000000000 +0100
   1.133 +@@ -1,4 +1,5 @@
   1.134 + #include "court_widget.h"
   1.135 ++#include <cstring>
   1.136 + #include <math.h>
   1.137 + #include <list>
   1.138 + 
   1.139 +diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
   1.140 +--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp	2007-10-15 04:32:04.000000000 +0100
   1.141 ++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp	2008-04-11 18:00:35.000000000 +0100
   1.142 +@@ -1,5 +1,6 @@
   1.143 + #include "stardict_wordnet.h"
   1.144 + #include "court_widget.h"
   1.145 ++#include <cstring>
   1.146 + #include <glib/gi18n.h>
   1.147 + 
   1.148 + #ifdef _WIN32
   1.149 +
   1.150 +diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
   1.151 +--- stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp	2007-08-31 07:41:54.000000000 +0100
   1.152 ++++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp	2008-04-11 18:00:12.000000000 +0100
   1.153 +@@ -1,4 +1,5 @@
   1.154 + #include "stardict_xdxf_parsedata.h"
   1.155 ++#include <cstring>
   1.156 + #include <glib/gi18n.h>
   1.157 + 
   1.158 + #ifdef _WIN32
   1.159 +diff -Naur stardict-3.0.1.orig/tests/t_config_file.cpp stardict-3.0.1/tests/t_config_file.cpp
   1.160 +--- stardict-3.0.1.orig/tests/t_config_file.cpp	2007-07-10 08:16:04.000000000 +0100
   1.161 ++++ stardict-3.0.1/tests/t_config_file.cpp	2008-04-11 18:04:13.000000000 +0100
   1.162 +@@ -8,6 +8,7 @@
   1.163 + #include <cstring>
   1.164 + #include <iterator>
   1.165 + #include <iostream>
   1.166 ++#include <memory>
   1.167 + #include <gtk/gtk.h>
   1.168 + 
   1.169 + #include "config_file.hpp"
   1.170 +diff -Naur stardict-3.0.1.orig/tests/t_xml.cpp stardict-3.0.1/tests/t_xml.cpp
   1.171 +--- stardict-3.0.1.orig/tests/t_xml.cpp	2007-07-10 08:16:04.000000000 +0100
   1.172 ++++ stardict-3.0.1/tests/t_xml.cpp	2008-04-11 18:04:58.000000000 +0100
   1.173 +@@ -5,6 +5,7 @@
   1.174 + #include <glib.h>
   1.175 + #include <cstdlib>
   1.176 + #include <string>
   1.177 ++#include <cstring>
   1.178 + 
   1.179 + 
   1.180 + static void xml_decode(const char *str, std::string& decoded)