[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-4-17-g031b7fe

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=031b7fe

The following commit has been merged in the master branch:
commit 031b7fe185fe275b8306f337f8503680bba11182
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 29 17:22:12 2014 -0300

    Remove hppa_support.patch.
    
    Also applied upstream.
---
 debian/changelog                  |  1 +
 debian/patches/hppa_support.patch | 22 ----------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66b1a07..3fd8335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
     - gstreamer-1.0.diff
     - x32_support.patch
     - arm64.patch
+    - hppa_support.patch
   * Refresh patches.
   * Update glibc_hurd_mkspecs.diff. I removed the first part of the patch
     because now the source uses unix* which should work. The rest was just a
diff --git a/debian/patches/hppa_support.patch b/debian/patches/hppa_support.patch
deleted file mode 100644
index 51b7e35..0000000
--- a/debian/patches/hppa_support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
----
- Source/WTF/wtf/Platform.h |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -71,6 +71,15 @@
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- 
-+/* CPU(HPPA) - HP PARISC */
-+#if defined(__hppa__)
-+#define WTF_CPU_HPPA 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
-+#endif
-+
- /* CPU(IA64) - Itanium / IA-64 */
- #if defined(__ia64__)
- #define WTF_CPU_IA64 1
diff --git a/debian/patches/series b/debian/patches/series
index fc41878..266c903 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,4 @@ hide_wtf_symbols.diff
 hide_jsc_symbols.diff
 fix_nonlinux_glibc_linkage.diff
 reduce_memory_usage.patch
-hppa_support.patch
 nonlinux_enable_glib_support.patch

-- 
QtWebKit packaging