rpms/stardict/devel stardict-3.0.1.gcc43.patch, 1.2, 1.3 stardict.spec, 1.46, 1.47
Hu Zheng (zhu)
fedora-extras-commits at redhat.com
Thu Feb 28 07:33:46 UTC 2008
- Previous message (by thread): rpms/gnome-scan/devel .cvsignore, 1.3, 1.4 gnome-scan.spec, 1.5, 1.6 sources, 1.4, 1.5 gnome-scan-latest_gegl.patch, 1.2, NONE
- Next message (by thread): rpms/stardict/devel stardict.spec,1.47,1.48
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: zhu
Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31806
Modified Files:
stardict-3.0.1.gcc43.patch stardict.spec
Log Message:
ok
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stardict-3.0.1.gcc43.patch 27 Feb 2008 07:46:24 -0000 1.2
+++ stardict-3.0.1.gcc43.patch 28 Feb 2008 07:33:42 -0000 1.3
@@ -1,6 +1,16 @@
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/Makefile.am.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/src/Makefile.am 2008-02-26 19:35:12.000000000 +0900
+@@ -14,6 +14,8 @@
+
+ bin_PROGRAMS = stardict
+
++DEFAULT_INCLUDES = -I$(top_builddir)
++
+ INCLUDES = \
+ $(STARDICT_CFLAGS) \
+ $(LOCAL_SIGCPP_INCLUDE) \
+--- stardict-3.0.1/src/config_file.hpp.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/src/config_file.hpp 2008-02-26 19:35:00.000000000 +0900
@@ -5,7 +5,7 @@
#include <list>
#include <string>
@@ -10,9 +20,8 @@
class config_file;
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/gconf_file.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/src/gconf_file.cpp 2008-02-26 19:37:18.000000000 +0900
@@ -22,6 +22,7 @@
# include "config.h"
#endif
@@ -21,9 +30,8 @@
#include <glib/gi18n.h>
#include "gconf_file.hpp"
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/gtk_iskeyspressed.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/src/gtk_iskeyspressed.cpp 2008-02-26 19:37:35.000000000 +0900
@@ -97,7 +97,7 @@
GDK_BUTTON5_MASK = 1 << 12,
*/
@@ -33,9 +41,8 @@
mask =
GdkModifierType(guint(mask) & ~(GDK_LOCK_MASK | GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/inifile.cpp.gcc43 2007-08-01 18:43:00.000000000 +0900
++++ stardict-3.0.1/src/inifile.cpp 2008-02-26 19:37:51.000000000 +0900
@@ -28,6 +28,7 @@
#include <cstdio>
#include <glib/gi18n.h>
@@ -44,9 +51,8 @@
#include "utils.h"
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/common.cpp.gcc43 2007-09-25 11:27:24.000000000 +0900
++++ stardict-3.0.1/src/lib/common.cpp 2008-02-26 19:34:01.000000000 +0900
@@ -24,6 +24,8 @@
# include "config.h"
#endif
@@ -56,9 +62,8 @@
#include "common.hpp"
static void parse_description(const char *p, long len, std::string &description)
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/data.cpp.gcc43 2007-09-21 10:09:52.000000000 +0900
++++ stardict-3.0.1/src/lib/data.cpp 2008-02-26 19:33:38.000000000 +0900
@@ -26,6 +26,7 @@
#include "data.hpp"
@@ -67,9 +72,8 @@
DictBase::DictBase()
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/http_client.cpp.gcc43 2007-09-06 17:29:30.000000000 +0900
++++ stardict-3.0.1/src/lib/http_client.cpp 2008-02-26 19:34:27.000000000 +0900
@@ -4,6 +4,7 @@
#include "http_client.h"
@@ -78,9 +82,8 @@
sigc::signal<void, HttpClient *, const char *> HttpClient::on_error_;
sigc::signal<void, HttpClient *> HttpClient::on_response_;
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/pluginmanager.cpp.gcc43 2007-10-10 12:26:45.000000000 +0900
++++ stardict-3.0.1/src/lib/pluginmanager.cpp 2008-02-26 19:34:36.000000000 +0900
@@ -1,6 +1,7 @@
#include "pluginmanager.h"
#include "file.hpp"
@@ -89,9 +92,8 @@
StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
plugin_filename(filename), module(module_), configure_func(configure_func_)
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/stardict_client.cpp.gcc43 2007-10-31 17:32:11.000000000 +0900
++++ stardict-3.0.1/src/lib/stardict_client.cpp 2008-02-26 19:34:16.000000000 +0900
@@ -25,6 +25,8 @@
#include <glib.h>
#include <glib/gi18n.h>
@@ -101,9 +103,8 @@
#include "sockets.hpp"
#include "md5.h"
#include "getuint32.h"
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/stddict.cpp.gcc43 2007-10-30 18:06:07.000000000 +0900
++++ stardict-3.0.1/src/lib/stddict.cpp 2008-02-26 19:33:46.000000000 +0900
@@ -28,6 +28,7 @@
# include "config.h"
#endif
@@ -112,9 +113,8 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/lib/treedict.cpp.gcc43 2007-09-21 10:09:52.000000000 +0900
++++ stardict-3.0.1/src/lib/treedict.cpp 2008-02-26 19:33:52.000000000 +0900
@@ -25,6 +25,7 @@
# include "config.h"
#endif
@@ -123,21 +123,8 @@
#include "file.hpp"
#include "getuint32.h"
-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-27 15:02:23.000000000 +0800
-@@ -14,6 +14,8 @@
-
- bin_PROGRAMS = stardict
-
-+DEFAULT_INCLUDES = -I$(top_builddir)
-+
- INCLUDES = \
- $(STARDICT_CFLAGS) \
- $(LOCAL_SIGCPP_INCLUDE) \
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/pangoview.cpp.gcc43 2007-09-25 16:11:48.000000000 +0900
++++ stardict-3.0.1/src/pangoview.cpp 2008-02-26 19:37:02.000000000 +0900
@@ -22,6 +22,7 @@
# include "config.h"
#endif
@@ -146,9 +133,8 @@
#include "gtktextviewpango.h"
#include "utils.h"
#include "skin.h"//for SkinCursor definition
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/src/utils.cpp.gcc43 2007-10-22 11:25:02.000000000 +0900
++++ stardict-3.0.1/src/utils.cpp 2008-02-26 19:36:01.000000000 +0900
@@ -22,6 +22,7 @@
# include "config.h"
#endif
@@ -157,20 +143,19 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <cstdlib>
-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>
+--- stardict-3.0.1/src/x11_iskeyspressed.hpp.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/src/x11_iskeyspressed.hpp 2008-02-27 16:16:17.000000000 +0900
+@@ -5,6 +5,8 @@
#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-27 15:02:23.000000000 +0800
+
++#include <memory>
++
+ #include "iskeyspressed.hpp"
+
+ typedef enum { SYM, CODE, BUTTON } KeyType_t;
+--- stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp.gcc43 2007-09-21 10:09:53.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-02-26 19:39:34.000000000 +0900
@@ -2,6 +2,7 @@
#include <glib.h>
#include <glib/gi18n.h>
@@ -179,9 +164,8 @@
#include <string>
#include <map>
#include <list>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp.gcc43 2007-10-10 18:28:29.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-02-26 19:38:56.000000000 +0900
@@ -1,5 +1,6 @@
#include "stardict_dictdotcn.h"
#include <glib/gi18n.h>
@@ -189,9 +173,8 @@
#include <string>
#include <list>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp.gcc43 2007-09-19 17:27:18.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-02-26 19:45:43.000000000 +0900
@@ -1,6 +1,7 @@
#include "stardict_espeak.h"
#include <espeak/speak_lib.h>
@@ -200,9 +183,8 @@
static const StarDictPluginSystemInfo *plugin_info = NULL;
static std::string voice_engine;
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.gcc43 2007-08-31 16:10:41.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-02-26 19:45:27.000000000 +0900
@@ -1,6 +1,8 @@
#include "stardict_gucharmap.h"
#include <glib/gi18n.h>
@@ -212,9 +194,8 @@
#include <string>
static char *build_dictdata(char type, const char *definition)
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp.gcc43 2007-09-13 16:51:55.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-02-26 19:41:11.000000000 +0900
@@ -1,5 +1,7 @@
#include "stardict_html_parsedata.h"
#include <glib/gi18n.h>
@@ -223,9 +204,8 @@
#ifdef _WIN32
#include <windows.h>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp.gcc43 2007-09-19 17:30:54.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-02-26 19:40:22.000000000 +0900
@@ -1,5 +1,6 @@
#include "stardict_man.h"
#include <glib/gi18n.h>
@@ -233,18 +213,16 @@
#include <string>
static const StarDictPluginSystemInfo *plugin_info = NULL;
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp.gcc43 2007-10-25 17:16:37.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-02-26 19:44:06.000000000 +0900
@@ -1,4 +1,5 @@
#include "stardict_powerword_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp.gcc43 2007-11-02 17:41:26.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-02-26 19:45:57.000000000 +0900
@@ -1,6 +1,8 @@
#include "stardict_qqwry.h"
#include <glib/gi18n.h>
@@ -254,9 +232,8 @@
#include <string>
#ifdef _WIN32
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp.gcc43 2007-09-19 17:29:21.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-02-26 19:45:13.000000000 +0900
@@ -3,6 +3,7 @@
#include <glib/gi18n.h>
#include <enchant.h>
@@ -265,9 +242,8 @@
#include <string>
#include <vector>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp.gcc43 2007-09-19 17:34:36.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-02-26 19:40:46.000000000 +0900
@@ -1,5 +1,7 @@
#include "stardict_update_info.h"
#include <glib/gi18n.h>
@@ -276,9 +252,8 @@
#ifdef _WIN32
#include <windows.h>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp.gcc43 2007-07-10 16:16:15.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-02-26 19:45:00.000000000 +0900
@@ -1,5 +1,6 @@
#include "stardict_wiki2xml.h"
#include "WIKI2XML.h"
@@ -286,9 +261,8 @@
#include <glib.h>
std::string wiki2xml(std::string &str)
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp.gcc43 2007-08-31 15:41:21.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-02-26 19:44:40.000000000 +0900
@@ -1,5 +1,6 @@
#include "stardict_wiki_parsedata.h"
#include "stardict_wiki2xml.h"
@@ -296,9 +270,8 @@
#include <glib/gi18n.h>
#ifdef _WIN32
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp.gcc43 2007-10-18 10:36:22.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-02-26 19:42:25.000000000 +0900
@@ -1,6 +1,7 @@
#include "court_widget.h"
#include <math.h>
@@ -307,9 +280,8 @@
wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false)
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp.gcc43 2007-10-15 12:32:04.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-02-26 19:42:05.000000000 +0900
@@ -1,6 +1,7 @@
#include "stardict_wordnet.h"
#include "court_widget.h"
@@ -318,18 +290,16 @@
#ifdef _WIN32
#include <windows.h>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp.gcc43 2007-10-10 18:39:10.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-02-26 19:43:21.000000000 +0900
@@ -1,4 +1,5 @@
#include "stardict_wordnet_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp.gcc43 2007-08-31 15:41:54.000000000 +0900
++++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-02-26 19:41:36.000000000 +0900
@@ -1,5 +1,6 @@
#include "stardict_xdxf_parsedata.h"
#include <glib/gi18n.h>
@@ -337,9 +307,8 @@
#ifdef _WIN32
#include <windows.h>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/tests/t_config_file.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/tests/t_config_file.cpp 2008-02-26 19:38:14.000000000 +0900
@@ -2,6 +2,7 @@
# include "config.h"
#endif
@@ -348,9 +317,8 @@
#include <cerrno>
#include <cstdio>
#include <cstdlib>
-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-27 15:02:23.000000000 +0800
+--- stardict-3.0.1/tests/t_xml.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
++++ stardict-3.0.1/tests/t_xml.cpp 2008-02-26 19:38:04.000000000 +0900
@@ -3,6 +3,7 @@
#endif
Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- stardict.spec 27 Feb 2008 07:46:24 -0000 1.46
+++ stardict.spec 28 Feb 2008 07:33:42 -0000 1.47
@@ -10,7 +10,7 @@
License: GPLv3
URL: http://stardict.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0: stardict-3.0.1.gcc43.patch
+Patch0: stardict-3.0.1-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libgnome >= 2.2.0
@@ -43,12 +43,13 @@
%setup -q
%patch0 -p1 -b .gcc43
-%build
+# Remove unneeded sigc++ header files to make it sure
+# that we are using system-wide libsigc++
+# (and these does not work on gcc43)
+#
+find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f
-aclocal -I m4
-automake --add-missing --copy
-autoconf
-automake
+%build
%configure --disable-schemas-install --disable-festival
make
@@ -91,8 +92,8 @@
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 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.1-5
+- More gcc43 fix
* Wed Feb 27 2008 Hu Zheng <zhu at redhat.com> - 3.0.1-4
- small fix.
- Previous message (by thread): rpms/gnome-scan/devel .cvsignore, 1.3, 1.4 gnome-scan.spec, 1.5, 1.6 sources, 1.4, 1.5 gnome-scan-latest_gegl.patch, 1.2, NONE
- Next message (by thread): rpms/stardict/devel stardict.spec,1.47,1.48
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list