From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: [PATCH] Patch Qt 5.4 for i686. Date: Fri, 24 Apr 2015 11:16:16 +0200 Message-ID: <87r3r9q42n.fsf@taylan.uni.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlZie-0005yK-NF for guix-devel@gnu.org; Fri, 24 Apr 2015 05:16:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YlZid-0003FB-87 for guix-devel@gnu.org; Fri, 24 Apr 2015 05:16:20 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:32965) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlZic-0003F3-Tx for guix-devel@gnu.org; Fri, 24 Apr 2015 05:16:19 -0400 Received: by wiax7 with SMTP id x7so30508515wia.0 for ; Fri, 24 Apr 2015 02:16:18 -0700 (PDT) Received: from taylan.uni.cx (p2003007A0A22AB200213E8FFFEED36FB.dip0.t-ipconnect.de. [2003:7a:a22:ab20:213:e8ff:feed:36fb]) by mx.google.com with ESMTPSA id di7sm2574167wib.23.2015.04.24.02.16.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2015 02:16:17 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain It will take my machine another ~7 hours to build Qt so that I can verify that this works; on the meanwhile sending it in FYI and for stylistic review. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-Patch-Qt-5.4-for-i686.patch Content-Transfer-Encoding: quoted-printable >From eb8f5f90684e141c4055c9e484629a2c7d731a06 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer?=3D Date: Fri, 24 Apr 2015 10:43:57 +0200 Subject: [PATCH] Patch Qt 5.4 for i686. See . * gnu/packages/patches/qt5-conflicting-typedefs.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/qt.scm (qt): Add the patch. --- gnu-system.am | 1 + .../patches/qt5-conflicting-typedefs.patch | 45 ++++++++++++++++++= ++++ gnu/packages/qt.scm | 3 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qt5-conflicting-typedefs.patch diff --git a/gnu-system.am b/gnu-system.am index 13d06fb..8e5d43b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -526,6 +526,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch= \ gnu/packages/patches/qt4-ldflags.patch \ gnu/packages/patches/qt4-tests.patch \ + gnu/packages/patches/qt5-conflicting-typedefs.patch \ gnu/packages/patches/qt5-runpath.patch \ gnu/packages/patches/ratpoison-shell.patch \ gnu/packages/patches/readline-link-ncurses.patch \ diff --git a/gnu/packages/patches/qt5-conflicting-typedefs.patch b/gnu/pack= ages/patches/qt5-conflicting-typedefs.patch new file mode 100644 index 0000000..f96390e --- /dev/null +++ b/gnu/packages/patches/qt5-conflicting-typedefs.patch @@ -0,0 +1,45 @@ +From 5c45e53ee2f8ab39f3471eaf5f9636c68f3c3960 Mon Sep 17 00:00:00 2001 +From: Andras Becsi +Date: Wed, 11 Mar 2015 13:15:30 +0100 +Subject: Fix conflicting declaration errors due to + duplicate typedefs +MIME-Version: 1.0 +Content-Type: text/plain; charset=3DUTF-8 +Content-Transfer-Encoding: 8bit + +Due to cascading includes to QtWebEngine core GLintptr and GLsizeiptr +might end up being defined twice if compiling with some embedded +toolchains like for the colibri-vf setup, due to chromium's +gles2_cmd_format.h also defining these typedefs unconditionally. +Prevent the conflicting definitions by guarding them with +BUILDING_CHROMIUM which we define when compiling QtWebEngineCore. + +Change-Id: I33719c08300211f4ad304efa3e7a5326136bb3cf +Reviewed-by: Michael Br=C3=BCning +--- + chromium/third_party/mesa/src/include/GL/glext.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/t= hird_party/mesa/src/include/GL/glext.h +index cb19ed4..1b78767 100644 +--- a/chromium/third_party/mesa/src/include/GL/glext.h ++++ b/chromium/third_party/mesa/src/include/GL/glext.h +@@ -6148,6 +6148,7 @@ typedef char GLchar; + #endif +=20 + #ifndef GL_VERSION_1_5 ++#ifndef BUILDING_CHROMIUM + /* GL types for handling large vertex buffer objects */ + #ifdef _WIN64 + typedef signed long long int GLintptr; +@@ -6157,6 +6158,7 @@ typedef signed long int GLintptr; + typedef signed long int GLsizeiptr; + #endif + #endif ++#endif +=20 + #ifndef GL_ARB_vertex_buffer_object + /* GL types for handling large vertex buffer objects */ +--=20 +cgit v0.11.0 + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8de1ffe..3bc3145 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -104,7 +104,8 @@ X11 (yet).") (sha256 (base32 "0q6qzakq8xihw91xv310qi3vyylq7x2bzdkjgy8sqxii2lgbjzhv")) - (patches (list (search-patch "qt5-runpath.patch"))) + (patches (list (search-patch "qt5-conflicting-typedefs.patch") + (search-patch "qt5-runpath.patch"))) (snippet '(begin ;; Remove broken symlinks. --=20 2.2.1 --=-=-=--