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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 0881d7a7d82ce6b3bbacb9c4d7d3634693a9bfac
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Sep 28 12:59:53 2014 -0300

    Remove bound_cpu_usage.patch as this is now not needed.
---
 debian/changelog                     |  1 +
 debian/patches/bound_cpu_usage.patch | 29 -----------------------------
 debian/patches/series                |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77e815e..e13badb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit (2.3.2.dfsg-5) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Respect the number of parralel builds specified in DEB_BUILD_OPTIONS
     (Closes: #761821).
+    - Remove bound_cpu_usage.patch as this is now not needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Sep 2014 11:20:39 -0300
 
diff --git a/debian/patches/bound_cpu_usage.patch b/debian/patches/bound_cpu_usage.patch
deleted file mode 100644
index 4cc5ddd..0000000
--- a/debian/patches/bound_cpu_usage.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: bound CPU usage
- qtwebkit currently puts hurd buildds on their knees because its
- build systems uses "make -j", i.e. without specifying the requested
- parallelism level, which means unbound parallelism, which when building
- c++ code basically means filling dozens of gigabytes of memory.
- .
- This apparently comes from ./Tools/Scripts/webkitdirs.pm which for
- unknown platforms makes numberOfCPUs() return an empty string, which
- thus ends up with "make -j".
- .
- This patch makes qtwebkit default to 1 instead of defaulting to
- unbound parallelism.
-Author: Samuel Thibault <sthibault at debian.org>
-Bug-Debian: #760519
-Forwarded: no
-
---- ./Tools/Scripts/webkitdirs.pm.original	2014-09-05 00:09:09.000000000 +0200
-+++ ./Tools/Scripts/webkitdirs.pm	2014-09-05 00:10:34.000000000 +0200
-@@ -362,6 +362,10 @@
-     } elsif (isDarwin() || isFreeBSD()) {
-         chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
-     }
-+    if (!defined($numberOfCPUs) or $numberOfCPUs eq "")
-+    {
-+      $numberOfCPUs = "1";
-+    }
- }
- 
- sub jscPath($)
diff --git a/debian/patches/series b/debian/patches/series
index 7115890..84e05a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,6 @@ fix_nonlinux_glibc_linkage.diff
 double_conversion_correct_double_operations.patch
 reduce_memory_usage.patch
 ppc64el.patch
-bound_cpu_usage.patch
 x32_support.patch
 arm64.patch
 hppa_support.patch

-- 
QtWebKit packaging