Merge branch 'dev-python/derpconf'
[wtk-overlay.git] / dev-python / wxpython / files / wxpython-2.8.11-drop-editra.patch
1 --- a/wxPython/setup.py
2 +++ b/wxPython/setup.py
3 @@ -887,13 +887,6 @@ WX_PKGLIST =      [ 'wx',
4                      'wx.tools',
5                      'wx.tools.XRCed',
6                      'wx.tools.XRCed.plugins',
7 -                    'wx.tools.Editra',
8 -                    'wx.tools.Editra.src',
9 -                    'wx.tools.Editra.src.autocomp',
10 -                    'wx.tools.Editra.src.eclib',
11 -                    'wx.tools.Editra.src.ebmlib',
12 -                    'wx.tools.Editra.src.extern',
13 -                    'wx.tools.Editra.src.syntax',
14                      ]
15  
16  if not EGGing:
17 @@ -920,7 +913,6 @@ else:
18                 opj('scripts/pywrap'),
19                 opj('scripts/pywxrc'),
20                 opj('scripts/xrced'),
21 -               opj('scripts/editra'),
22                 ]
23      if os.name == 'nt':
24          SCRIPTS.append( opj('scripts/genaxmodule') ) 
25 @@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
26  DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
27  DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
28  
29 -DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
30 -DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
31 -DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
32 -                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
33 -DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
34 -DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
35 -DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
36 -DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
37 -DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
38  
39  
40  ## import pprint
41 @@ -993,7 +976,6 @@ if EGGing:
42                                    'pyshell = wx.py.PyShell:main',
43                                    'pywrap = wx.py.PyWrap:main',
44                                    'helpviewer = wx.tools.helpviewer:main',
45 -                                  'editra = wx.tools.Editra.launcher:main',
46                                    'xrced = wx.tools.XRCed.xrced:main',
47                                    ], 
48              },