[SCM] Qt 4 packaging branch, kubuntu_vivid, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-2-6-g134ca8b

Sun Nov 2 11:58:49 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=134ca8b

The following commit has been merged in the kubuntu_vivid branch:
commit 134ca8b6b3241df239743d50df502b49504b1c2d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Nov 2 14:58:36 2014 +0300

    Drop the hacks to build QtWebKit for Assistant.
    
    As we now have Assistant from Qt 5.x properly built against QtWebKit 5.x.
---
 debian/changelog                                   |  7 +++
 ...kubuntu_17_enable_qtwebkit_for_qtassistant.diff | 61 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       | 37 ++-----------
 4 files changed, 10 insertions(+), 96 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 763a9f3..711ea81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu2) UNRELEASED; urgency=medium
+
+  * Drop the hacks to build QtWebKit for Assistant, as we now have Assistant
+    from Qt 5.x properly built against QtWebKit 5.x.
+
+ -- Dmitry Shachnev <mitya57 at ubuntu.com>  Sun, 02 Nov 2014 14:56:51 +0300
+
 qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu1) vivid; urgency=medium
 
   * Merge with Debian git, remaining changes:
diff --git a/debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff b/debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff
deleted file mode 100644
index baa2e63..0000000
--- a/debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Build QtWebkit and use it only for QtAssistant.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-Forwarded: no
-
----
- src/src.pro                                   |    4 ----
- tools/assistant/tools/assistant/assistant.pro |    7 ++-----
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-Index: qt-everywhere-opensource-src-4.8.4/src/src.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/src/src.pro	2013-01-09 12:42:23.357146954 +0000
-+++ qt-everywhere-opensource-src-4.8.4/src/src.pro	2013-01-09 12:42:23.313146953 +0000
-@@ -21,9 +21,7 @@
- contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
- contains(QT_CONFIG, script): SRC_SUBDIRS += src_script
- contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative
--contains(QT_CONFIG, webkit)  {
-     SRC_SUBDIRS += src_webkit
--}
- !contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools
- SRC_SUBDIRS += src_plugins
- contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports
-@@ -111,11 +109,9 @@
-    src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
-    src_s60installs.depends -= src_s60installs
-    src_imports.depends = src_gui src_declarative
--   contains(QT_CONFIG, webkit)  {
-       src_webkit.depends = src_gui src_sql src_network
-       contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
-       src_imports.depends += src_webkit
--   }
-    contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support
-    contains(QT_CONFIG, dbus):{
-       src_plugins.depends += src_dbus
-Index: qt-everywhere-opensource-src-4.8.4/tools/assistant/tools/assistant/assistant.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/assistant/tools/assistant/assistant.pro	2013-01-09 12:42:23.357146954 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/assistant/tools/assistant/assistant.pro	2013-01-09 12:42:23.313146953 +0000
-@@ -2,7 +2,8 @@
- TEMPLATE = app
- LANGUAGE = C++
- TARGET = assistant
--contains(QT_CONFIG, webkit):QT += webkit
-+QT += webkit
-+DEFINES += QT_WEBKIT
- CONFIG += qt \
-     warn_on \
-     help
-@@ -85,11 +86,7 @@
-     openpageswidget.cpp \
-     openpagesmanager.cpp \
-     openpagesswitcher.cpp
--contains(QT_CONFIG, webkit) {
-     SOURCES += helpviewer_qwv.cpp
--} else {
--    SOURCES += helpviewer_qtb.cpp
--}
- 
- FORMS += bookmarkdialog.ui \
-     bookmarkmanagerwidget.ui \
diff --git a/debian/patches/series b/debian/patches/series
index 1bd024e..00d4c16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -57,7 +57,6 @@ ppc64el_configure_support.patch
 kubuntu_10_ibus_input_method.diff
 kubuntu_12_fix_stack_protector.diff
 kubuntu_14_systemtrayicon.diff
-kubuntu_17_enable_qtwebkit_for_qtassistant.diff
 kubuntu_28_xi2.1.patch
 kubuntu_30_translucent_drag_pixmap.diff
 kubuntu_31_unity_workarea_atom.diff
diff --git a/debian/rules b/debian/rules
index 9e7293a..6fb0611 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,10 +75,6 @@ else
 	                        -no-egl
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
-	extra_configure_opts += -no-javascript-jit
-endif
-
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el))
 	platform_arg = linux-g++
@@ -181,9 +177,6 @@ endif
 	            -icu \
 	            $(extra_configure_opts)
 
-	# Kubuntu addition: set the version of QtWebkit but don't add it to QT_CONFIG
-	sed 's/^\s*QT_CONFIG.*//' src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri > mkspecs/modules/qt_webkit_version.pri
-
 override_dh_auto_build:
 	dh_auto_build
 	# Build documentations
@@ -196,8 +189,6 @@ endif
 	# Workaround: It's a known qmake limitation.
 	# It can't generate install rules for files that don't exist yet like docs.
 	./config.status
-	# Kubuntu addition: set the version of QtWebkit but don't add it to QT_CONFIG
-	sed 's/^\s*QT_CONFIG.*//' src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri > mkspecs/modules/qt_webkit_version.pri
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) confclean distclean
@@ -331,9 +322,6 @@ override_dh_auto_install:
 	# QTBUG-12159 workaround
 	rm -fv debian/tmp//usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
 
-	# Kubuntu addition
-	rm -f debian/tmp/usr/lib/*/libQtWebKit*
-
 	# Remove phonon development files
 	rm -fv debian/tmp/usr/lib/*/libphonon.la
 	rm -fv debian/tmp/usr/lib/*/libphonon.prl
@@ -380,7 +368,7 @@ override_dh_auto_install:
 		-exec chmod a-x {} \;
 
 override_dh_install:
-	dh_install --list-missing
+	dh_install --fail-missing
 
 override_dh_installdocs:
 	dh_installdocs --all LGPL_EXCEPTION.txt
@@ -404,27 +392,8 @@ override_dh_makeshlibs:
 	done
 
 override_dh_shlibdeps:
-	# Kubuntu: assistant-qt4 links against libQtWebkit which we don't package in qt4-x11
-	# dependencies are manually added in debian/control
-	dh_shlibdeps -pqt4-dev-tools -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin/assistant
-	dh_shlibdeps -pqt4-demos \
-		-Xusr/lib/qt4/examples/webkit/webplugin/webplugin \
-		-Xusr/lib/qt4/examples/webkit/simpleselector/simpleselector \
-		-Xusr/lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel \
-		-Xusr/lib/qt4/examples/webkit/previewer/previewer \
-		-Xusr/lib/qt4/examples/webkit/domtraversal/domtraversal \
-		-Xusr/lib/qt4/demos/browser/browser \
-		-Xusr/lib/qt4/examples/webkit/fancybrowser/fancybrowser \
-		-Xusr/lib/qt4/examples/webkit/simpleselector/simpleselector \
-		-Xusr/lib/qt4/examples/webkit/domtraversal/domtraversal \
-		-Xusr/lib/qt4/examples/webkit/webplugin/webplugin \
-		-Xusr/lib/qt4/examples/webkit/googlechat/googlechat \
-		-Xusr/lib/qt4/examples/webkit/formextractor/formextractor \
-		-Xusr/lib/qt4/examples/webkit/simplewebplugin/simplewebplugin \
-		-Xusr/lib/qt4/examples/webkit/previewer/previewer \
-		-Xusr/lib/qt4/examples/webkit/fancybrowser/fancybrowser \
-		-Xusr/lib/qt4/examples/webkit/framecapture/framecapture \
-		-Xusr/lib/qt4/examples/webkit/webftpclient/webftpclient
+	# Exclude phonon deps from libqt4-phonon itself (they get injected there somehow)
+	dh_shlibdeps -plibqt4-phonon -- -xlibphonon4 -xlibqt4-phonon
 	dh_shlibdeps --remaining-packages
 
 override_dh_builddeb:

-- 
Qt 4 packaging

