diff -Nru qtwebkit-2.2.1/debian/changelog qtwebkit-2.2.1/debian/changelog --- qtwebkit-2.2.1/debian/changelog 2012-11-19 06:01:22.000000000 +0900 +++ qtwebkit-2.2.1/debian/changelog 2012-11-30 13:12:30.000000000 +0900 @@ -1,3 +1,10 @@ +qtwebkit (2.2.1-5.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix build on Renesas sh4. + + -- Nobuhiro Iwamatsu Fri, 30 Nov 2012 13:11:56 +0900 + qtwebkit (2.2.1-5) unstable; urgency=low * Team upload. diff -Nru qtwebkit-2.2.1/debian/patches/stabs_format_debug_info.diff qtwebkit-2.2.1/debian/patches/stabs_format_debug_info.diff --- qtwebkit-2.2.1/debian/patches/stabs_format_debug_info.diff 2012-11-07 07:49:39.000000000 +0900 +++ qtwebkit-2.2.1/debian/patches/stabs_format_debug_info.diff 2012-11-30 13:25:50.000000000 +0900 @@ -1,4 +1,4 @@ -Description: build s390, armel, mips* debugging symbols with -gstabs +Description: build s390, armel, mips* and sh4 debugging symbols with -gstabs -g exhausts memory on these arches. Thanks to Oswald Buddenhagen for the hint. Author: Sune Vuorela Author: Modestas Vainius @@ -15,8 +15,8 @@ DEFINES += NDEBUG } -+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips) { -+ message("s390, armel, armhf, mipsel workaround for QtWebkit: do not build with -g, but with -gstabs") ++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, sh) { ++ message("s390, armel, armhf, mipsel and sh workaround for QtWebkit: do not build with -g, but with -gstabs") + QMAKE_CXXFLAGS -= -g + QMAKE_CXXFLAGS += -gstabs +} diff -Nru qtwebkit-2.2.1/debian/rules qtwebkit-2.2.1/debian/rules --- qtwebkit-2.2.1/debian/rules 2012-11-19 03:38:28.000000000 +0900 +++ qtwebkit-2.2.1/debian/rules 2012-11-30 13:10:11.000000000 +0900 @@ -8,7 +8,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 s390x armel armhf mips mipsel)) +ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel sh4)) export DEB_CFLAGS_MAINT_STRIP := -g export DEB_CFLAGS_MAINT_APPEND := -gstabs export DEB_CXXFLAGS_MAINT_STRIP := -g