From 22ad7219b6e0d34d6b84bfbac8691fcca2a2120b Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Thu, 11 Feb 2010 14:54:00 +0800 Subject: [PATCH] [stardict] disable check X header --- stardict/patches/001-fix-compile-error.patch | 16 +-- .../002-dont-need-hotkey-in-nanonote.patch | 98 +++++++++++++++++-- 2 files changed, 100 insertions(+), 14 deletions(-) diff --git a/stardict/patches/001-fix-compile-error.patch b/stardict/patches/001-fix-compile-error.patch index fc264c4..4b82bea 100644 --- a/stardict/patches/001-fix-compile-error.patch +++ b/stardict/patches/001-fix-compile-error.patch @@ -8,10 +8,10 @@ From: Xiangfu Liu src/gconf_file.cpp | 2 ++ src/inifile.cpp | 1 + src/lib/common.cpp | 2 ++ - src/lib/data.cpp | 1 + + src/lib/data.cpp | 2 ++ src/lib/http_client.cpp | 1 + src/lib/pluginmanager.cpp | 2 +- - src/lib/stardict_client.cpp | 1 + + src/lib/stardict_client.cpp | 2 ++ src/lib/treedict.cpp | 1 + src/pangoview.cpp | 2 ++ src/prefsdlg.cpp | 1 + @@ -35,7 +35,7 @@ From: Xiangfu Liu .../stardict_xdxf_parsedata.cpp | 1 + tests/t_config_file.cpp | 1 + tests/t_xml.cpp | 1 + - 30 files changed, 38 insertions(+), 6 deletions(-) + 30 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/gconf_file.cpp b/src/gconf_file.cpp @@ -77,13 +77,14 @@ index 6575ad9..29faf9e 100644 static void parse_description(const char *p, long len, std::string &description) diff --git a/src/lib/data.cpp b/src/lib/data.cpp -index 45c7d1a..1b29ec3 100644 +index 45c7d1a..a428b37 100644 --- a/src/lib/data.cpp +++ b/src/lib/data.cpp -@@ -22,6 +22,7 @@ +@@ -22,6 +22,8 @@ # include "config.h" #endif ++#include +#include #include "kmp.h" @@ -113,13 +114,14 @@ index de3e92d..28a46c4 100644 StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_): plugin_filename(filename), module(module_), configure_func(configure_func_) diff --git a/src/lib/stardict_client.cpp b/src/lib/stardict_client.cpp -index dcae5ce..c3d2511 100644 +index dcae5ce..407a907 100644 --- a/src/lib/stardict_client.cpp +++ b/src/lib/stardict_client.cpp -@@ -25,6 +25,7 @@ +@@ -25,6 +25,8 @@ #include #include ++#include +#include #include "sockets.hpp" #include "md5.h" diff --git a/stardict/patches/002-dont-need-hotkey-in-nanonote.patch b/stardict/patches/002-dont-need-hotkey-in-nanonote.patch index 42430ca..3a50110 100644 --- a/stardict/patches/002-dont-need-hotkey-in-nanonote.patch +++ b/stardict/patches/002-dont-need-hotkey-in-nanonote.patch @@ -5,21 +5,47 @@ From: Xiangfu Liu --- - configure.in | 2 + configure.in | 26 ++- src/class_factory.cpp | 2 src/conf.cpp | 6 - - src/stardict.cpp | 6 - + src/stardict.cpp | 35 +++- src/x11_iskeyspressed.cpp | 351 --------------------------------------------- src/x11_iskeyspressed.hpp | 65 -------- - 6 files changed, 8 insertions(+), 424 deletions(-) + 6 files changed, 39 insertions(+), 446 deletions(-) diff --git a/configure.in b/configure.in -index 83d3d95..3676e2c 100644 +index 83d3d95..6be40db 100644 --- a/configure.in +++ b/configure.in -@@ -428,7 +428,7 @@ LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" - fi +@@ -414,21 +414,21 @@ dnl ========================================================================== + + # Checks for header files. need by Solaris. + AC_PATH_XTRA +-if test -n "$X_CFLAGS"; then +-CPPFLAGS="$CPPFLAGS $X_CFLAGS" +-fi +-if test -n "$X_LIBS"; then +-LDFLAGS="$LDFLAGS $X_LIBS" +-fi +-if test -n "$X_PRE_LIBS"; then +-LDFLAGS="$LDFLAGS $X_PRE_LIBS" +-fi +-if test -n "$X_EXTRA_LIBS"; then +-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" +-fi ++#if test -n "$X_CFLAGS"; then ++#CPPFLAGS="$CPPFLAGS $X_CFLAGS" ++#fi ++#if test -n "$X_LIBS"; then ++#LDFLAGS="$LDFLAGS $X_LIBS" ++#fi ++#if test -n "$X_PRE_LIBS"; then ++#LDFLAGS="$LDFLAGS $X_PRE_LIBS" ++#fi ++#if test -n "$X_EXTRA_LIBS"; then ++#LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" ++#fi # Checks for libraries. -AC_CHECK_LIB([X11], [main], , [AC_MSG_ERROR([X11 lib not found])]) @@ -58,7 +84,7 @@ index 2d0f89d..a35bc5c 100644 std::auto_ptr conf; diff --git a/src/stardict.cpp b/src/stardict.cpp -index 326ca4a..4c51d61 100644 +index 326ca4a..0e820ed 100644 --- a/src/stardict.cpp +++ b/src/stardict.cpp @@ -351,9 +351,9 @@ void AppCore::Create(gchar *queryword) @@ -74,6 +100,64 @@ index 326ca4a..4c51d61 100644 oFloatWin.Create(); bool scan=conf->get_bool_at("dictionary/scan_selection"); oDockLet.reset(PlatformFactory::create_tray_icon(window, scan, +@@ -2005,10 +2005,19 @@ private: + + void AppCore::PopupPrefsDlg() + { ++ static std::list posb_combs; ++ if (posb_combs.empty()) { ++ posb_combs.push_back("Win"); ++ posb_combs.push_back("Shift"); ++ posb_combs.push_back("Alt"); ++ posb_combs.push_back("Ctrl"); ++ posb_combs.push_back("Ctrl+Alt"); ++ } ++ + if (!prefs_dlg) { + prefs_dlg = new PrefsDlg(GTK_WINDOW(window), +- get_impl(oAppSkin.icon), +- unlock_keys->possible_combs()); ++ get_impl(oAppSkin.icon), ++ posb_combs); + bool enbcol = + conf->get_bool_at("dictionary/enable_collation"); + int colf = +@@ -2153,17 +2162,17 @@ void AppCore::Quit() + if (!conf->get_bool_at("main_window/maximized")) { + gint width, height; + gtk_window_get_size(GTK_WINDOW(window), &width, &height); +- conf->set_int_at("main_window/window_width", width); +- conf->set_int_at("main_window/window_height", height); ++ conf->set_int_at("main_window/window_width", width); ++ conf->set_int_at("main_window/window_height", height); + } + gint pos = gtk_paned_get_position(GTK_PANED(oMidWin.hpaned)); +- conf->set_int_at("main_window/hpaned_pos", pos); ++ conf->set_int_at("main_window/hpaned_pos", pos); + + if (conf->get_bool_at("floating_window/lock")) { + gint x, y; + gtk_window_get_position(GTK_WINDOW(oFloatWin.FloatWindow), &x, &y); +- conf->set_int_at("floating_window/lock_x", x); +- conf->set_int_at("floating_window/lock_y", y); ++ conf->set_int_at("floating_window/lock_x", x); ++ conf->set_int_at("floating_window/lock_y", y); + } + + End(); +@@ -2171,9 +2180,9 @@ void AppCore::Quit() + #ifdef CONFIG_GNOME + bonobo_object_unref (stardict_app_server); + #endif +- unlock_keys.reset(0); +- conf.reset(0); +- gtk_main_quit(); ++ unlock_keys.reset(0); ++ conf.reset(0); ++ gtk_main_quit(); + } + + void AppCore::on_main_win_hide_list_changed(const baseconfval* hideval) diff --git a/src/x11_iskeyspressed.cpp b/src/x11_iskeyspressed.cpp index 15e8fb0..8b13789 100644 --- a/src/x11_iskeyspressed.cpp