qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 13:32:48 +02:00
Code

[stardict] disable check X header

Browse Source
This commit is contained in:
Xiangfu Liu 2010-02-11 14:54:00 +08:00
parent 09839212fe
commit 22ad7219b6
2 changed files with 100 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stardict/patches/001-fix-compile-error.patch
View File

@ -8,10 +8,10 @@ From: Xiangfu Liu <xiangfu@sharism.cc>
src/gconf_file.cpp | 2 ++ src/gconf_file.cpp | 2 ++
src/inifile.cpp | 1 + src/inifile.cpp | 1 +
src/lib/common.cpp | 2 ++ src/lib/common.cpp | 2 ++
src/lib/data.cpp | 1 + src/lib/data.cpp | 2 ++
src/lib/http_client.cpp | 1 + src/lib/http_client.cpp | 1 +
src/lib/pluginmanager.cpp | 2 +- src/lib/pluginmanager.cpp | 2 +-
src/lib/stardict_client.cpp | 1 + src/lib/stardict_client.cpp | 2 ++
src/lib/treedict.cpp | 1 + src/lib/treedict.cpp | 1 +
src/pangoview.cpp | 2 ++ src/pangoview.cpp | 2 ++
src/prefsdlg.cpp | 1 + src/prefsdlg.cpp | 1 +
@ -35,7 +35,7 @@ From: Xiangfu Liu <xiangfu@sharism.cc>
.../stardict_xdxf_parsedata.cpp | 1 + .../stardict_xdxf_parsedata.cpp | 1 +
tests/t_config_file.cpp | 1 + tests/t_config_file.cpp | 1 +
tests/t_xml.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 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) static void parse_description(const char *p, long len, std::string &description)
diff --git a/src/lib/data.cpp b/src/lib/data.cpp 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 --- a/src/lib/data.cpp
+++ b/src/lib/data.cpp +++ b/src/lib/data.cpp
@@ -22,6 +22,7 @@ @@ -22,6 +22,8 @@
# include "config.h" # include "config.h"
#endif #endif
+#include <cstdio>
+#include <cstring> +#include <cstring>
#include "kmp.h" #include "kmp.h"
@ -113,13 +114,14 @@ index de3e92d..28a46c4 100644
StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_): StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
plugin_filename(filename), module(module_), configure_func(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 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 --- a/src/lib/stardict_client.cpp
+++ b/src/lib/stardict_client.cpp +++ b/src/lib/stardict_client.cpp
@@ -25,6 +25,7 @@ @@ -25,6 +25,8 @@
#include <glib.h> #include <glib.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
+#include <cstdio>
+#include <cstdlib> +#include <cstdlib>
#include "sockets.hpp" #include "sockets.hpp"
#include "md5.h" #include "md5.h"

98
stardict/patches/002-dont-need-hotkey-in-nanonote.patch
View File

@ -5,21 +5,47 @@ From: Xiangfu Liu <xiangfu@sharism.cc>
--- ---
configure.in | 2 configure.in | 26 ++-
src/class_factory.cpp | 2 src/class_factory.cpp | 2
src/conf.cpp | 6 - src/conf.cpp | 6 -
src/stardict.cpp | 6 - src/stardict.cpp | 35 +++-
src/x11_iskeyspressed.cpp | 351 --------------------------------------------- src/x11_iskeyspressed.cpp | 351 ---------------------------------------------
src/x11_iskeyspressed.hpp | 65 -------- 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 diff --git a/configure.in b/configure.in
index 83d3d95..3676e2c 100644 index 83d3d95..6be40db 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -428,7 +428,7 @@ LDFLAGS="$LDFLAGS $X_EXTRA_LIBS" @@ -414,21 +414,21 @@ dnl ==========================================================================
fi
# 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. # Checks for libraries.
-AC_CHECK_LIB([X11], [main], , [AC_MSG_ERROR([X11 lib not found])]) -AC_CHECK_LIB([X11], [main], , [AC_MSG_ERROR([X11 lib not found])])
@ -58,7 +84,7 @@ index 2d0f89d..a35bc5c 100644
std::auto_ptr<AppConf> conf; std::auto_ptr<AppConf> conf;
diff --git a/src/stardict.cpp b/src/stardict.cpp diff --git a/src/stardict.cpp b/src/stardict.cpp
index 326ca4a..4c51d61 100644 index 326ca4a..0e820ed 100644
--- a/src/stardict.cpp --- a/src/stardict.cpp
+++ b/src/stardict.cpp +++ b/src/stardict.cpp
@@ -351,9 +351,9 @@ void AppCore::Create(gchar *queryword) @@ -351,9 +351,9 @@ void AppCore::Create(gchar *queryword)
@ -74,6 +100,64 @@ index 326ca4a..4c51d61 100644
oFloatWin.Create(); oFloatWin.Create();
bool scan=conf->get_bool_at("dictionary/scan_selection"); bool scan=conf->get_bool_at("dictionary/scan_selection");
oDockLet.reset(PlatformFactory::create_tray_icon(window, scan, oDockLet.reset(PlatformFactory::create_tray_icon(window, scan,
@@ -2005,10 +2005,19 @@ private:
void AppCore::PopupPrefsDlg()
{
+ static std::list<std::string> 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 diff --git a/src/x11_iskeyspressed.cpp b/src/x11_iskeyspressed.cpp
index 15e8fb0..8b13789 100644 index 15e8fb0..8b13789 100644
--- a/src/x11_iskeyspressed.cpp --- a/src/x11_iskeyspressed.cpp