[Git][debian-gis-team/grass][ubuntugis/bionic] Rebuild 7.8.1 for bionic

[Martin Landa]

Martin Landa pushed to branch ubuntugis/bionic at Debian GIS Project / grass


Commits:
88532f9e by Martin Landa at 2019-12-01T20:25:24Z
Rebuild 7.8.1 for bionic

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/new-id-ref.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+grass (7.8.1-1~bionic2) bionic; urgency=medium
+
+  * Rebuild for bionic.
+  * Fix https://github.com/OSGeo/grass/pull/155
+
+ -- Martin Landa <landa.martin at gmail.com>  Sun, 01 Dec 2019 21:20:15 +0100
+
 grass (7.8.1-1~bionic1) bionic; urgency=medium
 
   * Rebuild for bionic.


=====================================
debian/patches/new-id-ref.patch
=====================================
@@ -0,0 +1,24 @@
+Description: Fix wxPython < 4.0.3 issue (valid for bionic), see https://github.com/OSGeo/grass/pull/155
+Author: Martin Landa <landa.martin at gmail.com>
+Forwarded: not-needed
+
+--- a/gui/wxpython/gui_core/wrap.py
++++ b/gui/wxpython/gui_core/wrap.py
+@@ -23,7 +23,7 @@ try:
+ except ImportError:
+     import wx.lib.customtreectrl as CT
+ 
+-from core.globalvar import gtk3, wxPythonPhoenix
++from core.globalvar import gtk3, wxPythonPhoenix, CheckWxVersion
+ if wxPythonPhoenix:
+     import wx.adv
+ 
+@@ -35,7 +35,7 @@ else:
+     ComboPopup = wx.combo.ComboPopup
+     wxComboCtrl = wx.combo.ComboCtrl
+ 
+-if wxPythonPhoenix:
++if wxPythonPhoenix and CheckWxVersion([4, 0, 3, 0]):
+     from wx import NewIdRef as NewId
+ else:
+     from wx import NewId


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ pager
 instdir
 no-fail-html.patch
 jquery.patch
+new-id-ref.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/commit/88532f9edd9270d9eb51dc74066dcd8300fa1966

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/commit/88532f9edd9270d9eb51dc74066dcd8300fa1966
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191201/dfd6187b/attachment-0001.html>