summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog21
-rw-r--r--debian/control16
-rw-r--r--debian/libqt5webkit5.symbols23
-rw-r--r--debian/patches/fix_pthread_linking.diff18
-rw-r--r--debian/patches/no_gc_sections.diff2
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules7
7 files changed, 43 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 65c6941..01c9f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+qtwebkit-opensource-src (5.7.1~20161021+dfsg-1) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream snapshot.
+ * Merge 5.6.1+dfsg-5 upload from unstable.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 25 Oct 2016 14:52:21 +0300
+
+qtwebkit-opensource-src (5.7.0+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * 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.
+ * Refresh no_gc_sections.diff.
+ * Bump Qt build-dependencies to 5.7.0.
+ * Update the symbols files from 5.6.1 build logs.
+ * Drop the syncqt hack, the new tarballs are generated properly.
+ * Add Qt_5.7 version tag to debian/libqt5webkit5.symbols.
+
+ -- Dmitry Shachnev <mitya57@debian.org> Thu, 07 Jul 2016 21:37:28 +0300
+
qtwebkit-opensource-src (5.6.1+dfsg-5) unstable; urgency=medium
* Update symbols files with buildds' logs.
diff --git a/debian/control b/debian/control
index 7fc5311..7d5fe8f 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Build-Depends: bison,
libjpeg-dev,
# libleveldb-dev,
libpng-dev,
- libqt5opengl5-dev (>= 5.6.1+dfsg~),
- libqt5xmlpatterns5-dev (>= 5.6.1~),
+ libqt5opengl5-dev (>= 5.7.0+dfsg~),
+ libqt5xmlpatterns5-dev (>= 5.7.0~),
libsqlite3-dev,
libwebp-dev,
libxcomposite-dev,
@@ -33,13 +33,13 @@ Build-Depends: bison,
pkg-kde-tools (>= 0.6.4),
python-minimal,
python2.7,
- qtbase5-private-dev (>= 5.6.1+dfsg~),
- qtdeclarative5-private-dev (>= 5.6.1~),
- qtscript5-private-dev (>= 5.6.1+dfsg~),
+ qtbase5-private-dev (>= 5.7.0+dfsg~),
+ qtdeclarative5-private-dev (>= 5.7.0~),
+ qtscript5-private-dev (>= 5.7.0+dfsg~),
ruby
-Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~),
- qtbase5-doc-html (>= 5.6.1+dfsg~),
- qttools5-dev-tools (>= 5.6.1~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.0+dfsg~),
+ qtbase5-doc-html (>= 5.7.0+dfsg~),
+ qttools5-dev-tools (>= 5.7.0~)
Standards-Version: 3.9.8
Section: libs
Homepage: http://trac.webkit.org/wiki/QtWebKit
diff --git a/debian/libqt5webkit5.symbols b/debian/libqt5webkit5.symbols
index 662457f..5640dae 100644
--- a/debian/libqt5webkit5.symbols
+++ b/debian/libqt5webkit5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.6.1 amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64
+# SymbolsHelper-Confirmed: 5.7.0 ppc64el
libQt5WebKit.so.5 libqt5webkit5 #MINVER#
JSCheckScriptSyntax@Base 5.0.2
JSClassCreate@Base 5.0.2
@@ -2445,7 +2445,7 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
_ZN3WTF22cancelCallOnMainThreadEPFvPvES0_@Base 5.0.2
(subst)_ZN3WTF22charactersToUIntStrictEPKh{size_t}Pbi@Base 5.2.0
(subst)_ZN3WTF22charactersToUIntStrictEPKt{size_t}Pbi@Base 5.2.0
- (arch=amd64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386)_ZN3WTF22isMainThreadOrGCThreadEv@Base 5.2.1
+ (arch=amd64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32)_ZN3WTF22isMainThreadOrGCThreadEv@Base 5.6.1
_ZN3WTF23callOnMainThreadAndWaitEPFvPvES0_@Base 5.0.2
_ZN3WTF23dayInMonthFromDayInYearEib@Base 5.0.2
_ZN3WTF23waitForThreadCompletionEj@Base 5.0.2
@@ -2588,9 +2588,9 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
_ZN3WTF9MediaTimeD1Ev@Base 5.0.2
_ZN3WTF9MediaTimeD2Ev@Base 5.0.2
_ZN3WTF9MediaTimeaSERKS0_@Base 5.0.2
- (arch=amd64 kfreebsd-amd64 powerpc s390x)_ZN3WTF9dataLogFVEPKcP13__va_list_tag@Base 5.2.1
+ (arch=amd64 kfreebsd-amd64 powerpc s390x x32)_ZN3WTF9dataLogFVEPKcP13__va_list_tag@Base 5.6.1
(arch=hurd-i386 i386 kfreebsd-i386 ppc64 ppc64el)_ZN3WTF9dataLogFVEPKcPc@Base 5.3.2
- (arch=mips mips64el mipsel sparc sparc64)_ZN3WTF9dataLogFVEPKcPv@Base 5.3.1
+ (arch=hppa mips mips64el mipsel sparc sparc64)_ZN3WTF9dataLogFVEPKcPv@Base 5.6.1
(arch=arm64 armel armhf)_ZN3WTF9dataLogFVEPKcSt9__va_list@Base 5.3.1
_ZN3WTF9dayInYearEdi@Base 5.0.2
_ZN3WTF9dayInYearEiii@Base 5.2.0
@@ -2888,7 +2888,8 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
_ZNK25QQuickWebViewExperimental9userAgentEv@Base 5.0.2
_ZNK3JSC10JSFunction10sourceCodeEv@Base 5.0.2
_ZNK3JSC10JSFunction23isHostFunctionNonInlineEv@Base 5.0.2
- (optional=gccinternal)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRN3WTF6StringERNS_7JSValueE@Base 5.3.1
+ (optional=gccinternal|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRN3WTF6StringERNS_7JSValueE@Base 5.3.1
+ (arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiS3_RN3WTF6StringERNS_7JSValueE@Base 5.6.1
_ZNK3JSC12JSRopeString11resolveRopeEPNS_9ExecStateE@Base 5.0.2
_ZNK3JSC12PropertySlot14functionGetterEPNS_9ExecStateE@Base 5.0.2
_ZNK3JSC17DebuggerCallFrame10thisObjectEv@Base 5.0.2
@@ -3000,19 +3001,20 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
(optional=templinst|subst)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIJRK{size_t}EEEvDpOT_@Base 5.2.0
(optional=templinst|subst)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIJ{size_t}EEEvDpOT_@Base 5.2.0
(optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_@Base 5.0.2
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 5.2.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 5.2.0
(optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 5.0.2
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_@Base 5.4.2
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 5.4.2
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 5.4.2
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 5.4.2
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 5.4.2
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 5.4.2
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 5.4.2
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 5.4.2
(optional=templinst|subst)_ZNSt8_Rb_treeISt4pairIi{uint64_t}ES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EES0_ISt17_Rb_tree_iteratorIS1_EbEOT_@Base 5.4.1
(optional=templinst|subst)_ZNSt8_Rb_treeISt4pairIi{uint64_t}ES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 5.4.1
- (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeImEPKS9_PSt18_Rb_tree_node_baseRT_@Base 5.6.1
+ (optional=templinst|arch=armel armhf)_ZNSt8_Rb_treeIyySt9_IdentityIyESt4lessIyESaIyEE4findERKy@Base 5.6.1
(optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE16_M_insert_uniqueIRK{uint64_t}EESt4pairISt17_Rb_tree_iteratorI{uint64_t}EbEOT_@Base 5.3.0
(optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE5eraseERK{uint64_t}@Base 5.3.0
+ (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeI{uint64_t}EPKS9_SA_RT_@Base 5.4.2
(optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE8_M_eraseEPSt13_Rb_tree_nodeI{uint64_t}E@Base 5.3.0
(optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc)_ZSt4swapIN8QVariant7PrivateEEvRT_S3_@Base 5.2.0
(optional=templinst)_ZSteqIcEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEbE6__typeERKNSt7__cxx1112basic_stringIS3_St11char_traitsIS3_ESaIS3_EEESE_@Base 5.5.1
@@ -3115,7 +3117,7 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
(c++)"non-virtual thunk to QQuickWebPage::~QQuickWebPage()@Base" 5.0.2
(c++)"non-virtual thunk to QQuickWebView::componentComplete()@Base" 5.0.2
(c++)"non-virtual thunk to QQuickWebView::~QQuickWebView()@Base" 5.0.2
-# SymbolsHelper-Confirmed: 5.6.0~rc ppc64el
+# SymbolsHelper-Confirmed: 5.7.0 ppc64el
libQt5WebKitWidgets.so.5 libqt5webkit5 #MINVER#
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.0@Qt_5.0 5.6.1
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.1@Qt_5.1 5.6.1
@@ -3124,6 +3126,7 @@ libQt5WebKitWidgets.so.5 libqt5webkit5 #MINVER#
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.4@Qt_5.4 5.6.1
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.5@Qt_5.5 5.6.1
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.6@Qt_5.6 5.6.1
+ (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.7@Qt_5.7 5.7.0
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5@Qt_5 5.6.1
(optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5_PRIVATE_API@Qt_5_PRIVATE_API 5.6.1
_ZN13QWebInspector10closeEventEP11QCloseEvent@Qt_5 5.6.0~rc
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/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index 668277f..79f20af 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -14,7 +14,7 @@ Last-Update: 2013-02-07 (add i686)
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
-@@ -313,7 +313,7 @@
+@@ -314,7 +314,7 @@
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections
}
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
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
diff --git a/debian/rules b/debian/rules
index 492fe74..f591ca7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,6 @@ fulldebug_architectures := none
disabled_jit_architectures := armel mips mipsel
disabled_pch_architectures := amd64 powerpc s390x
-debian_version = $(shell dpkg-parsechangelog -SVersion)
-upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
-upstream_version = $(firstword $(subst +, ,$(debian_version)))
-
%:
dh $@ --parallel --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper
@@ -54,9 +50,6 @@ endif
# Run qmake again now with the proper values.
qmake
- # Upstream 5.6.0 RC tarball was generated improperly and has no synced headers
- /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(upstream_version)
-
override_dh_auto_build-indep:
dh_auto_build -- sub-Source-QtWebKit-pro-clean
dh_auto_build -- -CSource -fMakefile.api docs
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 13:16:17 +0000