[SCM] qtscript packaging branch, experimental, updated. debian/5.4.0+dfsg-1-3-g8fcd07a

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 8fcd07a77b66ff09e21349ca0671cb01dbb4d86e
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jan 17 11:18:51 2015 +0100

    kfreebsd.diff: replace with upstream commit
    
    backport upstream commit 52e775b4d0e59dfb44c22b070f272dbc21014389
---
 debian/changelog                                   |  5 ++--
 debian/patches/kfreebsd.diff                       | 18 -------------
 debian/patches/series                              |  2 +-
 ...am_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch | 30 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb25a28..656f989 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 qtscript-opensource-src (5.4.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
-  * Fix build on GNU/kFreeBSD, making sure that pthread_np.h is not used;
-    patch kfreebsd.diff.
+  * Backport upstream commit 52e775b4d0e59dfb44c22b070f272dbc21014389 to fix
+    build on GNU/kFreeBSD, making sure that pthread_np.h is not used;
+    patch upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 19:39:55 +0100
 
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
deleted file mode 100644
index d7dc8a7..0000000
--- a/debian/patches/kfreebsd.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: 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).
-Last-Update: 2014-12-27
-Forwarded: https://codereview.qt-project.org/#/c/102659/
-
---- 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
- 
diff --git a/debian/patches/series b/debian/patches/series
index 357ecb2..d43758a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
+upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch
 enable-make-check.patch
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
-kfreebsd.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
new file mode 100644
index 0000000..439ff57
--- /dev/null
+++ b/debian/patches/upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch
@@ -0,0 +1,30 @@
+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