[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#725651: qtwebkit failed to build on mips64el

On Fri, May 9, 2014 at 11:13 AM, Yunqiang Su <wzssyqa@gmail.com> wrote:
> The upstream uses this patch.
>
> https://codereview.qt-project.org/#change,73290
> and it has been merged.

It is this patch.

>
> On Tue, Oct 22, 2013 at 11:43 PM, YunQiang Su <wzssyqa@gmail.com> wrote:
>> On Wed, Oct 9, 2013 at 10:30 PM, Lisandro Damián Nicanor Pérez Meyer
>> <perezmeyer@gmail.com> wrote:
>>> On Tuesday 08 October 2013 13:58:43 YunQiang Su wrote:
>>>> On Mon, Oct 7, 2013 at 9:46 PM, Lisandro Damián Nicanor Pérez Meyer
>>>>
>>>> <perezmeyer@gmail.com> wrote:
>>>> > On Monday 07 October 2013 09:32:12 YunQiang Su wrote:
>>>> >> Package: qtwebkit
>>>> >> Version: 2.2.1-6
>>>> >>
>>>> >> On mips64el, qtwebkit has the same problem like qt4.
>>>> >> The attachment is the patch.
>>>> >>
>>>> >> Or where should I apply it to upstream?
>>>> >
>>>> > Hi YunQiang! As a rule of thumb, if it's something that does not involve
>>>> > packaging, pushing the patchs upstream is normally the best idea. An
>>>> > exception could be a patch that introduces something that is very
>>>> > Debian-related, but most of the time this can also be pushed upstream
>>>> > somehow.
>>>>
>>>> Thanks, I see.
>>>> I am wondering about which component should it involve to qt?
>>>> I have pushed this patch to qt/qt4/qtscripts.
>>>
>>> If the problem is in qtwebkit, then push it to qtwebkit. If in doubt, join
>>> upstream's irc #qt on freenode and ask.
>> As you noticed, I pushed it the qt4 in Qt's gerrit.
>> The new version of patch is
>>
>>>
>>> Kinds regards, Lisandro.
>>>
>>> --
>>>
>>> Lisandro Damián Nicanor Pérez Meyer
>>> http://perezmeyer.com.ar/
>>> http://perezmeyer.blogspot.com/
>>
>>
>>
>> --
>> YunQiang Su
>
>
>
> --
> Yunqiang Su



-- 
Yunqiang Su

diff -Nru qtwebkit-2.2.1/debian/patches/mips64.diff qtwebkit-2.2.1/debian/patches/mips64.diff
--- qtwebkit-2.2.1/debian/patches/mips64.diff	1970-01-01 00:00:00.000000000 +0000
+++ qtwebkit-2.2.1/debian/patches/mips64.diff	2014-05-09 02:26:21.000000000 +0000
@@ -0,0 +1,59 @@
+From c889b401d4668482bdef6c976bfa2d57144cf7ed Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Wed, 4 Dec 2013 17:52:49 +0000
+Subject: [PATCH] qt webkit: add support for MIPS64 platforms
+
+qt5webkit is not fixed and this patch cannont be applied to qt5webkit
+
+Task-number: QTBUG-35394
+
+Change-Id: Ie2d332345741989a0b4ef93306ca36b42e888c11
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
+---
+ .../webkit/Source/JavaScriptCore/wtf/Platform.h    |   17 +++++++++++------
+ 1 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+index a8298c4..e8b03be 100644
+--- a/Source/JavaScriptCore/wtf/Platform.h
++++ b/Source/JavaScriptCore/wtf/Platform.h
+@@ -144,16 +144,20 @@
+ #endif
+ #endif
+ 
+-/* CPU(MIPS) - MIPS 32-bit */
+-/* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now.  */
+-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
+-    && defined(_ABIO32)
++/* CPU(MIPS) - MIPS 32-bit and 64-bit */
++#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
++    || defined(__mips64))
++#if defined(__mips64)
++#define WTF_CPU_MIPS64 1
++#define WTF_MIPS_ARCH __mips64
++#else
+ #define WTF_CPU_MIPS 1
++#define WTF_MIPS_ARCH __mips
++#endif
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ #define WTF_MIPS_PIC (defined __PIC__)
+-#define WTF_MIPS_ARCH __mips
+ #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
+ #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
+ #define WTF_MIPS_ARCH_REV __mips_isa_rev
+@@ -998,7 +1002,8 @@
+     || CPU(ALPHA) \
+     || CPU(SPARC64) \
+     || CPU(S390X) \
+-    || CPU(PPC64)
++    || CPU(PPC64) \
++    || CPU(MIPS64)
+ #define WTF_USE_JSVALUE64 1
+ #else
+ #define WTF_USE_JSVALUE32_64 1
+-- 
+1.7.1
+
diff -Nru qtwebkit-2.2.1/debian/patches/series qtwebkit-2.2.1/debian/patches/series
--- qtwebkit-2.2.1/debian/patches/series	2013-07-24 03:29:27.000000000 +0000
+++ qtwebkit-2.2.1/debian/patches/series	2014-05-09 02:24:49.000000000 +0000
@@ -18,3 +18,4 @@
 hurd.diff
 webkit_qt_hide_symbols.diff
 ignore-unused-local-typedefs_error.diff
+mips64.diff
Reply to: