[SCM] qtscript packaging branch, experimental, updated. debian/5.4.0+dfsg-2-5-gd2d8c94

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit fdfe60473a26ce6bdfcd5a6e29ebd4980c6048a7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 25 11:39:45 2015 +0300

    Update patches for the new release.
---
 debian/changelog                                   |  3 +++
 debian/patches/s390x_jscore.diff                   |  4 +--
 debian/patches/series                              |  1 -
 ...am_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch | 30 ----------------------
 4 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb5b5da..8a37266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtscript-opensource-src (5.4.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update debian/watch to use https://download.qt.io/.
   * Build-depend on qtbase 5.4.1.
+  * Drop upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch, applied
+    upstream.
+  * Refresh s390x_jscore.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 25 Feb 2015 11:27:48 +0300
 
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 9f7999e..7c20530 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -10,7 +10,7 @@ Last-Update: 2014-05-21
 
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -189,6 +189,18 @@
+@@ -222,6 +222,18 @@
  #define WTF_CPU_SPARC 1
  #endif
  
@@ -29,7 +29,7 @@ Last-Update: 2014-05-21
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -911,7 +923,7 @@
+@@ -944,7 +956,7 @@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
diff --git a/debian/patches/series b/debian/patches/series
index d43758a..021a4c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch
 enable-make-check.patch
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
diff --git a/debian/patches/upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch b/debian/patches/upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch
deleted file mode 100644
index 439ff57..0000000
--- a/debian/patches/upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 52e775b4d0e59dfb44c22b070f272dbc21014389 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 27 Dec 2014 19:36:19 +0100
-Subject: [PATCH] Disable pthread_np.h on BSD w/ GNU libc
-
-pthread_np.h exists on BSD userlands only, so do not enable it
-on BSD kernels with GNU libc/userland (e.g. GNU/kFreeBSD).
-
-Change-Id: Ic9bb2221531322ce425543c85155cfafc5294c41
-Reviewed-by: Simon Hausmann <simon.hausmann at digia.com>
----
- src/3rdparty/javascriptcore/JavaScriptCore/config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h
-index 6be10fc..07f76b2 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h
-@@ -53,7 +53,7 @@
- 
- #endif
- 
--#if OS(FREEBSD) || OS(OPENBSD)
-+#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
- #define HAVE_PTHREAD_NP_H 1
- #endif
- 
--- 
-2.1.4
-

-- 
qtscript packaging