Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at 2012-02-02 18:00:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old) and /work/SRC/openSUSE:Factory/.scim-bridge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-bridge", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes 2011-11-28 12:57:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes 2012-02-02 18:00:30.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 1 12:25:17 CET 2012 - [email protected] + +- Fix the parsing of $DISPLAY variable with VNC HOST::PORT syntax + (bnc#738627) + +------------------------------------------------------------------- New: ---- scim-bridge-fix-vnc-display-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.VNverY/_old 2012-02-02 18:00:31.000000000 +0100 +++ /var/tmp/diff_new_pack.VNverY/_new 2012-02-02 18:00:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scim-bridge # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: scim-bridge -BuildRequires: docbook-xsl-stylesheets doxygen gtk2-devel libqt4-devel qt3-devel scim-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: gtk2-devel +BuildRequires: libqt4-devel BuildRequires: libtool +BuildRequires: qt3-devel +BuildRequires: scim-devel Summary: Scim Bridge -Version: 0.4.16 -Release: 0 License: LGPL-2.1+ Group: System/I18n/Japanese +Version: 0.4.16 +Release: 0 PreReq: /usr/bin/touch Provides: locale(scim:ja;ko;zh) Recommends: scim-bridge-gtk,scim-bridge-qt @@ -39,6 +42,7 @@ Source11: etc-x11-xim.d-scim-bridge-114 Patch3: bug-351920-should-return-retval.patch Patch8: scim-bridge-0.4.15-gcc44.patch +Patch9: scim-bridge-fix-vnc-display-check.diff Patch10: scim-bridge-reregister-type-module-if-reload.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define gtk_prefix %(pkg-config --variable=prefix gtk+-2.0) @@ -53,7 +57,6 @@ Ryo Dairiki <[email protected]> %package -n scim-bridge-gtk -License: LGPL-2.1+ Summary: Scim Bridge for gtk2 Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -70,7 +73,6 @@ Ryo Dairiki <[email protected]> %package -n scim-bridge-qt -License: LGPL-2.1+ Summary: Scim Bridge for Qt Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -90,6 +92,7 @@ %setup -q -n %{name}-%{version} %patch3 -p1 %patch8 +%patch9 -p1 %patch10 -p1 find . -type f | xargs chmod u+w ++++++ scim-bridge-fix-vnc-display-check.diff ++++++ --- 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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
