[SCM] Git repository for pkg-virtuoso branch, master, updated. upstream/6.0.1.cvs20091210+dfsg2-206-g3565d20

[José Manuel Santamar?==?UTF-8?Q?ía Lema]

The following commit has been merged in the master branch:
commit 2db6a1ae959fb3f647d0d1c04e5c364a2541dfae
Author: Obey Arthur Liu <arthur at milliways.fr>
Date:   Tue May 22 16:37:45 2012 +0200

    Add fix-wide-char-encoding.patch, upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0808dd1..d370b87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtuoso-opensource (6.1.3+dfsg1-2) unstable; urgency=low
+
+  * Apply wide char encoding fix from KDE bug 271664,
+    thanks Sebastian Trueg.
+
+ -- Obey Arthur Liu <arthur at milliways.fr>  Fri, 14 Oct 2011 02:02:42 +0200
+
 virtuoso-opensource (6.1.3+dfsg1-1) unstable; urgency=low
 
   * New upstream release (Closes: #626253).
diff --git a/debian/patches/fix-wide-char-encoding.patch b/debian/patches/fix-wide-char-encoding.patch
new file mode 100644
index 0000000..12249d8
--- /dev/null
+++ b/debian/patches/fix-wide-char-encoding.patch
@@ -0,0 +1,20 @@
+Description: fix wide char encoding
+ Fix wide char encoding as described in
+ https://bugs.kde.org/show_bug.cgi?id=271664
+Author: Obey Arthur Liu <arthur at milliways.fr>
+Last-Update: 2011-10-14
+--- a/libsrc/Wi/xqf.c
++++ b/libsrc/Wi/xqf.c
+@@ -3520,6 +3520,12 @@
+   desc = xqf_str_parser_descs + desc_idx;
+   if (DV_DB_NULL == arg_dtp)
+     return NEW_DB_NULL;
++  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
++  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
++    {
++      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
++      goto res_ready;
++    }
+   if (DV_STRING != arg_dtp)
+     {
+       caddr_t err = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 169a6cd..7ba13f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-wide-char-encoding.patch
 config-debian-paths.patch
 config-universal-variables.patch
 build-short-timeout.patch

-- 
Git repository for pkg-virtuoso