[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

Wed Sep 3 03:40:49 UTC 2014

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

The following commit has been merged in the master branch:
commit bdf98d886d6806bca720a8f3ea9979c8d5d6d5ed
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sat Jun 7 23:08:23 2014 +0200

    Switch building to Tools/Scripts/build-webkit.
    
    Changes copied from Kubuntu packaging. Thanks!
---
 debian/changelog                           |  2 ++
 debian/libqtwebkit-dev.install             | 37 ---------------------------
 debian/libqtwebkit-qmlwebkitplugin.install |  2 --
 debian/libqtwebkit4.install                |  1 -
 debian/rules                               | 40 +++++++++++++++++++-----------
 5 files changed, 28 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 436edbc..c68cedd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
     - remove upstream_changeset_r93631.diff, applied upstream
     - remove upstream_changeset_r113848.diff, applied upstream 
     - remove upstream_Build-fixes-for-glib-2.31.diff, applied upstream
+  * Switch to building with ./Tools/Scripts/build-webkit as recommended
+    by upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jun 2014 21:18:08 +0200
 
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
deleted file mode 100644
index cb4dbaa..0000000
--- a/debian/libqtwebkit-dev.install
+++ /dev/null
@@ -1,37 +0,0 @@
-usr/include/qt4/QtWebKit/QGraphicsWebView
-usr/include/qt4/QtWebKit/QWebDatabase
-usr/include/qt4/QtWebKit/QWebElement
-usr/include/qt4/QtWebKit/QWebElementCollection
-usr/include/qt4/QtWebKit/QWebFrame
-usr/include/qt4/QtWebKit/QWebHistory
-usr/include/qt4/QtWebKit/QWebHistoryInterface
-usr/include/qt4/QtWebKit/QWebHistoryItem
-usr/include/qt4/QtWebKit/QWebHitTestResult
-usr/include/qt4/QtWebKit/QWebInspector
-usr/include/qt4/QtWebKit/QWebPage
-usr/include/qt4/QtWebKit/QWebPluginFactory
-usr/include/qt4/QtWebKit/QWebSecurityOrigin
-usr/include/qt4/QtWebKit/QWebSettings
-usr/include/qt4/QtWebKit/QWebView
-usr/include/qt4/QtWebKit/QtWebKit
-usr/include/qt4/QtWebKit/ViewportAttributes
-usr/include/qt4/QtWebKit/qgraphicswebview.h
-usr/include/qt4/QtWebKit/qwebdatabase.h
-usr/include/qt4/QtWebKit/qwebelement.h
-usr/include/qt4/QtWebKit/qwebframe.h
-usr/include/qt4/QtWebKit/qwebhistory.h
-usr/include/qt4/QtWebKit/qwebhistoryinterface.h
-usr/include/qt4/QtWebKit/qwebinspector.h
-usr/include/qt4/QtWebKit/qwebkitglobal.h
-usr/include/qt4/QtWebKit/qwebkitplatformplugin.h
-usr/include/qt4/QtWebKit/qwebkitversion.h
-usr/include/qt4/QtWebKit/qwebpage.h
-usr/include/qt4/QtWebKit/qwebpluginfactory.h
-usr/include/qt4/QtWebKit/qwebsecurityorigin.h
-usr/include/qt4/QtWebKit/qwebsettings.h
-usr/include/qt4/QtWebKit/qwebview.h
-usr/lib/*/libQtWebKit.prl
-usr/lib/*/libQtWebKit.so
-usr/lib/*/pkgconfig/QtWebKit.pc
-usr/lib/*/qt4/plugins/designer/libqwebview.so
-usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
diff --git a/debian/libqtwebkit-qmlwebkitplugin.install b/debian/libqtwebkit-qmlwebkitplugin.install
index bbc8855..e69de29 100644
--- a/debian/libqtwebkit-qmlwebkitplugin.install
+++ b/debian/libqtwebkit-qmlwebkitplugin.install
@@ -1,2 +0,0 @@
-usr/lib/*/qt4/imports/QtWebKit/libqmlwebkitplugin.so
-usr/lib/*/qt4/imports/QtWebKit/qmldir
diff --git a/debian/libqtwebkit4.install b/debian/libqtwebkit4.install
deleted file mode 100644
index 917f930..0000000
--- a/debian/libqtwebkit4.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQtWebKit.so.*
diff --git a/debian/rules b/debian/rules
index 8acbb32..ed2d9b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-QWEBVIEW_DIR=debian/plugins/qwebview
-
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -18,25 +16,39 @@ ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
     export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
 endif
 
+export QMAKEPATH=Tools/qmake
+export QTDIR=/usr
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 %:
-	dh $@ --sourcedirectory=Source --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
+	dh $@ --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
+
+override_dh_auto_clean:
+	rm -rf WebKitBuild
+	-find . -name *.pyc | xargs rm
 
 override_dh_auto_configure:
-	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
-	dh_auto_configure --sourcedirectory=$(QWEBVIEW_DIR)
+	true
 
 override_dh_auto_build:
-	dh_auto_build
-	dh_auto_build --sourcedirectory=$(QWEBVIEW_DIR)
+	./Tools/Scripts/build-webkit --qt
 
 override_dh_auto_install:
-	dh_auto_install
-	dh_auto_install --sourcedirectory=$(QWEBVIEW_DIR)
-
-override_dh_auto_clean:
-	if [ -d Source ]; then rm -f Source/Makefile; fi
-	if [ -d Source ]; then dh_auto_clean; else dh_auto_clean --sourcedirectory=.; fi
-	dh_auto_clean --sourcedirectory=$(QWEBVIEW_DIR)
+	dh_install
+	mkdir -p debian/libqtwebkit4/usr/lib/$(DEB_HOST_MULTIARCH)/
+	cp --no-dereference WebKitBuild/Release/lib/libQtWebKit.so.* debian/libqtwebkit4/usr/lib/$(DEB_HOST_MULTIARCH)/
+
+	mkdir -p debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
+	cp WebKitBuild/Release/lib/libQtWebKit.prl debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libQtWebKit.prl
+	cp WebKitBuild/Release/lib/pkgconfig/QtWebKit.pc debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/QtWebKit.pc
+	mkdir -p debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/
+	cp Source/WebKit/qt/Api/*h debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/
+	cp WebKitBuild/Release/include/QtWebKit/Q* debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/
+	rm debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/*_p.h
+	cp --no-dereference WebKitBuild/Release/lib/libQtWebKit.so debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
+
+	mkdir -p debian/libqtwebkit-qmlwebkitplugin/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports/QtWebKit/
+	cp WebKitBuild/Release/imports/QtWebKit/libqmlwebkitplugin.so debian/libqtwebkit-qmlwebkitplugin/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports/QtWebKit/
+	cp WebKitBuild/Release/imports/QtWebKit/qmldir debian/libqtwebkit-qmlwebkitplugin/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports/QtWebKit/
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
QtWebKit packaging

