diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-06-28 12:31:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-06-28 12:31:01 +0200 |
| commit | b65b83ba4bbfea8efef58c9f4bab31a1b20db066 (patch) | |
| tree | 57e8f8a1179ceb0f6ea65340bba26a38981bb40c | |
| parent | dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c (diff) | |
| download | nx-libs-b65b83ba4bbfea8efef58c9f4bab31a1b20db066.tar.gz nx-libs-b65b83ba4bbfea8efef58c9f4bab31a1b20db066.tar.bz2 nx-libs-b65b83ba4bbfea8efef58c9f4bab31a1b20db066.zip | |
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.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches-refused/109_nxagent_locale-utf8-compound-text.full.patch (renamed from debian/patches/109_nxagent_locale-utf8-compound-text.full.patch) | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 11 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 6cc85068e..1787dff68 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 index 7fbdf45eb..6c112262e 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@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); -+ 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 d772a0e6e..f47979a5c 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 |