X2Go Bug report logs - #205
Patch for fix cairo issue

Full log

Message #5 received at submit@bugs.x2go.org (full text, mbox, reply):

Received: (at submit) by bugs.x2go.org; 10 May 2013 21:17:52 +0000
From nicolas@deffayet.com  Fri May 10 23:17:51 2013
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=URIBL_BLOCKED autolearn=ham
	version=3.3.2
X-Greylist: delayed 591 seconds by postgrey-1.34 at ymir; Fri, 10 May 2013 23:17:51 CEST
Received: from smtp.novso.com (smtp1.novso.com [193.189.104.85])
	by ymir (Postfix) with ESMTPS id ABC715DB21
	for <submit@bugs.x2go.org>; Fri, 10 May 2013 23:17:51 +0200 (CEST)
Subject: Patch for fix cairo issue
From: Nicolas DEFFAYET <nicolas@deffayet.com>
To: submit@bugs.x2go.org
Content-Type: text/plain; charset="UTF-8"
Organization: DEFFAYET.COM
Date: Fri, 10 May 2013 23:07:59 +0200
Message-ID: <1368220079.30773.10.camel@fr-wks3.corp.novso.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Content-Transfer-Encoding: 7bit

Package: nx-libs 
Version: 3.5.0.20-0

As cairo enable buggy_repeat (src/cairo-xlib-display.c) for XFree86 <= 40500000; X.Org >= 60700000 & < 70000000; X.Org < 10400000, it's required to have version 70100000 shown to cairo.

On Debian Wheezy, with original cairo, this will result of no fount displayed as show on https://bbs.archlinux.org/viewtopic.php?id=141884.

The problem is already know: https://bugs.freedesktop.org/show_bug.cgi?id=32014

Ubuntu ***seem*** (require more investigation) to have patched their cairo but not Debian.

Patching nx-X11 for show fake version to cairo is for me the best solution as there is no dependance of a patched cairo.

Suggested patch (need more test):

$ vi debian/patches/999_nx-X11_version_hack_for_cairo.patch
---
Description: Version hack for cairo
 As cairo enable buggy_repeat (src/cairo-xlib-display.c) for XFree86 <= 40500000; X.Org >= 60700000 & < 70000000; X.Org < 10400000, it's required to have version 70100000 shown to cairo.
 https://bugs.freedesktop.org/show_bug.cgi?id=32014.
--- a/nx-X11/config/cf/X11.tmpl	2013-03-28 20:36:38.000000000 +0000
+++ b/nx-X11/config/cf/X11.tmpl	2013-05-10 18:20:18.000000000 +0000
@@ -45,7 +45,7 @@
 # if defined XorgVersionString
 #   define XOrgReleaseString	Release XorgVersionString
 # else
-#   define XOrgReleaseString	Release 6.9
+#   define XOrgReleaseString	Release 7.1
 # endif
 #endif
 
--- a/nx-X11/config/util/makedef.cmd	2013-03-28 20:36:38.000000000 +0000
+++ b/nx-X11/config/util/makedef.cmd	2013-05-10 18:41:40.000000000 +0000
@@ -23,13 +23,13 @@
 sASDFeatureId   = '';
 sCountryCode    = '';
 sDateTime       = left(' 'date()' 'time(), 26);
-sDescription    = 'X.Org 6.9';
+sDescription    = 'X.Org 7.1';
 sFixPakVer      = '';
 sHostname       = strip(substr(VALUE('HOSTNAME',,'OS2ENVIRONMENT'), 1, 11));
 sLanguageCode   = '';
 sMiniVer        = '';
 sVendor         = 'X.Org';
-sVersion        = '6.9';
+sVersion        = '7.1';
 

 /*
---
$ echo "999_nx-X11_version_hack_for_cairo.patch" >> debian/patches/series


Thanks

-- 
Nicolas DEFFAYET

Send a report that this bug log contains spam.