On Thu, 28 Apr 2016, Olly Betts wrote:
This is probably why this is currently commented out - things need
sorting out such that only python-wxgtk-webview3.0 pulls in
libwxgtk-webview3.0-0v5 (like how only python-wxgtk-media3.0 pulls in
libwxgtk-media3.0-0v5, though the mechanism to achieve this might not
be the same).
Right. I'll see if I can figure out the best way to do this.
Cool - debian/patches/wxpython-media-optional.patch is how we do it for
the media stuff, which might be a good place to start.
This seems to do the trick.
Scott
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root
/usr/lib/debug/.build-id/06/175a06ea0787f6fd475df2483f48d846610092.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/10/4f8cd6e54f7a4c5734c4e12d66385365ac538e.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/2d/a797b59f373a61db8b2f8ceb07f69c8c3dd788.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/2e/850c796746a9efff8cb5c27332f7328daae14d.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/55/42a0a547bd06f6e76c06910d18983ca2ef5d9b.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/55/8c2fe970183847601ef133a8f4baa43cdfcc64.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/56/5a5d9864e7a03e50be97abf330e55a98b4d99e.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/5e/a85614a5527b3a46db7a6615b8c65ade8a0894.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/65/db1f018f5fec27688348babaf6ada0fc569e25.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/68/6f46f2de709f457119de3ad84fb5b83cf39c5f.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/6a/f5979bce13bdc806946ef001d08be0615d4fdb.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/6e/f9f062550ba7b418eb04f53d560391fa1c8ea8.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/74/bac403217bb94961ae51f60d5fcdcab8254705.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/90/38be6e4f74291e277b2850a5719638e3b619f6.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/91/9d0ccd91be9968b9b697fd45a7cf589d130b4e.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/95/0daf23b9d3449134063ff508591e438686e228.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/b0/9c144598c6ff15c56dd2085b4ff9c7403175b1.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/c2/b0e0fec86f9bd82f1d49a0a4899d68f88c1cc3.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/c4/940a5fc3e710aa56fbda3e2bbd39d05d965cf2.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/e1/72844c1c259da9b6ae56c93036cec52bb9e2d1.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/fb/6ca15e77f835158b91bda39082cd31c2265ea4.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/fe/c429e919ee65ae2fef3058cbfba8486ebe7a13.debug
-rw-r--r-- root/root
/usr/share/doc/python-wxgtk-webview3.0/changelog.Debian.gz
-rw-r--r-- root/root /usr/share/doc/python-wxgtk-webview3.0/changelog.gz
-rw-r--r-- root/root /usr/share/doc/python-wxgtk-webview3.0/copyright
lrwxrwxrwx root/root /usr/share/doc/python-wxgtk-webview3.0-dbgsym ->
python-wxgtk-webview3.0
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root
/usr/lib/debug/.build-id/01/528711e5588a3d6c4324ded008aa2100653872.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/0b/5b69cd3b75266f9496b257c96158bacb869505.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/0e/a41709fee19426e38b1da18f5aa6185a29634c.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/0f/613acb33098bbad1238e94ab35bf2e502053ac.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/15/04d232a6b640a8ee97f079b411e53ff8b18766.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/23/d06e2f0b90451820314d0e721af46411abd1bc.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/47/2fb74eebacd1382f719bc3bb8720cb52364d0d.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/4d/1bc3db0cd776c1ad7eb93080978cf5253f95d5.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/56/1c0133eba8ced4dd79c0a7c6f69cfeb7bb0fe9.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/59/08384906a65fbe5b5d704e58239a119366c325.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/5c/7e5b3c0a55055a16ead43df6d352d8a1920fe3.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/5f/10b378e4f7bb870a7433267b0207c7c0bb2309.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/6d/cadd7339a2560e88ccd3d6ae8627d9fc3a04fc.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/75/3ee5e6d97ecd8cc6e92e5a613a555bed8cfe22.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/78/e0338784c0d9f47ba9882172cb160afe95d43a.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/7d/64ec6e7f706ddf38dec649468f6659cda9629c.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/90/601d15d86e6de830f7de5ca2129bbea5242284.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/94/a7601befbce834ec8fbe1b928434a336f13142.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/96/9986243fd9d6aacad7b320a77f3427ccb522f5.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/a1/87c58c89a017c0a6a798a2e12f133393c981c3.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/b8/f234b6df70c7fea5423e59068f54cb317fcdbc.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/dd/975cc60be5368d91a332088e20e0f1521122db.debug
Control files of package python-wxgtk-media3.0: lines which differ (wdiff
format)
---------------------------------------------------------------------------------
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
Control files of package python-wxgtk-media3.0-dbgsym: lines which differ
(wdiff format)
----------------------------------------------------------------------------------------
Build-Ids: [-1504d232a6b640a8ee97f079b411e53ff8b18766-]
{+5ea85614a5527b3a46db7a6615b8c65ade8a0894+}
Depends: python-wxgtk-media3.0 (= [-3.0.2.0+dfsg-1)-] {+3.0.2.0+dfsg-1.1)+}
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
Control files of package python-wxgtk3.0: lines which differ (wdiff format)
---------------------------------------------------------------------------
Installed-Size: [-29134-] {+28932+}
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
Control files of package python-wxgtk3.0-dbgsym: lines which differ (wdiff
format)
----------------------------------------------------------------------------------
Build-Ids: [-01528711e5588a3d6c4324ded008aa2100653872
0b5b69cd3b75266f9496b257c96158bacb869505
0ea41709fee19426e38b1da18f5aa6185a29634c
0f613acb33098bbad1238e94ab35bf2e502053ac
23d06e2f0b90451820314d0e721af46411abd1bc
472fb74eebacd1382f719bc3bb8720cb52364d0d
4d1bc3db0cd776c1ad7eb93080978cf5253f95d5
561c0133eba8ced4dd79c0a7c6f69cfeb7bb0fe9
5908384906a65fbe5b5d704e58239a119366c325
5c7e5b3c0a55055a16ead43df6d352d8a1920fe3
5f10b378e4f7bb870a7433267b0207c7c0bb2309
6dcadd7339a2560e88ccd3d6ae8627d9fc3a04fc
753ee5e6d97ecd8cc6e92e5a613a555bed8cfe22
78e0338784c0d9f47ba9882172cb160afe95d43a
7d64ec6e7f706ddf38dec649468f6659cda9629c
90601d15d86e6de830f7de5ca2129bbea5242284
94a7601befbce834ec8fbe1b928434a336f13142
969986243fd9d6aacad7b320a77f3427ccb522f5
a187c58c89a017c0a6a798a2e12f133393c981c3
b8f234b6df70c7fea5423e59068f54cb317fcdbc
dd975cc60be5368d91a332088e20e0f1521122db-]
{+06175a06ea0787f6fd475df2483f48d846610092
104f8cd6e54f7a4c5734c4e12d66385365ac538e
2da797b59f373a61db8b2f8ceb07f69c8c3dd788
5542a0a547bd06f6e76c06910d18983ca2ef5d9b
558c2fe970183847601ef133a8f4baa43cdfcc64
565a5d9864e7a03e50be97abf330e55a98b4d99e
65db1f018f5fec27688348babaf6ada0fc569e25
686f46f2de709f457119de3ad84fb5b83cf39c5f
6af5979bce13bdc806946ef001d08be0615d4fdb
6ef9f062550ba7b418eb04f53d560391fa1c8ea8
74bac403217bb94961ae51f60d5fcdcab8254705
9038be6e4f74291e277b2850a5719638e3b619f6
919d0ccd91be9968b9b697fd45a7cf589d130b4e
950daf23b9d3449134063ff508591e438686e228
b09c144598c6ff15c56dd2085b4ff9c7403175b1
c2b0e0fec86f9bd82f1d49a0a4899d68f88c1cc3
c4940a5fc3e710aa56fbda3e2bbd39d05d965cf2
e172844c1c259da9b6ae56c93036cec52bb9e2d1
fb6ca15e77f835158b91bda39082cd31c2265ea4
fec429e919ee65ae2fef3058cbfba8486ebe7a13+}
Depends: python-wxgtk3.0 (= [-3.0.2.0+dfsg-1)-] {+3.0.2.0+dfsg-1.1)+}
Installed-Size: [-18598-] {+18304+}
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
Control files of package python-wxgtk3.0-dev: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
Control files of package python-wxtools: lines which differ (wdiff format)
--------------------------------------------------------------------------
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
Control files of package python-wxversion: lines which differ (wdiff format)
----------------------------------------------------------------------------
Version: [-3.0.2.0+dfsg-1-] {+3.0.2.0+dfsg-1.1+}
From 25844ae26919255e35d16735b8780516b141b089 Mon Sep 17 00:00:00 2001
From: Scott Talbert <s...@techie.net>
Date: Fri, 29 Apr 2016 21:50:17 -0400
Subject: [PATCH] Add binary package python-wxgtk-webview3.0 for wx.html2.
(Closes: #821934)
---
debian/changelog | 6 ++++++
debian/control | 13 ++++++++++++-
debian/patches/series | 1 +
debian/patches/wxpython-webview-optional.patch | 15 +++++++++++++++
debian/python-wxgtk-webview3.0.install | 2 ++
debian/rules | 3 +++
6 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/wxpython-webview-optional.patch
create mode 100644 debian/python-wxgtk-webview3.0.install
diff --git a/debian/changelog b/debian/changelog
index 4666e69..dccb31e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wxpython3.0 (3.0.2.0+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Add binary package python-wxgtk-webview3.0 for wx.html2. (Closes: #821934)
+
+ -- Scott Talbert <s...@techie.net> Wed, 27 Apr 2016 20:38:52 -0400
+
wxpython3.0 (3.0.2.0+dfsg-1) unstable; urgency=medium
* New upstream release:
diff --git a/debian/control b/debian/control
index 01fe23e..e21029b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libgtk2.0-dev,
libwxgtk3.0-dev,
libwxgtk-media3.0-dev,
-# libwxgtk-webview3.0-dev,
+ libwxgtk-webview3.0-dev,
python-all,
python-all-dev
Standards-Version: 3.9.6
@@ -51,6 +51,17 @@ Description: Python interface to the wxWidgets Cross-platform C++ GUI toolkit (w
.
This package provides a Python interface to wxMediaCtrl.
+Package: python-wxgtk-webview3.0
+Architecture: any
+Depends: python-wxgtk3.0, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Description: Python interface to the wxWidgets Cross-platform C++ GUI toolkit (wx.html2)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).
+ .
+ This package provides a Python interface to wxWebView.
+
Package: python-wxversion
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
diff --git a/debian/patches/series b/debian/patches/series
index fda3eea..09e5333 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ wxpython-missing-format-strings.patch
suppress_warning_about_release_version_mismatch.patch
wxpython-media-optional.patch
pypubsub-for-taskcoach.patch
+wxpython-webview-optional.patch
diff --git a/debian/patches/wxpython-webview-optional.patch b/debian/patches/wxpython-webview-optional.patch
new file mode 100644
index 0000000..a7e8f69
--- /dev/null
+++ b/debian/patches/wxpython-webview-optional.patch
@@ -0,0 +1,15 @@
+diff -up wxpython3.0-3.0.2.0+dfsg/wxPython/config.py.webview wxpython3.0-3.0.2.0+dfsg/wxPython/config.py
+--- wxpython3.0-3.0.2.0+dfsg/wxPython/config.py.webview 2016-04-29 00:06:26.000000000 -0400
++++ wxpython3.0-3.0.2.0+dfsg/wxPython/config.py 2016-04-29 20:14:59.830690131 -0400
+@@ -660,7 +660,10 @@ def adjustLFLAGS(lflags, libdirs, libs):
+ if flag[:2] == '-L':
+ libdirs.append(flag[2:])
+ elif flag[:2] == '-l':
+- libs.append(flag[2:])
++ # Remove 'webview' from the default libs so we don't always link
++ # with it. It gets added specifically for html2 elsewhere.
++ if flag[2:] != makeLibName('webview')[0]:
++ libs.append(flag[2:])
+ else:
+ newLFLAGS.append(flag)
+ return removeDuplicates(newLFLAGS)
diff --git a/debian/python-wxgtk-webview3.0.install b/debian/python-wxgtk-webview3.0.install
new file mode 100644
index 0000000..79fbce7
--- /dev/null
+++ b/debian/python-wxgtk-webview3.0.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python*/dist-packages/wx-*-gtk*/wx/_html2.*so
+debian/tmp/usr/lib/python*/dist-packages/wx-*-gtk*/wx/html2.py
diff --git a/debian/rules b/debian/rules
index e9d03f0..2f7315b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,3 +42,6 @@ override_dh_install:
# These are packaged in the -media subpackage:
rm -f debian/python-wxgtk3.0/usr/lib/python*/dist-packages/wx-*-gtk*/wx/_media.*so \
debian/python-wxgtk3.0/usr/lib/python*/dist-packages/wx-*-gtk*/wx/media.py
+ # These are packaged in the -webview subpackage:
+ rm -f debian/python-wxgtk3.0/usr/lib/python*/dist-packages/wx-*-gtk*/wx/_html2.*so \
+ debian/python-wxgtk3.0/usr/lib/python*/dist-packages/wx-*-gtk*/wx/html2.py
--
2.8.1
