Drop patch: 109_nxagent_locale-utf8-compound-text.patch, the patch causes Qt…

debian/changelog

@@ -5,6 +5,9 @@ nx-libs (2:3.5.0.14-0) UNRELEASED; urgency=low
   * Adapt patch series (all hunks succeeded automatically).
   * Drop patch: 120_nxagent_libcairo-null-source-drawables.full.patch, the issue
     has been fixed by NoMachine (TR05J02703).
+  * Drop patch: 109_nxagent_locale-utf8-compound-text.patch, the patch causes
+    Qt applications to be rendered without window decorations when running in
+    rootless window mode.
 
   [ Mihai Moldovan ]
   * Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change

debian/patches/109_nxagent_locale-utf8-compound-text.full.patch → debian/patches-refused/109_nxagent_locale-utf8-compound-text.full.patch

@@ -96,21 +96,23 @@ Last-Update: 2011-12-31
                 #ifndef _XSERVER64
                 strcmp(typeS, "CARDINAL") == 0 ||
                     strcmp(typeS, "WM_SIZE_HINTS") == 0 ||
-@@ -483,6 +511,17 @@
+@@ -483,6 +511,19 @@
      output = value;
      export = True;
    }
-+  /* add by dimbor, modified by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> */
++  /* add by dimbor, modified by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 +  else if (strcmp(typeS, "COMPOUND_TEXT") == 0)
 +  {
 +    output = textToUTF8String(value, nUnits);
 +    if ( output != NULL ) {
-+      nUnits = strlen((char *) output);
 +      type = MakeAtom("UTF8_STRING", strlen("UTF8_STRING"), True);
++    } else {
++      output = value;
++    }
++    nUnits = strlen((char *) output);
 +    freeMem = True;
 +    export = True;
-+    }
-+  }
++  } */
    #ifdef _XSERVER64
    else if (strcmp(typeS, "CARDINAL") == 0 || strcmp(typeS, "WM_SIZE_HINTS") == 0)
    {

debian/patches/series

@@ -34,7 +34,6 @@
 106_nxagent_utf8-copy-clipboard.full.patch
 107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
 108_nxagent_wine-close-delay.full.patch
-109_nxagent_locale-utf8-compound-text.full.patch
 110_nxagent_createpixmap-bounds-check.full.patch
 200_nxagent_check-binary-x2go-flavour.full.patch
 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch