rpm/stardict
SHA256
1
0
Fork 0
forked from pool/stardict
Code Pull Requests Activity
Files
4597538d379ccaad16ebc31d551a468aaf5c57eda2a12c071018bae1772284df
stardict/stardict-3.0.1-includes.patch
andrea florio 4597538d37 Accepting request 30767 from home:xwhu:Factory 
Copy from home:xwhu:Factory/stardict via accept of submit request 30767 revision 8.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/30767
OBS-URL: https://build.opensuse.org/package/show/Education/stardict?expand=0&rev=4
2010-02-07 15:49:22 +00:00

388 lines
13 KiB
Diff
Raw Blame History

Index: stardict-3.0.1/src/lib/data.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/data.cpp
+++ stardict-3.0.1/src/lib/data.cpp
@@ -22,6 +22,7 @@
# include "config.h"
#endif
+#include <cstring>
#include "kmp.h"
#include "data.hpp"
Index: stardict-3.0.1/src/lib/stddict.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/stddict.cpp
+++ stardict-3.0.1/src/lib/stddict.cpp
@@ -28,6 +28,7 @@
# include "config.h"
#endif
+#include <cstring>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
Index: stardict-3.0.1/src/lib/treedict.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/treedict.cpp
+++ stardict-3.0.1/src/lib/treedict.cpp
@@ -25,6 +25,7 @@
# include "config.h"
#endif
+#include <cstring>
#include "file.hpp"
#include "getuint32.h"
Index: stardict-3.0.1/src/lib/common.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/common.cpp
+++ stardict-3.0.1/src/lib/common.cpp
@@ -24,6 +24,8 @@
# include "config.h"
#endif
+#include <cstring>
+#include <cstdlib>
#include "common.hpp"
static void parse_description(const char *p, long len, std::string &description)
Index: stardict-3.0.1/src/lib/stardict_client.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/stardict_client.cpp
+++ stardict-3.0.1/src/lib/stardict_client.cpp
@@ -22,6 +22,8 @@
# include "config.h"
#endif
+#include <cstdlib>
+#include <cstring>
#include <glib.h>
#include <glib/gi18n.h>
Index: stardict-3.0.1/src/lib/http_client.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/http_client.cpp
+++ stardict-3.0.1/src/lib/http_client.cpp
@@ -2,6 +2,7 @@
# include "config.h"
#endif
+#include <cstring>
#include "http_client.h"
#include "sockets.hpp"
Index: stardict-3.0.1/src/lib/pluginmanager.cpp
===================================================================
--- stardict-3.0.1.orig/src/lib/pluginmanager.cpp
+++ stardict-3.0.1/src/lib/pluginmanager.cpp
@@ -1,6 +1,7 @@
#include "pluginmanager.h"
#include "file.hpp"
#include <string>
+#include <cstring>
StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
plugin_filename(filename), module(module_), configure_func(configure_func_)
Index: stardict-3.0.1/src/pangoview.cpp
===================================================================
--- stardict-3.0.1.orig/src/pangoview.cpp
+++ stardict-3.0.1/src/pangoview.cpp
@@ -22,6 +22,7 @@
# include "config.h"
#endif
+#include <cstring>
#include "gtktextviewpango.h"
#include "utils.h"
#include "skin.h"//for SkinCursor definition
Index: stardict-3.0.1/src/x11_iskeyspressed.hpp
===================================================================
--- stardict-3.0.1.orig/src/x11_iskeyspressed.hpp
+++ stardict-3.0.1/src/x11_iskeyspressed.hpp
@@ -5,6 +5,8 @@
#include <X11/keysym.h>
#include <gtk/gtk.h>
+#include <memory>
+
#include "iskeyspressed.hpp"
typedef enum { SYM, CODE, BUTTON } KeyType_t;
Index: stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
@@ -2,7 +2,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <string>
+#include <cstring>
#include <map>
#include <list>
#include <vector>
Index: stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
@@ -1,6 +1,6 @@
#include "stardict_dictdotcn.h"
#include <glib/gi18n.h>
-#include <string>
+#include <cstring>
#include <list>
#ifdef _WIN32
Index: stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
===================================================================
--- 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,6 +1,7 @@
#include "stardict_espeak.h"
#include <espeak/speak_lib.h>
#include <glib/gi18n.h>
+#include <cstring>
static const StarDictPluginSystemInfo *plugin_info = NULL;
static std::string voice_engine;
Index: stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
@@ -1,7 +1,8 @@
#include "stardict_gucharmap.h"
#include <glib/gi18n.h>
#include <gucharmap/gucharmap.h>
-#include <string>
+#include <stdlib.h>
+#include <cstring>
static char *build_dictdata(char type, const char *definition)
{
Index: stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
===================================================================
--- 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,5 +1,7 @@
#include "stardict_html_parsedata.h"
#include <glib/gi18n.h>
+#include <cstring>
+#include <stdlib.h>
#ifdef _WIN32
#include <windows.h>
Index: stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-man-plugin/stardict_man.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp
@@ -1,5 +1,6 @@
#include "stardict_man.h"
#include <glib/gi18n.h>
+#include <cstring>
#include <string>
static const StarDictPluginSystemInfo *plugin_info = NULL;
Index: stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
@@ -1,4 +1,5 @@
#include "stardict_powerword_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
Index: stardict-3.0.1/src/Makefile.am
===================================================================
--- stardict-3.0.1.orig/src/Makefile.am
+++ stardict-3.0.1/src/Makefile.am
@@ -14,6 +14,8 @@ SUBDIRS = $(LOCAL_SIGCPP_DIR) lib pixmap
bin_PROGRAMS = stardict
+DEFAULT_INCLUDES = -I$(top_builddir)
+
INCLUDES = \
$(STARDICT_CFLAGS) \
$(LOCAL_SIGCPP_INCLUDE) \
Index: stardict-3.0.1/src/config_file.hpp
===================================================================
--- stardict-3.0.1.orig/src/config_file.hpp
+++ stardict-3.0.1/src/config_file.hpp
@@ -5,7 +5,7 @@
#include <list>
#include <string>
-#include "sigc++/sigc++.h"
+#include <sigc++/sigc++.h>
class config_file;
Index: stardict-3.0.1/src/gconf_file.cpp
===================================================================
--- stardict-3.0.1.orig/src/gconf_file.cpp
+++ stardict-3.0.1/src/gconf_file.cpp
@@ -22,6 +22,7 @@
# include "config.h"
#endif
+#include <memory>
#include <glib/gi18n.h>
#include "gconf_file.hpp"
Index: stardict-3.0.1/src/gtk_iskeyspressed.cpp
===================================================================
--- stardict-3.0.1.orig/src/gtk_iskeyspressed.cpp
+++ stardict-3.0.1/src/gtk_iskeyspressed.cpp
@@ -96,8 +96,7 @@ bool gtk_hotkeys::is_pressed(void)
GDK_BUTTON4_MASK = 1 << 11,
GDK_BUTTON5_MASK = 1 << 12,
*/
-
- mask = GdkModifierType(guint(mask) & (1<<13)-1);
+ mask = GdkModifierType(guint(mask) & ((1<<13)-1));
mask =
GdkModifierType(guint(mask) & ~(GDK_LOCK_MASK | GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
Index: stardict-3.0.1/src/inifile.cpp
===================================================================
--- stardict-3.0.1.orig/src/inifile.cpp
+++ stardict-3.0.1/src/inifile.cpp
@@ -26,6 +26,7 @@
#include <cerrno>
#include <cstring>
#include <cstdio>
+#include <stdlib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
Index: stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
@@ -1,6 +1,8 @@
#include "stardict_qqwry.h"
#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#include <cstring>
+#include <stdlib.h>
#include <string>
#ifdef _WIN32
Index: stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
@@ -1,5 +1,7 @@
#include "stardict_update_info.h"
#include <glib/gi18n.h>
+#include <cstring>
+#include <stdlib.h>
#ifdef _WIN32
#include <windows.h>
Index: stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
@@ -1,5 +1,6 @@
#include "stardict_wiki2xml.h"
#include "WIKI2XML.h"
+#include <cstring>
#include <glib.h>
std::string wiki2xml(std::string &str)
Index: stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
@@ -1,5 +1,6 @@
#include "stardict_wiki_parsedata.h"
#include "stardict_wiki2xml.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
Index: stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
===================================================================
--- 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,7 +1,7 @@
#include "court_widget.h"
#include <math.h>
#include <list>
-
+#include <cstring>
wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false)
{
Index: stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
===================================================================
--- 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,6 +1,7 @@
#include "stardict_wordnet.h"
#include "court_widget.h"
#include <glib/gi18n.h>
+#include <cstring>
#ifdef _WIN32
#include <windows.h>
Index: stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
===================================================================
--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
@@ -1,4 +1,5 @@
#include "stardict_wordnet_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
Index: stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
===================================================================
--- 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,4 +1,5 @@
#include "stardict_xdxf_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
Index: stardict-3.0.1/tests/t_config_file.cpp
===================================================================
--- stardict-3.0.1.orig/tests/t_config_file.cpp
+++ stardict-3.0.1/tests/t_config_file.cpp
@@ -2,6 +2,7 @@
# include "config.h"
#endif
+#include <memory>
#include <cerrno>
#include <cstdio>
#include <cstdlib>
Index: stardict-3.0.1/tests/t_xml.cpp
===================================================================
--- stardict-3.0.1.orig/tests/t_xml.cpp
+++ stardict-3.0.1/tests/t_xml.cpp
@@ -3,6 +3,7 @@
#endif
#include <glib.h>
+#include <cstring>
#include <cstdlib>
#include <string>
Index: stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
===================================================================
--- 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
@@ -3,6 +3,7 @@
#include <glib/gi18n.h>
#include <enchant.h>
#include <pango/pango.h>
+#include <cstring>
#include <string>
#include <vector>
View Git Blame Copy Permalink