rpms/stardict/devel stardict-3.0.1.gcc43.patch, 1.1, 1.2 stardict.spec, 1.45, 1.46
Hu Zheng (zhu)
fedora-extras-commits at redhat.com
Wed Feb 27 07:46:29 UTC 2008
Author: zhu
Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31511
Modified Files:
stardict-3.0.1.gcc43.patch stardict.spec
Log Message:
build fix
stardict-3.0.1.gcc43.patch:
Index: stardict-3.0.1.gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict-3.0.1.gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stardict-3.0.1.gcc43.patch 26 Feb 2008 10:54:09 -0000 1.1
+++ stardict-3.0.1.gcc43.patch 27 Feb 2008 07:46:24 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ru stardict-3.0.1/src/config_file.hpp stardict-3.0.1.fix/src/config_file.hpp
+diff -ur stardict-3.0.1/src/config_file.hpp stardict-3.0.1.fix/src/config_file.hpp
--- stardict-3.0.1/src/config_file.hpp 2007-07-10 15:16:04.000000000 +0800
-+++ stardict-3.0.1.fix/src/config_file.hpp 2008-02-26 18:35:00.000000000 +0800
++++ stardict-3.0.1.fix/src/config_file.hpp 2008-02-27 15:02:23.000000000 +0800
@@ -5,7 +5,7 @@
#include <list>
#include <string>
@@ -10,9 +10,9 @@
class config_file;
-diff -ru stardict-3.0.1/src/gconf_file.cpp stardict-3.0.1.fix/src/gconf_file.cpp
+diff -ur stardict-3.0.1/src/gconf_file.cpp stardict-3.0.1.fix/src/gconf_file.cpp
--- stardict-3.0.1/src/gconf_file.cpp 2007-07-10 15:16:04.000000000 +0800
-+++ stardict-3.0.1.fix/src/gconf_file.cpp 2008-02-26 18:37:18.000000000 +0800
++++ stardict-3.0.1.fix/src/gconf_file.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -22,6 +22,7 @@
# include "config.h"
#endif
@@ -21,9 +21,9 @@
#include <glib/gi18n.h>
#include "gconf_file.hpp"
-diff -ru stardict-3.0.1/src/gtk_iskeyspressed.cpp stardict-3.0.1.fix/src/gtk_iskeyspressed.cpp
+diff -ur stardict-3.0.1/src/gtk_iskeyspressed.cpp stardict-3.0.1.fix/src/gtk_iskeyspressed.cpp
--- stardict-3.0.1/src/gtk_iskeyspressed.cpp 2007-07-10 15:16:04.000000000 +0800
-+++ stardict-3.0.1.fix/src/gtk_iskeyspressed.cpp 2008-02-26 18:37:35.000000000 +0800
++++ stardict-3.0.1.fix/src/gtk_iskeyspressed.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -97,7 +97,7 @@
GDK_BUTTON5_MASK = 1 << 12,
*/
@@ -33,9 +33,9 @@
mask =
GdkModifierType(guint(mask) & ~(GDK_LOCK_MASK | GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
-diff -ru stardict-3.0.1/src/inifile.cpp stardict-3.0.1.fix/src/inifile.cpp
+diff -ur stardict-3.0.1/src/inifile.cpp stardict-3.0.1.fix/src/inifile.cpp
--- stardict-3.0.1/src/inifile.cpp 2007-08-01 17:43:00.000000000 +0800
-+++ stardict-3.0.1.fix/src/inifile.cpp 2008-02-26 18:37:51.000000000 +0800
++++ stardict-3.0.1.fix/src/inifile.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -28,6 +28,7 @@
#include <cstdio>
#include <glib/gi18n.h>
@@ -44,9 +44,9 @@
#include "utils.h"
-diff -ru stardict-3.0.1/src/lib/common.cpp stardict-3.0.1.fix/src/lib/common.cpp
+diff -ur stardict-3.0.1/src/lib/common.cpp stardict-3.0.1.fix/src/lib/common.cpp
--- stardict-3.0.1/src/lib/common.cpp 2007-09-25 10:27:24.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/common.cpp 2008-02-26 18:34:01.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/common.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -24,6 +24,8 @@
# include "config.h"
#endif
@@ -56,9 +56,9 @@
#include "common.hpp"
static void parse_description(const char *p, long len, std::string &description)
-diff -ru stardict-3.0.1/src/lib/data.cpp stardict-3.0.1.fix/src/lib/data.cpp
+diff -ur stardict-3.0.1/src/lib/data.cpp stardict-3.0.1.fix/src/lib/data.cpp
--- stardict-3.0.1/src/lib/data.cpp 2007-09-21 09:09:52.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/data.cpp 2008-02-26 18:33:38.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/data.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -26,6 +26,7 @@
#include "data.hpp"
@@ -67,9 +67,9 @@
DictBase::DictBase()
-diff -ru stardict-3.0.1/src/lib/http_client.cpp stardict-3.0.1.fix/src/lib/http_client.cpp
+diff -ur stardict-3.0.1/src/lib/http_client.cpp stardict-3.0.1.fix/src/lib/http_client.cpp
--- stardict-3.0.1/src/lib/http_client.cpp 2007-09-06 16:29:30.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/http_client.cpp 2008-02-26 18:34:27.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/http_client.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -4,6 +4,7 @@
#include "http_client.h"
@@ -78,9 +78,9 @@
sigc::signal<void, HttpClient *, const char *> HttpClient::on_error_;
sigc::signal<void, HttpClient *> HttpClient::on_response_;
-diff -ru stardict-3.0.1/src/lib/pluginmanager.cpp stardict-3.0.1.fix/src/lib/pluginmanager.cpp
+diff -ur stardict-3.0.1/src/lib/pluginmanager.cpp stardict-3.0.1.fix/src/lib/pluginmanager.cpp
--- stardict-3.0.1/src/lib/pluginmanager.cpp 2007-10-10 11:26:45.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/pluginmanager.cpp 2008-02-26 18:34:36.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/pluginmanager.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,6 +1,7 @@
#include "pluginmanager.h"
#include "file.hpp"
@@ -89,9 +89,9 @@
StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
plugin_filename(filename), module(module_), configure_func(configure_func_)
-diff -ru stardict-3.0.1/src/lib/stardict_client.cpp stardict-3.0.1.fix/src/lib/stardict_client.cpp
+diff -ur stardict-3.0.1/src/lib/stardict_client.cpp stardict-3.0.1.fix/src/lib/stardict_client.cpp
--- stardict-3.0.1/src/lib/stardict_client.cpp 2007-10-31 16:32:11.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/stardict_client.cpp 2008-02-26 18:34:16.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/stardict_client.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -25,6 +25,8 @@
#include <glib.h>
#include <glib/gi18n.h>
@@ -101,9 +101,9 @@
#include "sockets.hpp"
#include "md5.h"
#include "getuint32.h"
-diff -ru stardict-3.0.1/src/lib/stddict.cpp stardict-3.0.1.fix/src/lib/stddict.cpp
+diff -ur stardict-3.0.1/src/lib/stddict.cpp stardict-3.0.1.fix/src/lib/stddict.cpp
--- stardict-3.0.1/src/lib/stddict.cpp 2007-10-30 17:06:07.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/stddict.cpp 2008-02-26 18:33:46.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/stddict.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -28,6 +28,7 @@
# include "config.h"
#endif
@@ -112,9 +112,9 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-diff -ru stardict-3.0.1/src/lib/treedict.cpp stardict-3.0.1.fix/src/lib/treedict.cpp
+diff -ur stardict-3.0.1/src/lib/treedict.cpp stardict-3.0.1.fix/src/lib/treedict.cpp
--- stardict-3.0.1/src/lib/treedict.cpp 2007-09-21 09:09:52.000000000 +0800
-+++ stardict-3.0.1.fix/src/lib/treedict.cpp 2008-02-26 18:33:52.000000000 +0800
++++ stardict-3.0.1.fix/src/lib/treedict.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -25,6 +25,7 @@
# include "config.h"
#endif
@@ -123,9 +123,9 @@
#include "file.hpp"
#include "getuint32.h"
-diff -ru stardict-3.0.1/src/Makefile.am stardict-3.0.1.fix/src/Makefile.am
+diff -ur stardict-3.0.1/src/Makefile.am stardict-3.0.1.fix/src/Makefile.am
--- stardict-3.0.1/src/Makefile.am 2007-07-10 15:16:04.000000000 +0800
-+++ stardict-3.0.1.fix/src/Makefile.am 2008-02-26 18:35:12.000000000 +0800
++++ stardict-3.0.1.fix/src/Makefile.am 2008-02-27 15:02:23.000000000 +0800
@@ -14,6 +14,8 @@
bin_PROGRAMS = stardict
@@ -135,9 +135,9 @@
INCLUDES = \
$(STARDICT_CFLAGS) \
$(LOCAL_SIGCPP_INCLUDE) \
-diff -ru stardict-3.0.1/src/pangoview.cpp stardict-3.0.1.fix/src/pangoview.cpp
+diff -ur stardict-3.0.1/src/pangoview.cpp stardict-3.0.1.fix/src/pangoview.cpp
--- stardict-3.0.1/src/pangoview.cpp 2007-09-25 15:11:48.000000000 +0800
-+++ stardict-3.0.1.fix/src/pangoview.cpp 2008-02-26 18:37:02.000000000 +0800
++++ stardict-3.0.1.fix/src/pangoview.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -22,6 +22,7 @@
# include "config.h"
#endif
@@ -146,9 +146,9 @@
#include "gtktextviewpango.h"
#include "utils.h"
#include "skin.h"//for SkinCursor definition
-diff -ru stardict-3.0.1/src/utils.cpp stardict-3.0.1.fix/src/utils.cpp
+diff -ur stardict-3.0.1/src/utils.cpp stardict-3.0.1.fix/src/utils.cpp
--- stardict-3.0.1/src/utils.cpp 2007-10-22 10:25:02.000000000 +0800
-+++ stardict-3.0.1.fix/src/utils.cpp 2008-02-26 18:36:01.000000000 +0800
++++ stardict-3.0.1.fix/src/utils.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -22,6 +22,7 @@
# include "config.h"
#endif
@@ -157,9 +157,20 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <cstdlib>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp stardict-3.0.1.fix/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
+diff -ur stardict-3.0.1/src/x11_iskeyspressed.hpp stardict-3.0.1.fix/src/x11_iskeyspressed.hpp
+--- stardict-3.0.1/src/x11_iskeyspressed.hpp 2007-07-10 15:16:04.000000000 +0800
++++ stardict-3.0.1.fix/src/x11_iskeyspressed.hpp 2008-02-27 15:04:45.000000000 +0800
+@@ -1,6 +1,7 @@
+ #ifndef _X11_ISKEYSPRESSED_HPP_
+ #define _X11_ISKEYSPRESSED_HPP_
+
++#include <memory>
+ #include <gdk/gdkx.h>
+ #include <X11/keysym.h>
+ #include <gtk/gtk.h>
+diff -ur stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp stardict-3.0.1.fix/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
--- stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2007-09-21 09:09:53.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-02-26 18:39:34.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -2,6 +2,7 @@
#include <glib.h>
#include <glib/gi18n.h>
@@ -168,9 +179,9 @@
#include <string>
#include <map>
#include <list>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp stardict-3.0.1.fix/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp stardict-3.0.1.fix/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
--- stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2007-10-10 17:28:29.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-02-26 18:38:56.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,6 @@
#include "stardict_dictdotcn.h"
#include <glib/gi18n.h>
@@ -178,9 +189,9 @@
#include <string>
#include <list>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.1.fix/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.1.fix/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
--- stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2007-09-19 16:27:18.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-02-26 18:45:43.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,6 +1,7 @@
#include "stardict_espeak.h"
#include <espeak/speak_lib.h>
@@ -189,9 +200,9 @@
static const StarDictPluginSystemInfo *plugin_info = NULL;
static std::string voice_engine;
-diff -ru stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp stardict-3.0.1.fix/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp stardict-3.0.1.fix/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
--- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2007-08-31 15:10:41.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-02-26 18:45:27.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,6 +1,8 @@
#include "stardict_gucharmap.h"
#include <glib/gi18n.h>
@@ -201,9 +212,9 @@
#include <string>
static char *build_dictdata(char type, const char *definition)
-diff -ru stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
--- stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2007-09-13 15:51:55.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-02-26 18:41:11.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,7 @@
#include "stardict_html_parsedata.h"
#include <glib/gi18n.h>
@@ -212,9 +223,9 @@
#ifdef _WIN32
#include <windows.h>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp stardict-3.0.1.fix/stardict-plugins/stardict-man-plugin/stardict_man.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp stardict-3.0.1.fix/stardict-plugins/stardict-man-plugin/stardict_man.cpp
--- stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp 2007-09-19 16:30:54.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-02-26 18:40:22.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,6 @@
#include "stardict_man.h"
#include <glib/gi18n.h>
@@ -222,18 +233,18 @@
#include <string>
static const StarDictPluginSystemInfo *plugin_info = NULL;
-diff -ru stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
--- stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2007-10-25 16:16:37.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-02-26 18:44:06.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,4 +1,5 @@
#include "stardict_powerword_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
-diff -ru stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp stardict-3.0.1.fix/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp stardict-3.0.1.fix/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
--- stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2007-11-02 16:41:26.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-02-26 18:45:57.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,6 +1,8 @@
#include "stardict_qqwry.h"
#include <glib/gi18n.h>
@@ -243,9 +254,9 @@
#include <string>
#ifdef _WIN32
-diff -ru stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp stardict-3.0.1.fix/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp stardict-3.0.1.fix/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
--- stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2007-09-19 16:29:21.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-02-26 18:45:13.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -3,6 +3,7 @@
#include <glib/gi18n.h>
#include <enchant.h>
@@ -254,9 +265,9 @@
#include <string>
#include <vector>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp stardict-3.0.1.fix/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp stardict-3.0.1.fix/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp
--- stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2007-09-19 16:34:36.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-02-26 18:40:46.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,7 @@
#include "stardict_update_info.h"
#include <glib/gi18n.h>
@@ -265,9 +276,9 @@
#ifdef _WIN32
#include <windows.h>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
--- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2007-07-10 15:16:15.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-02-26 18:45:00.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,6 @@
#include "stardict_wiki2xml.h"
#include "WIKI2XML.h"
@@ -275,9 +286,9 @@
#include <glib.h>
std::string wiki2xml(std::string &str)
-diff -ru stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
--- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2007-08-31 14:41:21.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-02-26 18:44:40.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,6 @@
#include "stardict_wiki_parsedata.h"
#include "stardict_wiki2xml.h"
@@ -285,9 +296,9 @@
#include <glib/gi18n.h>
#ifdef _WIN32
-diff -ru stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2007-10-18 09:36:22.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-02-26 18:42:25.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,6 +1,7 @@
#include "court_widget.h"
#include <math.h>
@@ -296,9 +307,9 @@
wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false)
-diff -ru stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2007-10-15 11:32:04.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-02-26 18:42:05.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,6 +1,7 @@
#include "stardict_wordnet.h"
#include "court_widget.h"
@@ -307,18 +318,18 @@
#ifdef _WIN32
#include <windows.h>
-diff -ru stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2007-10-10 17:39:10.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-02-26 18:43:21.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,4 +1,5 @@
#include "stardict_wordnet_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
-diff -ru stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
+diff -ur stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp stardict-3.0.1.fix/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
--- stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2007-08-31 14:41:54.000000000 +0800
-+++ stardict-3.0.1.fix/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-02-26 18:41:36.000000000 +0800
++++ stardict-3.0.1.fix/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -1,5 +1,6 @@
#include "stardict_xdxf_parsedata.h"
#include <glib/gi18n.h>
@@ -326,9 +337,9 @@
#ifdef _WIN32
#include <windows.h>
-diff -ru stardict-3.0.1/tests/t_config_file.cpp stardict-3.0.1.fix/tests/t_config_file.cpp
+diff -ur stardict-3.0.1/tests/t_config_file.cpp stardict-3.0.1.fix/tests/t_config_file.cpp
--- stardict-3.0.1/tests/t_config_file.cpp 2007-07-10 15:16:04.000000000 +0800
-+++ stardict-3.0.1.fix/tests/t_config_file.cpp 2008-02-26 18:38:14.000000000 +0800
++++ stardict-3.0.1.fix/tests/t_config_file.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -2,6 +2,7 @@
# include "config.h"
#endif
@@ -337,9 +348,9 @@
#include <cerrno>
#include <cstdio>
#include <cstdlib>
-diff -ru stardict-3.0.1/tests/t_xml.cpp stardict-3.0.1.fix/tests/t_xml.cpp
+diff -ur stardict-3.0.1/tests/t_xml.cpp stardict-3.0.1.fix/tests/t_xml.cpp
--- stardict-3.0.1/tests/t_xml.cpp 2007-07-10 15:16:04.000000000 +0800
-+++ stardict-3.0.1.fix/tests/t_xml.cpp 2008-02-26 18:38:04.000000000 +0800
++++ stardict-3.0.1.fix/tests/t_xml.cpp 2008-02-27 15:02:23.000000000 +0800
@@ -3,6 +3,7 @@
#endif
Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- stardict.spec 27 Feb 2008 06:14:03 -0000 1.45
+++ stardict.spec 27 Feb 2008 07:46:24 -0000 1.46
@@ -5,7 +5,7 @@
Name: %{name}
Summary: A powerful dictionary platform written in GTK+2
Version: %{version}
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Applications/System
License: GPLv3
URL: http://stardict.sourceforge.net
@@ -45,6 +45,7 @@
%build
+aclocal -I m4
automake --add-missing --copy
autoconf
automake
@@ -90,6 +91,9 @@
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%changelog
+* Wed Feb 27 2008 Hu Zheng <zhu at redhat.com> - 3.0.1-5
+- Build fix.
+
* Wed Feb 27 2008 Hu Zheng <zhu at redhat.com> - 3.0.1-4
- small fix.
More information about the fedora-extras-commits
mailing list