[Python-modules-commits] [pyqt5] 01/02: Add Qt WebEngine support for amd64 and i386.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sun Jan 8 12:33:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch stretch
in repository pyqt5.
commit d8e471b668d6d2b7f855aea04dd6c1fde0da2069
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sun Jan 8 11:43:40 2017 +0300
Add Qt WebEngine support for amd64 and i386.
Closes: #841830.
---
debian/changelog | 6 ++++
debian/control | 57 +++++++++++++++++++++++++++++++-
debian/python-pyqt5.qtwebengine.install | 1 +
debian/python3-pyqt5.qtwebengine.install | 2 ++
debian/rules | 41 +++++++++++++----------
5 files changed, 88 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 587e1f4..6912afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyqt5 (5.7+dfsg-4) UNRELEASED; urgency=medium
+
+ * Add Qt WebEngine support for amd64 and i386 (closes: #841830).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 08 Jan 2017 11:42:40 +0300
+
pyqt5 (5.7+dfsg-3) experimental; urgency=medium
* Build against Qt 5.7 for experimental.
diff --git a/debian/control b/debian/control
index 996da22..fcf844a 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,8 @@ Build-Depends: debhelper (>= 9),
qtlocation5-dev (>= 5.7.0),
qtmultimedia5-dev (>= 5.7.0),
qtpositioning5-dev (>= 5.7.0),
- qttools5-dev (>= 5.7.0)
+ qttools5-dev (>= 5.7.0),
+ qtwebengine5-dev (>= 5.7.1) [amd64 i386]
Build-Depends-Indep: fdupes, python3-sphinx (>= 1.3)
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.3
@@ -212,6 +213,33 @@ Description: Python 3 bindings for Qt5's SQL module (debug extension)
.
This package contains the extension built for the Python 3 debug interpreter.
+Package: python3-pyqt5.qtwebengine
+Architecture: amd64 i386
+Depends: python3-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python 3 bindings for Qt5's WebEngine module
+ The WebEngine module of PyQt5 provides a Chromium-based Web browser engine
+ for PyQt5 applications.
+ .
+ This package contains the Python 3 version of this module.
+
+Package: python3-pyqt5.qtwebengine-dbg
+Priority: extra
+Section: debug
+Architecture: amd64 i386
+Depends: python3-dbg,
+ python3-pyqt5-dbg (= ${binary:Version}),
+ python3-pyqt5.qtwebengine (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python 3 bindings for Qt5's WebEngine module (debug extensions)
+ The WebEngine module of PyQt5 provides a Chromium-based Web browser engine
+ for PyQt5 applications.
+ .
+ This package contains the extensions built for the Python 3 debug interpreter.
+
Package: python3-pyqt5.qtwebkit
Architecture: any
Depends: python3-pyqt5 (= ${binary:Version}),
@@ -596,6 +624,33 @@ Description: Python 2 bindings for Qt5's SQL module (debug extension)
.
This package contains the extension built for the Python 2 debug interpreter.
+Package: python-pyqt5.qtwebengine
+Architecture: amd64 i386
+Depends: python-pyqt5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Python 2 bindings for Qt5's WebEngine module
+ The WebEngine module of PyQt5 provides a Chromium-based Web browser engine
+ for PyQt5 applications.
+ .
+ This package contains the Python 2 version of this module.
+
+Package: python-pyqt5.qtwebengine-dbg
+Priority: extra
+Section: debug
+Architecture: amd64 i386
+Depends: python-dbg,
+ python-pyqt5-dbg (= ${binary:Version}),
+ python-pyqt5.qtwebengine (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python 2 bindings for Qt5's WebEngine module (debug extensions)
+ The WebEngine module of PyQt5 provides a Chromium-based Web browser engine
+ for PyQt5 applications.
+ .
+ This package contains the extensions built for the Python 2 debug interpreter.
+
Package: python-pyqt5.qtwebkit
Architecture: any
Depends: python-pyqt5 (= ${binary:Version}),
diff --git a/debian/python-pyqt5.qtwebengine.install b/debian/python-pyqt5.qtwebengine.install
new file mode 100644
index 0000000..ba3125f
--- /dev/null
+++ b/debian/python-pyqt5.qtwebengine.install
@@ -0,0 +1 @@
+usr/lib/python2*/*-packages/PyQt5/QtWebEngine*.so
diff --git a/debian/python3-pyqt5.qtwebengine.install b/debian/python3-pyqt5.qtwebengine.install
new file mode 100644
index 0000000..cefe674
--- /dev/null
+++ b/debian/python3-pyqt5.qtwebengine.install
@@ -0,0 +1,2 @@
+usr/lib/python3*/dist-packages/PyQt5/QtWebEngine*.pyi
+usr/lib/python3*/dist-packages/PyQt5/QtWebEngine*.so
diff --git a/debian/rules b/debian/rules
index 578a0bd..833ad04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,17 @@ DEFAULT_PYTHON := $(shell py3versions -vd)
PYTHON := 2.7
ALLPYTHONS := $(PYTHON3S) $(PYTHON)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+QTWEBENGINE_ARCHS := amd64 i386
+
+PYQT_MODULES := opengl sql webkit websockets xmlpatterns svg multimedia quick \
+ serialport sensors x11extras positioning
+ifneq (,$(filter $(DEB_HOST_ARCH),$(QTWEBENGINE_ARCHS)))
+ PYQT_MODULES += webengine
+endif
+
+PY_PACKAGE_NAMES := pyqt5 $(PYQT_MODULES:%=pyqt5.qt%) dbus.mainloop.pyqt5
+
export QT_SELECT=qt5
# LIBS_* is unset to avoid linking to too many libraries
@@ -166,7 +177,7 @@ install-arch-3.%:
# Don't initiate the uic/widget-plugins
touch $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt5/uic/widget-plugins/.noinit
- for module in opengl sql webkit websockets xmlpatterns svg multimedia quick serialport sensors x11extras positioning; do \
+ for module in $(PYQT_MODULES); do \
mkdir -p debian/python3-pyqt5.qt$$module-dbg/usr/lib/python3.$*/dist-packages/PyQt5; \
done
mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/*OpenGL*.so \
@@ -195,6 +206,11 @@ install-arch-3.%:
mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtPositioning.so \
$(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtLocation.so \
debian/python3-pyqt5.qtpositioning-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ifneq (,$(filter $(DEB_HOST_ARCH),$(QTWEBENGINE_ARCHS)))
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtWebEngine*.so \
+ debian/python3-pyqt5.qtwebengine-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+endif
+
d_qt5_dbg = debian/python-pyqt5-dbg
@@ -212,7 +228,7 @@ install-arch-2.%:
# Don't initiate the uic/widget-plugins
touch $(CURDIR)/debian/tmp/usr/lib/python2.$*/dist-packages/PyQt5/uic/widget-plugins/.noinit
- for module in opengl sql webkit websockets xmlpatterns svg multimedia quick serialport sensors x11extras positioning; do \
+ for module in $(PYQT_MODULES); do \
mkdir -p debian/python-pyqt5.qt$$module-dbg/usr/lib/python2.$*/dist-packages/PyQt5; \
done
mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/*OpenGL*.so \
@@ -241,6 +257,10 @@ install-arch-2.%:
mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtPositioning.so \
$(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtLocation.so \
debian/python-pyqt5.qtpositioning-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ifneq (,$(filter $(DEB_HOST_ARCH),$(QTWEBENGINE_ARCHS)))
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtWebEngine*.so \
+ debian/python-pyqt5.qtwebengine-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+endif
clean:
dh_testdir
@@ -273,22 +293,7 @@ endif
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt5-dev-tools
set -e; \
- for p in python3-pyqt5 \
- python3-pyqt5.qtopengl python3-pyqt5.qtsql \
- python3-pyqt5.qtwebkit python3-pyqt5.qtwebsockets \
- python3-pyqt5.qtmultimedia \
- python3-pyqt5.qtsvg python3-pyqt5.qtxmlpatterns \
- python3-pyqt5.qtquick python3-pyqt5.qtserialport \
- python3-pyqt5.qtsensors python3-pyqt5.qtx11extras \
- python3-pyqt5.qtpositioning python3-dbus.mainloop.pyqt5 \
- python-pyqt5 \
- python-pyqt5.qtopengl python-pyqt5.qtsql \
- python-pyqt5.qtwebkit python-pyqt5.qtwebsockets \
- python-pyqt5.qtmultimedia \
- python-pyqt5.qtsvg python-pyqt5.qtxmlpatterns \
- python-pyqt5.qtquick python-pyqt5.qtserialport \
- python-pyqt5.qtsensors python-pyqt5.qtx11extras \
- python-pyqt5.qtpositioning python-dbus.mainloop.pyqt5; do \
+ for p in $(PY_PACKAGE_NAMES:%=python3-%) $(PY_PACKAGE_NAMES:%=python-%); do \
DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
mkdir -p debian/$$p-dbg/usr/share/doc; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git
More information about the Python-modules-commits
mailing list