[SCM] QtWebKit packaging branch, master, updated. debian/2.3.4.dfsg-6-4-ge461700

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit e461700b58d6ac2e7d223aaeb775d66d7d896d05
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Apr 15 20:38:05 2016 -0300

    Refresh number of CPU detection patch for kfreebsd.
---
 debian/patches/fix_number_of_cpus_in_kfreebsd.diff | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/patches/fix_number_of_cpus_in_kfreebsd.diff b/debian/patches/fix_number_of_cpus_in_kfreebsd.diff
index daac8f2..9f4ef7f 100644
--- a/debian/patches/fix_number_of_cpus_in_kfreebsd.diff
+++ b/debian/patches/fix_number_of_cpus_in_kfreebsd.diff
@@ -1,12 +1,10 @@
 Description: Bound the number of CPUs used to compile on KFreeBSD.
 Author: Jon Boden <jon at ubuntubsd.org>
 
-Index: Tools/Scripts/webkitdirs.pm
-===================================================================
---- Tools/Scripts/webkitdirs.pm	(revision 198974)
-+++ Tools/Scripts/webkitdirs.pm	(working copy)
-@@ -409,7 +409,7 @@
-     } elsif (isAnyWindows()) {
+--- a/Tools/Scripts/webkitdirs.pm
++++ b/Tools/Scripts/webkitdirs.pm
+@@ -359,7 +359,7 @@ sub determineNumberOfCPUs
+     } elsif (isWindows() || isCygwin()) {
          # Assumes cygwin
          $numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`;
 -    } elsif (isDarwin() || isFreeBSD()) {
@@ -14,8 +12,8 @@ Index: Tools/Scripts/webkitdirs.pm
          chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
      }
  }
-@@ -1216,6 +1216,11 @@
-     return ($^O eq "freebsd") || ($^O eq "openbsd") || ($^O eq "netbsd") || 0;
+@@ -1322,6 +1322,11 @@ sub isFreeBSD()
+     return ($^O eq "freebsd") || 0;
  }
  
 +sub isKernelFreeBSD()
@@ -25,4 +23,4 @@ Index: Tools/Scripts/webkitdirs.pm
 +
  sub isARM()
  {
-     return ($Config{archname} =~ /^arm[v\-]/) || ($Config{archname} =~ /^aarch64[v\-]/);
+     return $Config{archname} =~ /^arm-/;

-- 
QtWebKit packaging