[SCM] qt5webkit packaging branch, experimental, updated. debian/5.6.0-rc+dfsg-1-4-gd14f92a

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sun Mar 6 19:37:48 UTC 2016


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

The following commit has been merged in the experimental branch:
commit fbda64ead409124c1321ac0815a959e0dcf6ce11
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Mar 6 22:33:38 2016 +0300

    Backport fix_pthread_linking.diff from upstream.
---
 debian/changelog                        |  1 +
 debian/patches/fix_pthread_linking.diff | 14 ++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2504304..f22b474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebkit-opensource-src (5.6.0~rc+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Explicitly specify Makefile for building docs.
+  * Backport fix_pthread_linking.diff from upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Mar 2016 15:26:56 +0300
 
diff --git a/debian/patches/fix_pthread_linking.diff b/debian/patches/fix_pthread_linking.diff
new file mode 100644
index 0000000..37f352d
--- /dev/null
+++ b/debian/patches/fix_pthread_linking.diff
@@ -0,0 +1,14 @@
+Description: fix pthread linking
+Origin: upstream, https://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=5f359baacdf92fab
+Last-Update: 2016-03-06
+
+--- a/Tools/qmake/mkspecs/features/default_post.prf
++++ b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -201,6 +201,7 @@
+         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
+         LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+     }
++    posix:!darwin: LIBS += -lpthread
+ }
+ 
+ creating_module {
diff --git a/debian/patches/series b/debian/patches/series
index ab2532d..1785b91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 fix_nonlinux_glibc_linkage.diff
+fix_pthread_linking.diff

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list