Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=be2edf456e8f3aed231e92a02d65b5e62b715a5d
commit be2edf456e8f3aed231e92a02d65b5e62b715a5d Author: Marius Cirsta <[email protected]> Date: Mon Feb 3 23:20:45 2014 +0200 scim-bridge-0.4.16-2-x86_64 * rebuild with new libxcb diff --git a/source/xapps-extra/scim-bridge/FrugalBuild b/source/xapps-extra/scim-bridge/FrugalBuild index d70ce82..bb37400 100644 --- a/source/xapps-extra/scim-bridge/FrugalBuild +++ b/source/xapps-extra/scim-bridge/FrugalBuild @@ -3,7 +3,7 @@ pkgname=scim-bridge pkgver=0.4.16 -pkgrel=1 +pkgrel=2 pkgdesc="Bridge input method for SCIM." _F_sourceforge_dirname="scim" Finclude sourceforge @@ -15,9 +15,13 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') Fconfopts+=" --disable-qt3-immodule --enable-qt4-immodule --enable-gtk2-immodule" -source=($source gcc44.patch configure-fix.patch) +source=($source gcc44.patch configure-fix.patch scim-bridge-fix-vnc-display-check.patch scim-bridge-gcc47.patch \ + scim-bridge-reregister-type-module-if-reload.patch) sha1sums=('6a7a714592dbecc9a1f44794f37319bafe2bdfae' \ 'a281d080ed7eafc93d02140017f0aea9459185fb' \ - '41a6d1127c5f28ad4d26781cda40264d075166e3') + '41a6d1127c5f28ad4d26781cda40264d075166e3' \ + 'c8a3a1aece9812a0160e823924680f0922d45ec8' \ + '90fce496a0bff54f1dd946f64bb4a858d1a0ac3e' \ + 'f3863ed28d8045685b9270e7b6cfaf2de5e02d42') # optimization OK diff --git a/source/xapps-extra/scim-bridge/scim-bridge-fix-vnc-display-check.patch b/source/xapps-extra/scim-bridge/scim-bridge-fix-vnc-display-check.patch new file mode 100644 index 0000000..13140f8 --- /dev/null +++ b/source/xapps-extra/scim-bridge/scim-bridge-fix-vnc-display-check.patch @@ -0,0 +1,18 @@ +--- + common/scim-bridge-display.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/common/scim-bridge-display.c ++++ b/common/scim-bridge-display.c +@@ -93,6 +93,11 @@ + const char *c; + for (c = display_name; TRUE; ++c) { + if (*c == ':') { ++ /* skip VNC port in HOST::PORT syntax (bnc#738627) */ ++ if (c[1] == ':') { ++ c++; ++ continue; ++ } + break; + } else if (*c == '\0') { + return RETVAL_FAILED; diff --git a/source/xapps-extra/scim-bridge/scim-bridge-gcc47.patch b/source/xapps-extra/scim-bridge/scim-bridge-gcc47.patch new file mode 100644 index 0000000..17f995f --- /dev/null +++ b/source/xapps-extra/scim-bridge/scim-bridge-gcc47.patch @@ -0,0 +1,24 @@ +Index: scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp +=================================================================== +--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-signal-listener.cpp ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp +@@ -25,6 +25,7 @@ + + #include <sys/socket.h> + #include <sys/types.h> ++#include <unistd.h> + + #include "scim-bridge-output.h" + +Index: scim-bridge-0.4.16/agent/utils/scim-bridge-agent-panel-client.cpp +=================================================================== +--- scim-bridge-0.4.16.orig/agent/utils/scim-bridge-agent-panel-client.cpp ++++ scim-bridge-0.4.16/agent/utils/scim-bridge-agent-panel-client.cpp +@@ -23,6 +23,7 @@ + + #include <sys/stat.h> + #include <sys/types.h> ++#include <unistd.h> + #include <sys/wait.h> + + #define Uses_SCIM_CONFIG_PATH diff --git a/source/xapps-extra/scim-bridge/scim-bridge-reregister-type-module-if-reload.patch b/source/xapps-extra/scim-bridge/scim-bridge-reregister-type-module-if-reload.patch new file mode 100644 index 0000000..87dc4c9 --- /dev/null +++ b/source/xapps-extra/scim-bridge/scim-bridge-reregister-type-module-if-reload.patch @@ -0,0 +1,13 @@ +Index: scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c +=================================================================== +--- scim-bridge-0.4.15.orig/client-gtk/scim-bridge-client-imcontext-gtk.c ++++ scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c +@@ -678,7 +678,7 @@ void scim_bridge_client_imcontext_regist + (GtkObjectInitFunc) scim_bridge_client_imcontext_initialize, + }; + +- if (!class_type) class_type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "ScimBridgeClientIMContext", &klass_info, 0); ++ class_type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "ScimBridgeClientIMContext", &klass_info, 0); + } + + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
