[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.13-6-gb65b83b

X2Go dev team git-admin at x2go.org
Thu Jun 28 12:31:24 CEST 2012


The branch, master has been updated
       via  b65b83ba4bbfea8efef58c9f4bab31a1b20db066 (commit)
      from  dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b65b83ba4bbfea8efef58c9f4bab31a1b20db066
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 28 12:31:01 2012 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    3 +++
 ...09_nxagent_locale-utf8-compound-text.full.patch |   14 ++++++++------
 debian/patches/series                              |    1 -
 3 files changed, 11 insertions(+), 7 deletions(-)
 rename debian/{patches => patches-refused}/109_nxagent_locale-utf8-compound-text.full.patch (94%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6cc8506..1787dff 100644
--- a/debian/changelog
+++ b/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
diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch b/debian/patches-refused/109_nxagent_locale-utf8-compound-text.full.patch
similarity index 94%
rename from debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
rename to debian/patches-refused/109_nxagent_locale-utf8-compound-text.full.patch
index 7fbdf45..6c11226 100644
--- a/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
+++ b/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 at das-netzwerkteam.de> */
++  /* add by dimbor, modified by Mike Gabriel <mike.gabriel at 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);
-+      freeMem = True;
-+      export = 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)
    {
diff --git a/debian/patches/series b/debian/patches/series
index d772a0e..f47979a 100644
--- a/debian/patches/series
+++ b/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


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list