[SCM] qt5webkit packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-4ubuntu1-8-gcd6c2cf

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu branch:
commit 6b15de3de393e372feee97785fff27fec8404af6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 5 16:29:19 2016 +0300

    Drop debian/patches/fix_pthread_linking.diff.
    
    It was applied upstream in 5.6.1 and wrongly rebased in 5.6.1+dfsg-1 upload.
    
    (cherry picked from commit 5df54a20e64e24084f60f01ac7414af52dddfd90)
---
 debian/changelog                        |  2 ++
 debian/patches/fix_pthread_linking.diff | 18 ------------------
 debian/patches/series                   |  1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f0da21..b366040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtwebkit-opensource-src (5.6.1+dfsg-5ubuntu1) UNRELEASED; urgency=medium
 
   * Re-sync with Debian unstable, no changes remaining.
   * Re-enable WebP, it is in main since Trusty (LP: #1652166).
+  * Drop debian/patches/fix_pthread_linking.diff, it was applied upstream
+    in 5.6.1 and wrongly rebased in 5.6.1+dfsg-1 upload.
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Fri, 23 Dec 2016 13:00:54 +0300
 
diff --git a/debian/patches/fix_pthread_linking.diff b/debian/patches/fix_pthread_linking.diff
deleted file mode 100644
index a95bef6..0000000
--- a/debian/patches/fix_pthread_linking.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix pthread linking
-Origin: upstream, https://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=5f359baacdf92fab
-Last-Update: 2016-03-06
-
----
- Tools/qmake/mkspecs/features/default_post.prf |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/Tools/qmake/mkspecs/features/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/default_post.prf
-@@ -230,6 +230,7 @@ for(subdir, SUBDIRS) {
-         #message(Removing invalid subtarget $${subdir} $${path})
-         #SUBDIRS -= $${subdir}
-     }
-+    posix:!darwin: LIBS += -lpthread
- }
- 
- root_project_file {
diff --git a/debian/patches/series b/debian/patches/series
index 1785b91..ab2532d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 fix_nonlinux_glibc_linkage.diff
-fix_pthread_linking.diff

-- 
qt5webkit packaging