initial import
This commit is contained in:
61
tauthon-wxpython3/PKGBUILD
Normal file
61
tauthon-wxpython3/PKGBUILD
Normal file
@@ -0,0 +1,61 @@
|
||||
# Maintainer: Jesus E. <heckyel@riseup.net>
|
||||
|
||||
pkgname=tauthon-wxpython3
|
||||
pkgver=3.0.2.0
|
||||
pkgrel=2
|
||||
pkgdesc="Classic wxWidgets GUI toolkit for Tauthon"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('wxWindows-Library-3.1')
|
||||
url='https://www.wxpython.org'
|
||||
depends=('wxgtk3' 'tauthon')
|
||||
makedepends=('mesa' 'glu')
|
||||
provides=(wxpython=$pkgver)
|
||||
source=("https://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2"
|
||||
"fix-plot.patch"
|
||||
"fix-editra-removal.patch")
|
||||
sha512sums=('a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4'
|
||||
'6b4d235bbc67be66ae32c45b9ae8d2fd1aa6513d8625e1fa8af8f8399183ab598bd34ccd65158e113e8b99b86f3fd566e264d9bdeb681e68d634de17be29c473'
|
||||
'6cfe12b967088a9d9bc1e14f68a6b8a897bbfbf86fe22fa6b138fa32c71d6f14074f23af552a7bc34909b2d6adb8a775bd8a965bbdc15a9f814a99508ffd2ed6')
|
||||
|
||||
prepare() {
|
||||
find . -type f -exec sed -i 's/env python/env tauthon/' {} \;
|
||||
|
||||
cd wxPython-src-${pkgver}/wxPython
|
||||
|
||||
# Fix plot library
|
||||
patch -Np1 -i ${srcdir}/fix-plot.patch
|
||||
|
||||
# Fix editra removal
|
||||
patch -Np2 -i ${srcdir}/fix-editra-removal.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd wxPython-src-${pkgver}
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib \
|
||||
--includedir=/usr/include \
|
||||
--with-gtk=3 \
|
||||
--with-opengl \
|
||||
--enable-unicode \
|
||||
--enable-graphics_ctx \
|
||||
--disable-precomp-headers \
|
||||
--with-regex=sys \
|
||||
--with-libpng=sys \
|
||||
--with-libxpm=sys \
|
||||
--with-libjpeg=sys \
|
||||
--with-libtiff=sys \
|
||||
--with-wx-config=/usr/bin/wx-config-gtk3
|
||||
|
||||
cd wxPython
|
||||
tauthon setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1 build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd wxPython-src-${pkgver}/wxPython
|
||||
|
||||
tauthon setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1 install --root="${pkgdir}" --optimize=1
|
||||
for file in "${pkgdir}"/usr/bin/*; do mv "${file}" "${file}2"; done
|
||||
install -Dm644 "${srcdir}/wxPython-src-${pkgver}/docs/licence.txt" -t "${pkgdir}"/usr/share/licenses/${pkgname}
|
||||
}
|
||||
156
tauthon-wxpython3/fix-editra-removal.patch
Normal file
156
tauthon-wxpython3/fix-editra-removal.patch
Normal file
@@ -0,0 +1,156 @@
|
||||
--- a/wxPython/distrib/DIRLIST
|
||||
+++ b/wxPython/distrib/DIRLIST
|
||||
@@ -146,104 +146,5 @@
|
||||
wx/tools/XRCed/plugins
|
||||
wx/tools/XRCed/plugins/bitmaps
|
||||
wx/tools/XRCed/plugins/src-images
|
||||
-wx/tools/Editra
|
||||
-wx/tools/Editra/docs
|
||||
-wx/tools/Editra/include
|
||||
-wx/tools/Editra/include/python2.5
|
||||
-wx/tools/Editra/include/python2.5/darwin
|
||||
-wx/tools/Editra/include/python2.5/win32
|
||||
-wx/tools/Editra/locale
|
||||
-wx/tools/Editra/locale/ca_ES@valencia
|
||||
-wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/cs_CZ
|
||||
-wx/tools/Editra/locale/cs_CZ/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/da_DK
|
||||
-wx/tools/Editra/locale/da_DK/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/de_DE
|
||||
-wx/tools/Editra/locale/de_DE/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/en_US
|
||||
-wx/tools/Editra/locale/en_US/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/es_ES
|
||||
-wx/tools/Editra/locale/es_ES/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/fr_FR
|
||||
-wx/tools/Editra/locale/fr_FR/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/gl_ES
|
||||
-wx/tools/Editra/locale/gl_ES/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/it_IT
|
||||
-wx/tools/Editra/locale/it_IT/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/hr_HR
|
||||
-wx/tools/Editra/locale/hr_HR/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/hu_HU
|
||||
-wx/tools/Editra/locale/hu_HU/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/ja_JP
|
||||
-wx/tools/Editra/locale/ja_JP/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/lv_LV
|
||||
-wx/tools/Editra/locale/lv_LV/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/nl_NL
|
||||
-wx/tools/Editra/locale/nl_NL/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/nn_NO
|
||||
-wx/tools/Editra/locale/nn_NO/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/pl_PL
|
||||
-wx/tools/Editra/locale/pl_PL/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/pt_BR
|
||||
-wx/tools/Editra/locale/pt_BR/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/ro_RO
|
||||
-wx/tools/Editra/locale/ro_RO/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/ru_RU
|
||||
-wx/tools/Editra/locale/ru_RU/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/sk_SK
|
||||
-wx/tools/Editra/locale/sk_SK/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/sl_SI
|
||||
-wx/tools/Editra/locale/sl_SI/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/sr_RS
|
||||
-wx/tools/Editra/locale/sr_RS/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/sv_SE
|
||||
-wx/tools/Editra/locale/sv_SE/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/tr_TR
|
||||
-wx/tools/Editra/locale/tr_TR/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/uk_UA
|
||||
-wx/tools/Editra/locale/uk_UA/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/zh_CN
|
||||
-wx/tools/Editra/locale/zh_CN/LC_MESSAGES
|
||||
-wx/tools/Editra/locale/zh_TW
|
||||
-wx/tools/Editra/locale/zh_TW/LC_MESSAGES
|
||||
-wx/tools/Editra/pixmaps
|
||||
-wx/tools/Editra/pixmaps/theme
|
||||
-wx/tools/Editra/pixmaps/theme/Default
|
||||
-wx/tools/Editra/pixmaps/theme/Tango
|
||||
-wx/tools/Editra/pixmaps/theme/Tango/menu
|
||||
-wx/tools/Editra/pixmaps/theme/Tango/mime
|
||||
-wx/tools/Editra/pixmaps/theme/Tango/other
|
||||
-wx/tools/Editra/pixmaps/theme/Tango/toolbar
|
||||
-wx/tools/Editra/pixmaps/theme/Tango/other
|
||||
-wx/tools/Editra/plugins
|
||||
-wx/tools/Editra/plugins/codebrowser
|
||||
-wx/tools/Editra/plugins/codebrowser/codebrowser
|
||||
-wx/tools/Editra/plugins/codebrowser/codebrowser/gentag
|
||||
-wx/tools/Editra/plugins/filebrowser
|
||||
-wx/tools/Editra/plugins/filebrowser/filebrowser
|
||||
-wx/tools/Editra/plugins/hello
|
||||
-wx/tools/Editra/plugins/hello/hello
|
||||
-wx/tools/Editra/plugins/Launch
|
||||
-wx/tools/Editra/plugins/Launch/launch
|
||||
-wx/tools/Editra/plugins/pyshell
|
||||
-wx/tools/Editra/plugins/pyshell/pyshell
|
||||
-wx/tools/Editra/scripts
|
||||
-wx/tools/Editra/scripts/i18n
|
||||
-wx/tools/Editra/src
|
||||
-wx/tools/Editra/src/autocomp
|
||||
-wx/tools/Editra/src/ebmlib
|
||||
-wx/tools/Editra/src/eclib
|
||||
-wx/tools/Editra/src/extern
|
||||
-wx/tools/Editra/src/extern/aui
|
||||
-wx/tools/Editra/src/extern/pygments
|
||||
-wx/tools/Editra/src/extern/pygments/filters
|
||||
-wx/tools/Editra/src/extern/pygments/formatters
|
||||
-wx/tools/Editra/src/extern/pygments/lexers
|
||||
-wx/tools/Editra/src/extern/pygments/styles
|
||||
-wx/tools/Editra/src/syntax
|
||||
-wx/tools/Editra/styles
|
||||
-wx/tools/Editra/templates
|
||||
-wx/tools/Editra/tests/syntax
|
||||
|
||||
wxversion
|
||||
--- a/wxPython/setup.py
|
||||
+++ b/wxPython/setup.py
|
||||
@@ -895,13 +895,6 @@
|
||||
'wx.tools',
|
||||
'wx.tools.XRCed',
|
||||
'wx.tools.XRCed.plugins',
|
||||
- 'wx.tools.Editra',
|
||||
- 'wx.tools.Editra.src',
|
||||
- 'wx.tools.Editra.src.autocomp',
|
||||
- 'wx.tools.Editra.src.eclib',
|
||||
- 'wx.tools.Editra.src.ebmlib',
|
||||
- 'wx.tools.Editra.src.extern',
|
||||
- 'wx.tools.Editra.src.syntax',
|
||||
]
|
||||
|
||||
|
||||
@@ -919,7 +912,6 @@
|
||||
opj('scripts/pywrap'),
|
||||
opj('scripts/pywxrc'),
|
||||
opj('scripts/xrced'),
|
||||
- opj('scripts/editra'),
|
||||
]
|
||||
if os.name == 'nt':
|
||||
SCRIPTS.append( opj('scripts/genaxmodule') )
|
||||
@@ -934,16 +926,6 @@
|
||||
DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
|
||||
DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
|
||||
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
|
||||
- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
|
||||
-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
|
||||
-
|
||||
|
||||
## import pprint
|
||||
## pprint.pprint(DATA_FILES)
|
||||
@@ -993,7 +975,6 @@
|
||||
'pyshell = wx.py.PyShell:main',
|
||||
'pywrap = wx.py.PyWrap:main',
|
||||
'helpviewer = wx.tools.helpviewer:main',
|
||||
- 'editra = wx.tools.Editra.launcher:main',
|
||||
'xrced = wx.tools.XRCed.xrced:main',
|
||||
],
|
||||
},
|
||||
131
tauthon-wxpython3/fix-plot.patch
Normal file
131
tauthon-wxpython3/fix-plot.patch
Normal file
@@ -0,0 +1,131 @@
|
||||
From 25bcbf15615b64e095da75e934ea4d254998ec24 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Dunn <robin@alldunn.com>
|
||||
Date: Wed, 11 Mar 2015 14:37:20 -0700
|
||||
Subject: [PATCH] We need to use wx.CursorFromImage on Classic
|
||||
|
||||
---
|
||||
wx/lib/plot.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/wx/lib/plot.py b/wx/lib/plot.py
|
||||
index 94696c56b7..e166645863 100644
|
||||
--- a/wx/lib/plot.py
|
||||
+++ b/wx/lib/plot.py
|
||||
@@ -595,9 +595,9 @@ def __init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition,
|
||||
|
||||
# set curser as cross-hairs
|
||||
self.canvas.SetCursor(wx.CROSS_CURSOR)
|
||||
- self.HandCursor = wx.Cursor(Hand.GetImage())
|
||||
- self.GrabHandCursor = wx.Cursor(GrabHand.GetImage())
|
||||
- self.MagCursor = wx.Cursor(MagPlus.GetImage())
|
||||
+ self.HandCursor = wx.CursorFromImage(Hand.GetImage())
|
||||
+ self.GrabHandCursor = wx.CursorFromImage(GrabHand.GetImage())
|
||||
+ self.MagCursor = wx.CursorFromImage(MagPlus.GetImage())
|
||||
|
||||
# Things for printing
|
||||
self._print_data = None
|
||||
From 30bc07d80ae1c81d70b4de2daac62ecd7996d703 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Dunn <robin@alldunn.com>
|
||||
Date: Wed, 25 Mar 2015 15:34:49 -0700
|
||||
Subject: [PATCH] Revert some more Phoenix-only changes.
|
||||
|
||||
---
|
||||
wx/lib/plot.py | 25 +++++++++++++------------
|
||||
1 file changed, 13 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/wx/lib/plot.py b/wx/lib/plot.py
|
||||
index e166645863..102c35cc84 100644
|
||||
--- a/wx/lib/plot.py
|
||||
+++ b/wx/lib/plot.py
|
||||
@@ -237,7 +237,7 @@ def __init__(self, points, **attr):
|
||||
:keyword `attr`: keyword attributes, default to:
|
||||
|
||||
========================== ================================
|
||||
- 'colour'= 'black' wx.Pen Colour any wx.Colour
|
||||
+ 'colour'= 'black' wx.Pen Colour any wx.NamedColour
|
||||
'width'= 1 Pen width
|
||||
'style'= wx.PENSTYLE_SOLID wx.Pen style
|
||||
'legend'= '' Line Legend to display
|
||||
@@ -251,7 +251,7 @@ def draw(self, dc, printerScale, coord=None):
|
||||
width = self.attributes['width'] * printerScale * self._pointSize[0]
|
||||
style = self.attributes['style']
|
||||
if not isinstance(colour, wx.Colour):
|
||||
- colour = wx.Colour(colour)
|
||||
+ colour = wx.NamedColour(colour)
|
||||
pen = wx.Pen(colour, width, style)
|
||||
pen.SetCap(wx.CAP_BUTT)
|
||||
dc.SetPen(pen)
|
||||
@@ -287,7 +287,7 @@ def __init__(self, points, **attr):
|
||||
:keyword `attr`: keyword attributes, default to:
|
||||
|
||||
========================== ================================
|
||||
- 'colour'= 'black' wx.Pen Colour any wx.Colour
|
||||
+ 'colour'= 'black' wx.Pen Colour any wx.NamedColour
|
||||
'width'= 1 Pen width
|
||||
'style'= wx.PENSTYLE_SOLID wx.Pen style
|
||||
'legend'= '' Line Legend to display
|
||||
@@ -301,7 +301,7 @@ def draw(self, dc, printerScale, coord=None):
|
||||
width = self.attributes['width'] * printerScale * self._pointSize[0]
|
||||
style = self.attributes['style']
|
||||
if not isinstance(colour, wx.Colour):
|
||||
- colour = wx.Colour(colour)
|
||||
+ colour = wx.NamedColour(colour)
|
||||
pen = wx.Pen(colour, width, style)
|
||||
pen.SetCap(wx.CAP_ROUND)
|
||||
dc.SetPen(pen)
|
||||
@@ -334,10 +334,10 @@ def __init__(self, points, **attr):
|
||||
:keyword `attr`: keyword attributes, default to:
|
||||
|
||||
================================ ================================
|
||||
- 'colour'= 'black' wx.Pen Colour any wx.Colour
|
||||
+ 'colour'= 'black' wx.Pen Colour any wx.NamedColour
|
||||
'width'= 1 Pen width
|
||||
'size'= 2 Marker size
|
||||
- 'fillcolour'= same as colour wx.Brush Colour any wx.Colour
|
||||
+ 'fillcolour'= same as colour wx.Brush Colour any wx.NamedColour
|
||||
'fillstyle'= wx.BRUSHSTYLE_SOLID wx.Brush fill style (use wx.BRUSHSTYLE_TRANSPARENT for no fill)
|
||||
'style'= wx.FONTFAMILY_SOLID wx.Pen style
|
||||
'marker'= 'circle' Marker shape
|
||||
@@ -365,10 +365,10 @@ def draw(self, dc, printerScale, coord=None):
|
||||
marker = self.attributes['marker']
|
||||
|
||||
if colour and not isinstance(colour, wx.Colour):
|
||||
- colour = wx.Colour(colour)
|
||||
+ colour = wx.NamedColour(colour)
|
||||
if fillcolour and not isinstance(fillcolour, wx.Colour):
|
||||
- fillcolour = wx.Colour(fillcolour)
|
||||
-
|
||||
+ fillcolour = wx.NamedColour(fillcolour)
|
||||
+
|
||||
dc.SetPen(wx.Pen(colour, width))
|
||||
if fillcolour:
|
||||
dc.SetBrush(wx.Brush(fillcolour, fillstyle))
|
||||
@@ -681,8 +681,9 @@ def SetGridColour(self, colour):
|
||||
if isinstance(colour, wx.Colour):
|
||||
self._gridColour = colour
|
||||
else:
|
||||
- self._gridColour = wx.Colour(colour)
|
||||
+ self._gridColour = wx.NamedColour(colour)
|
||||
|
||||
+
|
||||
# SaveFile
|
||||
def SaveFile(self, fileName=''):
|
||||
"""Saves the file to the type specified in the extension. If no file
|
||||
@@ -1513,7 +1514,7 @@ def OnSize(self, event):
|
||||
# Make new offscreen bitmap: this bitmap will always have the
|
||||
# current drawing in it, so it can be used to save the image to
|
||||
# a file, or whatever.
|
||||
- self._Buffer = wx.Bitmap(Size.width, Size.height)
|
||||
+ self._Buffer = wx.EmptyBitmap(Size.width, Size.height)
|
||||
self._setSize()
|
||||
|
||||
self.last_PointLabel = None # reset pointLabel
|
||||
@@ -1578,7 +1579,7 @@ def _drawPointLabel(self, mDataDict):
|
||||
width = self._Buffer.GetWidth()
|
||||
height = self._Buffer.GetHeight()
|
||||
if sys.platform != "darwin":
|
||||
- tmp_Buffer = wx.Bitmap(width, height)
|
||||
+ tmp_Buffer = wx.EmptyBitmap(width,height)
|
||||
dcs = wx.MemoryDC()
|
||||
dcs.SelectObject(tmp_Buffer)
|
||||
dcs.Clear()
|
||||
Reference in New Issue
Block a user