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

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 2ba105bdee2d81130d6b6f89f6f46f5191f9553d
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 27 19:41:54 2014 +0100

    fix build on GNU/kFreeBSD
    
    make sure that pthread_np.h is not used
---
 debian/changelog             |  3 +++
 debian/patches/kfreebsd.diff | 18 ++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 77f15cf..eb25a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 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.
 
  -- 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
new file mode 100644
index 0000000..d7dc8a7
--- /dev/null
+++ b/debian/patches/kfreebsd.diff
@@ -0,0 +1,18 @@
+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 021a4c5..357ecb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 enable-make-check.patch
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
+kfreebsd.diff

-- 
qtscript packaging