[SCM] qt5webkit packaging branch, experimental, updated. debian/5.6.0+dfsg-1-3-gdc44ce0

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jun 10 17:37:19 UTC 2016


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

The following commit has been merged in the experimental branch:
commit dc44ce09f0ea3632edd0a23fd61a6cf603c08dbc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jun 10 14:36:18 2016 -0300

    Refresh fix_pthread_linking.diff.
---
 debian/changelog                        |  1 +
 debian/patches/fix_pthread_linking.diff | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 777f840..e8eecd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit-opensource-src (5.6.1+dfsg-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
     - Bump Qt build dependencies.
+  * Refresh fix_pthread_linking.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Jun 2016 14:24:15 -0300
 
diff --git a/debian/patches/fix_pthread_linking.diff b/debian/patches/fix_pthread_linking.diff
index 37f352d..a95bef6 100644
--- a/debian/patches/fix_pthread_linking.diff
+++ b/debian/patches/fix_pthread_linking.diff
@@ -2,13 +2,17 @@ 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
-@@ -201,6 +201,7 @@
-         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
-         LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+@@ -230,6 +230,7 @@ for(subdir, SUBDIRS) {
+         #message(Removing invalid subtarget $${subdir} $${path})
+         #SUBDIRS -= $${subdir}
      }
 +    posix:!darwin: LIBS += -lpthread
  }
  
- creating_module {
+ root_project_file {

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list