Bug#637004: qtwebkit: FTBFS on s390x: needs some adjustments

2011-09-25 Thread Philipp Kern 
Hi,

On Sun, Sep 25, 2011 at 12:44:53PM +0300, Fathi Boudra wrote:
> > On Wed, Aug 10, 2011 at 09:54:40PM +0200, Pino Toscano wrote:
> > > tags 637004 + pending
> > > thanks
> >
> > will there be an upload soon to get that fix into the archive?  (s390x)
> 
> I didn't bring the topic to debian-release yet but we started to convert
> Qt/Qt WebKit/friends to multiarch:
> http://lists.alioth.debian.org/pipermail/pkg-kde-talk/2011-September/001636.html
> 
> Qt WebKit upload depends on when Qt multiarch could happen. Another option
> suggested by Pino is to upload latest Qt Webkit now without multiarch bits.
> I would prefer to start Qt multiarch transition and fix this bug at
> the same time.
> 
> Opinion?

we'll do Python 2.7 first, so it would be helpful if you could hold
off that transition for a while longer.  Furthermore it would be cool
if you could fix the ia64 FTBFS[0] first.

So yeah, having the changes in unstable and not coupling it to the
transition might be better.

Kind regards
Philipp Kern

[0] 
https://buildd.debian.org/status/fetch.php?pkg=qt4-x11&arch=ia64&ver=4%3A4.7.3-8&stamp=1316231009


signature.asc
Description: Digital signature

Bug#637004: qtwebkit: FTBFS on s390x: needs some adjustments

2011-09-25 Thread Fathi Boudra 
Hi Phil,

> On Wed, Aug 10, 2011 at 09:54:40PM +0200, Pino Toscano wrote:
> > tags 637004 + pending
> > thanks
>
> will there be an upload soon to get that fix into the archive?  (s390x)

I didn't bring the topic to debian-release yet but we started to convert
Qt/Qt WebKit/friends to multiarch:
http://lists.alioth.debian.org/pipermail/pkg-kde-talk/2011-September/001636.html

Qt WebKit upload depends on when Qt multiarch could happen. Another option
suggested by Pino is to upload latest Qt Webkit now without multiarch bits.
I would prefer to start Qt multiarch transition and fix this bug at
the same time.

Opinion?

Cheers,

Fathi



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#637004: qtwebkit: FTBFS on s390x: needs some adjustments

2011-08-07 Thread Aurelien Jarno 
Package: qtwebkit
Version: 5
Severity: important
Tags: patch
Justification: fails to build from source
User: debian-s...@lists.debian.org
Usertags: s390x

qtwebkit fails to build on s390x, as the code to support this
architecture is not yet present in the package, though it is present in
upstream webkit. It is easy to backport, so please find below a patch
to do that. The patch also changes the debugging support to -gstabs
(similarly to what is already done on s390), as otherwise the link
fails.


diff -Nru qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff 
qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff
--- qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff  1970-01-01 
00:00:00.0 +
+++ qtwebkit-2.1.0~2011week13/debian/patches/07_s390x.diff  2011-08-06 
10:14:18.0 +
@@ -0,0 +1,35 @@
+Description: Add support for s390/s390x architectures
+Author: Dan Horák  
+Origin: vendor 
(http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
+Forwarded: no
+Last-Update: 2011-08-06
+
+--- a/JavaScriptCore/wtf/Platform.h
 b/JavaScriptCore/wtf/Platform.h
+@@ -186,6 +186,18 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+ 
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+ || defined(i386) \
+@@ -917,6 +929,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+ || (CPU(IA64) && !CPU(IA64_32)) \
+ || CPU(ALPHA) \
++|| CPU(S390X) \
+ || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM_TRADITIONAL) || CPU(PPC64) || CPU(MIPS)
diff -Nru qtwebkit-2.1.0~2011week13/debian/patches/series 
qtwebkit-2.1.0~2011week13/debian/patches/series
--- qtwebkit-2.1.0~2011week13/debian/patches/series 2011-06-20 
12:57:32.0 +
+++ qtwebkit-2.1.0~2011week13/debian/patches/series 2011-08-06 
10:14:47.0 +
@@ -8,6 +8,7 @@
 04_enable_debug_information.diff
 05_sparc_unaligned_access.diff
 06_kfreebsd_strnstr.diff
+07_s390x.diff
 stabs_format_debug_info.diff
 no_gc_sections.diff
 09_hurd.diff
diff -Nru qtwebkit-2.1.0~2011week13/debian/rules 
qtwebkit-2.1.0~2011week13/debian/rules
--- qtwebkit-2.1.0~2011week13/debian/rules  2011-04-06 08:34:09.0 
+
+++ qtwebkit-2.1.0~2011week13/debian/rules  2011-08-07 15:01:52.0 
+
@@ -6,7 +6,7 @@
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH),s390 armel mips mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
 export CFLAGS := $(filter-out -g,$(CFLAGS)) -gstabs
 export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs
 endif


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: s390x 

Kernel: 2.6.32-5-s390x (SMP w/3 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org