[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Sunday, January 28, 2018 @ 21:16:39
Author: bgyorgy
Revision: 287674
upgpkg: wxpython 3.0.2.0-7
Rebuild with wxgtk3 again, kicad is no longer a blocker
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-28 21:15:52 UTC (rev 287673)
+++ PKGBUILD2018-01-28 21:16:39 UTC (rev 287674)
@@ -3,12 +3,12 @@
pkgname=wxpython
pkgver=3.0.2.0
-pkgrel=6
+pkgrel=7
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('x86_64')
license=('custom:wxWindows')
url="https://www.wxpython.org;
-depends=('wxgtk2' 'python2')
+depends=('wxgtk3' 'python2')
makedepends=('mesa' 'glu')
source=("https://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2;
"fix-plot.patch")
@@ -29,7 +29,7 @@
--prefix=/usr \
--libdir=/usr/lib \
--includedir=/usr/include \
---with-gtk=2 \
+--with-gtk=3 \
--with-opengl \
--enable-unicode \
--enable-graphics_ctx \
@@ -38,14 +38,14 @@
--with-libpng=sys \
--with-libxpm=sys \
--with-libjpeg=sys \
---with-libtiff=sys
-#--with-wx-config=/usr/bin/wx-config-gtk3
+--with-libtiff=sys \
+--with-wx-config=/usr/bin/wx-config-gtk3
cd wxPython
-python2 setup.py WXPORT=gtk2 UNICODE=1 build
+python2 setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1
build
}
package() {
cd wxPython-src-${pkgver}/wxPython
-python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}"
+python2 setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1
install --root="${pkgdir}"
install -Dm644 ../docs/licence.txt
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in wxpython/trunk (PKGBUILD fix-plot.patch)
Date: Friday, January 26, 2018 @ 16:42:32
Author: bgyorgy
Revision: 287157
upgpkg: wxpython 3.0.2.0-6
Fix plot library (FS#42807)
Added:
wxpython/trunk/fix-plot.patch
Modified:
wxpython/trunk/PKGBUILD
+
PKGBUILD | 12 +++--
fix-plot.patch | 131 +++
2 files changed, 140 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-26 16:20:01 UTC (rev 287156)
+++ PKGBUILD2018-01-26 16:42:32 UTC (rev 287157)
@@ -3,7 +3,7 @@
pkgname=wxpython
pkgver=3.0.2.0
-pkgrel=5
+pkgrel=6
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('x86_64')
license=('custom:wxWindows')
@@ -10,11 +10,17 @@
url="https://www.wxpython.org;
depends=('wxgtk2' 'python2')
makedepends=('mesa' 'glu')
-source=("https://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2;)
-sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61')
+source=("https://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2;
+"fix-plot.patch")
+sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61'
+'2d8b2bdbf55172738c7bf93955e552aac61842800c3b8b0a2e1f07f4314abc65')
prepare() {
find . -type f -exec sed -i 's/env python/env python2/' {} \;
+
+cd wxPython-src-${pkgver}/wxPython
+# Fix plot library (FS#42807)
+patch -Np1 -i ../../fix-plot.patch
}
build() {
Added: fix-plot.patch
===
--- fix-plot.patch (rev 0)
+++ fix-plot.patch 2018-01-26 16:42:32 UTC (rev 287157)
@@ -0,0 +1,131 @@
+From 25bcbf15615b64e095da75e934ea4d254998ec24 Mon Sep 17 00:00:00 2001
+From: Robin Dunn
+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
+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 =
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Wednesday, December 27, 2017 @ 21:31:24
Author: archange
Revision: 276266
Rebuild a version with GTK2
For testing users...
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-27 19:52:21 UTC (rev 276265)
+++ PKGBUILD2017-12-27 21:31:24 UTC (rev 276266)
@@ -3,7 +3,7 @@
pkgname=wxpython
pkgver=3.0.2.0
-pkgrel=3
+pkgrel=5
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('x86_64')
license=('custom:wxWindows')
@@ -32,8 +32,8 @@
--with-libpng=sys \
--with-libxpm=sys \
--with-libjpeg=sys \
---with-libtiff=sys \
---with-wx-config=/usr/bin/wx-config-gtk3
+--with-libtiff=sys
+#--with-wx-config=/usr/bin/wx-config-gtk3
cd wxPython
python2 setup.py WXPORT=gtk2 UNICODE=1 build
}
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Tuesday, December 26, 2017 @ 16:44:17
Author: archange
Revision: 276113
Revert to gtk2
Since this never left [community-testing], keep the previous pkgrel and don't
publish a new version.
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-26 16:36:34 UTC (rev 276112)
+++ PKGBUILD2017-12-26 16:44:17 UTC (rev 276113)
@@ -3,12 +3,12 @@
pkgname=wxpython
pkgver=3.0.2.0
-pkgrel=4
+pkgrel=3
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('x86_64')
license=('custom:wxWindows')
url="https://www.wxpython.org;
-depends=('wxgtk3' 'python2')
+depends=('wxgtk2' 'python2')
makedepends=('mesa' 'glu')
source=("https://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2;)
sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61')
@@ -23,7 +23,7 @@
--prefix=/usr \
--libdir=/usr/lib \
--includedir=/usr/include \
---with-gtk=3 \
+--with-gtk=2 \
--with-opengl \
--enable-unicode \
--enable-graphics_ctx \
@@ -35,11 +35,11 @@
--with-libtiff=sys \
--with-wx-config=/usr/bin/wx-config-gtk3
cd wxPython
-python2 setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1
build
+python2 setup.py WXPORT=gtk2 UNICODE=1 build
}
package() {
cd wxPython-src-${pkgver}/wxPython
-python2 setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1
install --root="${pkgdir}"
+python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}"
install -Dm644 ../docs/licence.txt
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Tuesday, June 27, 2017 @ 12:14:49
Author: archange
Revision: 241155
Switch to wxgtk3
Also stay with integrated Editra, it has been the latest version for a while
(even include more recent changes).
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD | 51 +++
1 file changed, 27 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-27 11:36:03 UTC (rev 241154)
+++ PKGBUILD2017-06-27 12:14:49 UTC (rev 241155)
@@ -3,40 +3,43 @@
pkgname=wxpython
pkgver=3.0.2.0
-_editraver=0.7.20
-pkgrel=3
+pkgrel=4
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('i686' 'x86_64')
license=('custom:wxWindows')
-url="http://www.wxpython.org;
-depends=('wxgtk2' 'python2')
+url="https://www.wxpython.org;
+depends=('wxgtk3' 'python2')
makedepends=('mesa' 'glu')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
-http://editra.org/uploads/src/Editra-${_editraver}.tar.gz)
-sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61'
-'ed515bca58d87d9a2b3085f322a9fe7c6d1407a3b05db1434f80ea8f7e42ccc0')
+source=("https://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2;)
+sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61')
prepare() {
- cd "${srcdir}"
- find . -type f -exec sed -i 's/env python/env python2/' {} \;
- sed -i 's/sys.exit(1)//' Editra-${_editraver}/setup.py
+find . -type f -exec sed -i 's/env python/env python2/' {} \;
}
build() {
- cd wxPython-src-${pkgver}
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --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
- cd wxPython
- python2 setup.py WXPORT=gtk2 UNICODE=1 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
+python2 setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1
build
}
package() {
- cd wxPython-src-${pkgver}/wxPython
- python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}"
- install -D -m644 ../docs/licence.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- cd "${srcdir}/Editra-${_editraver}"
- python2 setup.py install --root="${pkgdir}"
- rm -r "${pkgdir}/usr/lib/python2.7/site-packages/wx-3.0-gtk2/wx/tools/Editra"
+cd wxPython-src-${pkgver}/wxPython
+python2 setup.py WX_CONFIG=/usr/bin/wx-config-gtk3 WXPORT=gtk3 UNICODE=1
install --root="${pkgdir}"
+install -Dm644 ../docs/licence.txt
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Tuesday, June 20, 2017 @ 14:16:48
Author: arojas
Revision: 239038
Unused
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-20 14:16:43 UTC (rev 239037)
+++ PKGBUILD2017-06-20 14:16:48 UTC (rev 239038)
@@ -10,7 +10,7 @@
license=('custom:wxWindows')
url="http://www.wxpython.org;
depends=('wxgtk2' 'python2')
-makedepends=('mesa' 'glu' 'gst-plugins-base-libs')
+makedepends=('mesa' 'glu')
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
http://editra.org/uploads/src/Editra-${_editraver}.tar.gz)
sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61'
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Tuesday, June 20, 2017 @ 14:08:45
Author: arojas
Revision: 239035
Disable webview and wxmedia, they require obsolete versions of webkitgtk and
gstreamer
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-20 13:52:27 UTC (rev 239034)
+++ PKGBUILD2017-06-20 14:08:45 UTC (rev 239035)
@@ -4,13 +4,13 @@
pkgname=wxpython
pkgver=3.0.2.0
_editraver=0.7.20
-pkgrel=2
+pkgrel=3
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('i686' 'x86_64')
license=('custom:wxWindows')
url="http://www.wxpython.org;
-depends=('wxgtk' 'python2')
-makedepends=('mesa' 'glu')
+depends=('wxgtk2' 'python2')
+makedepends=('mesa' 'glu' 'gst-plugins-base-libs')
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
http://editra.org/uploads/src/Editra-${_editraver}.tar.gz)
sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61'
@@ -25,7 +25,7 @@
build() {
cd wxPython-src-${pkgver}
./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl
--enable-unicode \
---enable-graphics_ctx --enable-mediactrl --disable-precomp-headers \
+--enable-graphics_ctx --disable-precomp-headers \
--with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys
--with-libtiff=sys
cd wxPython
python2 setup.py WXPORT=gtk2 UNICODE=1 build
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Saturday, April 1, 2017 @ 08:15:02
Author: arojas
Revision: 291964
Fix editra source (FS#53515)
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-31 23:29:33 UTC (rev 291963)
+++ PKGBUILD2017-04-01 08:15:02 UTC (rev 291964)
@@ -12,9 +12,9 @@
depends=('wxgtk' 'python2')
makedepends=('mesa' 'glu')
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
-https://editra.googlecode.com/files/Editra-${_editraver}.tar.gz)
-sha1sums=('5053f3fa04f4eb3a9d4bfd762d963deb7fa46866'
- 'f439f4aa2cb90b8348cebb1670df9cf47ba341ab')
+http://editra.org/uploads/src/Editra-${_editraver}.tar.gz)
+sha256sums=('d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61'
+'ed515bca58d87d9a2b3085f322a9fe7c6d1407a3b05db1434f80ea8f7e42ccc0')
prepare() {
cd "${srcdir}"
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Monday, December 7, 2015 @ 07:23:16
Author: arojas
Revision: 253228
C++11 ABI rebuild
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 06:18:40 UTC (rev 253227)
+++ PKGBUILD2015-12-07 06:23:16 UTC (rev 253228)
@@ -4,7 +4,7 @@
pkgname=wxpython
pkgver=3.0.2.0
_editraver=0.7.20
-pkgrel=1
+pkgrel=2
pkgdesc="A wxWidgets GUI toolkit for Python"
arch=('i686' 'x86_64')
license=('custom:wxWindows')
[arch-commits] Commit in wxpython/trunk (PKGBUILD wxpython-numeric-77995.patch)
Date: Wednesday, December 3, 2014 @ 03:50:26 Author: eric Revision: 227263 upgpkg: wxpython 3.0.2.0-1 Upstream update, Remove old patch Modified: wxpython/trunk/PKGBUILD Deleted: wxpython/trunk/wxpython-numeric-77995.patch --+ PKGBUILD | 15 wxpython-numeric-77995.patch | 2973 - 2 files changed, 5 insertions(+), 2983 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 227262:227263 to see the changes.
[arch-commits] Commit in wxpython/trunk (PKGBUILD wxpython-numeric-77995.patch)
Date: Tuesday, October 14, 2014 @ 05:55:41 Author: eric Revision: 224301 upgpkg: wxpython 3.0.1.1-2 Add patch for Numeric (close FS#42054) Added: wxpython/trunk/wxpython-numeric-77995.patch Modified: wxpython/trunk/PKGBUILD --+ PKGBUILD | 15 wxpython-numeric-77995.patch | 2973 + 2 files changed, 2983 insertions(+), 5 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 224300:224301 to see the changes.
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Sunday, September 14, 2014 @ 19:36:42
Author: eric
Revision: 221716
upgpkg: wxpython 3.0.1.1-1
Upstream update
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-14 13:35:04 UTC (rev 221715)
+++ PKGBUILD2014-09-14 17:36:42 UTC (rev 221716)
@@ -2,9 +2,9 @@
# Maintainer: Eric Bélanger e...@archlinux.org
pkgname=wxpython
-pkgver=3.0.0.0
+pkgver=3.0.1.1
_editraver=0.7.20
-pkgrel=3
+pkgrel=1
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
@@ -13,7 +13,7 @@
makedepends=('mesa' 'glu')
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
http://editra.googlecode.com/files/Editra-${_editraver}.tar.gz)
-sha1sums=('48451763275cfe4e5bbec49ccd75bc9652cba719'
+sha1sums=('d2c4719015d7c499a9765b1e5107fdf37a32abfb'
'f439f4aa2cb90b8348cebb1670df9cf47ba341ab')
prepare() {
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Monday, August 11, 2014 @ 05:04:35
Author: eric
Revision: 219519
upgpkg: wxpython 3.0.0.0-3
Rebuild against wxgtk no-STL
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-10 22:17:14 UTC (rev 219518)
+++ PKGBUILD2014-08-11 03:04:35 UTC (rev 219519)
@@ -4,7 +4,7 @@
pkgname=wxpython
pkgver=3.0.0.0
_editraver=0.7.20
-pkgrel=2
+pkgrel=3
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Saturday, May 24, 2014 @ 23:20:25
Author: eric
Revision: 213562
Fix source url (close FS#40453)
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-24 20:45:56 UTC (rev 213561)
+++ PKGBUILD2014-05-24 21:20:25 UTC (rev 213562)
@@ -12,7 +12,7 @@
depends=('wxgtk' 'python2')
makedepends=('mesa' 'glu')
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
-http://editra.org/uploads/src/Editra-${_editraver}.tar.gz)
+http://editra.googlecode.com/files/Editra-${_editraver}.tar.gz)
sha1sums=('48451763275cfe4e5bbec49ccd75bc9652cba719'
'f439f4aa2cb90b8348cebb1670df9cf47ba341ab')
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Sunday, January 12, 2014 @ 03:17:51
Author: eric
Revision: 203509
upgpkg: wxpython 3.0.0.0-2
Fix undefined symbol (close FS#38473)
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-12 01:30:04 UTC (rev 203508)
+++ PKGBUILD2014-01-12 02:17:51 UTC (rev 203509)
@@ -4,7 +4,7 @@
pkgname=wxpython
pkgver=3.0.0.0
_editraver=0.7.20
-pkgrel=1
+pkgrel=2
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
[arch-commits] Commit in wxpython/trunk (PKGBUILD wxpython-fpb_default_style.patch)
Date: Friday, October 5, 2012 @ 23:24:12
Author: eric
Revision: 168111
upgpkg: wxpython 2.8.12.1-4
Fixed FPB_DEFAULT_STYLE bug (close FS#31028)
Added:
wxpython/trunk/wxpython-fpb_default_style.patch
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |9 ++---
wxpython-fpb_default_style.patch | 17 +
2 files changed, 23 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-06 01:00:22 UTC (rev 168110)
+++ PKGBUILD2012-10-06 03:24:12 UTC (rev 168111)
@@ -3,16 +3,18 @@
pkgname=wxpython
pkgver=2.8.12.1
-pkgrel=3
+pkgrel=4
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
url=http://www.wxpython.org;
depends=('wxgtk' 'python2')
makedepends=('mesa')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
wxpython-cairo.patch)
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
+wxpython-cairo.patch wxpython-fpb_default_style.patch)
sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
- '420700b0a216b853352ffafd054f406a82a30bb3')
+ '420700b0a216b853352ffafd054f406a82a30bb3'
+ 'b832d628b8ff38ea598f404d133899f40d687a22')
build() {
cd ${srcdir}/wxPython-src-${pkgver}
@@ -24,6 +26,7 @@
--disable-precomp-headers
cd ${srcdir}/wxPython-src-${pkgver}/wxPython
patch -p2 -i ${srcdir}/wxpython-cairo.patch
+ patch -p1 -i ${srcdir}/wxpython-fpb_default_style.patch
python2 setup.py WXPORT=gtk2 UNICODE=1 build
}
Added: wxpython-fpb_default_style.patch
===
--- wxpython-fpb_default_style.patch(rev 0)
+++ wxpython-fpb_default_style.patch2012-10-06 03:24:12 UTC (rev 168111)
@@ -0,0 +1,17 @@
+--- wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 50185)
wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 69431)
+@@ -18,5 +18,4 @@
+ self.AddWindowStyles()
+ # Custom styles
+-self.AddStyle('FPB_DEFAULT_STYLE', fpb.FPB_DEFAULT_STYLE)
+ self.AddStyle('FPB_SINGLE_FOLD', fpb.FPB_SINGLE_FOLD)
+ self.AddStyle('FPB_COLLAPSE_TO_BOTTOM', fpb.FPB_COLLAPSE_TO_BOTTOM)
+--- wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 57250)
wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 69431)
+@@ -20,5 +20,5 @@
+implicit_attributes=['label', 'collapsed'],
+implicit_params={'collapsed': params.ParamBool})
+-c.addStyles('FPB_DEFAULT_STYLE', 'FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM',
++c.addStyles('FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM',
+ 'FPB_EXCLUSIVE_FOLD', 'FPB_HORIZONTAL', 'FPB_VERTICAL')
+ component.Manager.register(c)
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Tuesday, December 13, 2011 @ 17:53:33
Author: eric
Revision: 144997
upgpkg: wxpython 2.8.12.1-3
Disable gnomeprint
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-13 22:16:57 UTC (rev 144996)
+++ PKGBUILD2011-12-13 22:53:33 UTC (rev 144997)
@@ -3,7 +3,7 @@
pkgname=wxpython
pkgver=2.8.12.1
-pkgrel=2
+pkgrel=3
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
@@ -19,8 +19,9 @@
find . -type f -exec sed -i 's/env python/env python2/' {} \;
mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl
--enable-unicode \
---enable-graphics_ctx --with-gnomeprint --disable-optimize
--enable-mediactrl \
---with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+--enable-graphics_ctx --disable-optimize --enable-mediactrl \
+--with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys
--with-libtiff=sys \
+--disable-precomp-headers
cd ${srcdir}/wxPython-src-${pkgver}/wxPython
patch -p2 -i ${srcdir}/wxpython-cairo.patch
python2 setup.py WXPORT=gtk2 UNICODE=1 build
[arch-commits] Commit in wxpython/trunk (PKGBUILD wxpython-cairo.patch)
Date: Sunday, November 6, 2011 @ 19:37:39
Author: eric
Revision: 142235
upgpkg: wxpython 2.8.12.1-2
Fix issue with pycairo 1.10 (close FS#26770)
Added:
wxpython/trunk/wxpython-cairo.patch
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |9
wxpython-cairo.patch | 51 +
2 files changed, 56 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-06 21:12:47 UTC (rev 142234)
+++ PKGBUILD2011-11-07 00:37:39 UTC (rev 142235)
@@ -3,16 +3,16 @@
pkgname=wxpython
pkgver=2.8.12.1
-pkgrel=1
+pkgrel=2
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
url=http://www.wxpython.org;
depends=('wxgtk' 'python2')
makedepends=('mesa')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-md5sums=('8c06c5941477beee213b4f2fa78be620')
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
wxpython-cairo.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+ '420700b0a216b853352ffafd054f406a82a30bb3')
build() {
cd ${srcdir}/wxPython-src-${pkgver}
@@ -22,6 +22,7 @@
--enable-graphics_ctx --with-gnomeprint --disable-optimize
--enable-mediactrl \
--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
cd ${srcdir}/wxPython-src-${pkgver}/wxPython
+ patch -p2 -i ${srcdir}/wxpython-cairo.patch
python2 setup.py WXPORT=gtk2 UNICODE=1 build
}
Added: wxpython-cairo.patch
===
--- wxpython-cairo.patch(rev 0)
+++ wxpython-cairo.patch2011-11-07 00:37:39 UTC (rev 142235)
@@ -0,0 +1,51 @@
+--- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894
wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181
+@@ -401,6 +401,48 @@
+ ctypes.py_object)),
+ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
+
++# This structure is known good with pycairo 1.10.0. The keep adding stuff
++# to the middle of the structure instead of only adding to the end!
++elif cairo.version_info (1,11):
++_fields_ = [
++('Context_Type', ctypes.py_object),
++('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object,
++ ctypes.c_void_p,
++ ctypes.py_object,
++ ctypes.py_object)),
++('FontFace_Type', ctypes.py_object),
++('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4
++('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object,
ctypes.c_void_p)),
++('FontOptions_Type', ctypes.py_object),
++('FontOptions_FromFontOptions',
ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
++('Matrix_Type', ctypes.py_object),
++('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object,
ctypes.c_void_p)),
++('Path_Type', ctypes.py_object),
++('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object,
ctypes.c_void_p)),
++('Pattern_Type', ctypes.py_object),
++('SolidPattern_Type', ctypes.py_object),
++('SurfacePattern_Type', ctypes.py_object),
++('Gradient_Type', ctypes.py_object),
++('LinearGradient_Type', ctypes.py_object),
++('RadialGradient_Type', ctypes.py_object),
++('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object,
ctypes.c_void_p,
++ ctypes.py_object)), #**
changed in 1.8.4
++('ScaledFont_Type', ctypes.py_object),
++('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object,
ctypes.c_void_p)),
++('Surface_Type', ctypes.py_object),
++('ImageSurface_Type', ctypes.py_object),
++('PDFSurface_Type', ctypes.py_object),
++('PSSurface_Type', ctypes.py_object),
++('SVGSurface_Type', ctypes.py_object),
++('Win32Surface_Type', ctypes.py_object),
++('Win32PrintingSurface_Type', ctypes.py_object),
++('XCBSurface_Type', ctypes.py_object),
++('XlibSurface_Type', ctypes.py_object),
++('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object,
++ ctypes.c_void_p,
++ ctypes.py_object)),
++('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
++
+
+ def _loadPycairoAPI():
+ global pycairoAPI
[arch-commits] Commit in wxpython/trunk (PKGBUILD)
Date: Saturday, August 6, 2011 @ 22:39:42
Author: eric
Revision: 134638
upgpkg: wxpython 2.8.12.1-1
Upstream update
Modified:
wxpython/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-07 01:06:50 UTC (rev 134637)
+++ PKGBUILD2011-08-07 02:39:42 UTC (rev 134638)
@@ -2,7 +2,7 @@
# Maintainer: Eric Bélanger e...@archlinux.org
pkgname=wxpython
-pkgver=2.8.12.0
+pkgver=2.8.12.1
pkgrel=1
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
@@ -11,11 +11,13 @@
depends=('wxgtk' 'python2')
makedepends=('mesa')
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-md5sums=('402e0b81e06f596d849e221a7a76acc6')
-sha1sums=('f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4')
+md5sums=('8c06c5941477beee213b4f2fa78be620')
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
build() {
cd ${srcdir}/wxPython-src-${pkgver}
+ find . -type f -exec sed -i 's/env python/env python2/' {} \;
+ mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl
--enable-unicode \
--enable-graphics_ctx --with-gnomeprint --disable-optimize
--enable-mediactrl \
--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
[arch-commits] Commit in wxpython/trunk (PKGBUILD editra-aui.diff)
Date: Wednesday, April 20, 2011 @ 00:06:15
Author: eric
Revision: 120105
upgpkg: wxpython 2.8.12.0-1
Upstream update, Removed old patch
Modified:
wxpython/trunk/PKGBUILD
Deleted:
wxpython/trunk/editra-aui.diff
-+
PKGBUILD| 14 +-
editra-aui.diff | 11 ---
2 files changed, 5 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-19 21:53:29 UTC (rev 120104)
+++ PKGBUILD2011-04-20 04:06:15 UTC (rev 120105)
@@ -1,25 +1,21 @@
# $Id$
# Maintainer: Eric Bélanger e...@archlinux.org
-# Contributor: Andrew Wright andr...@photism.org
pkgname=wxpython
-pkgver=2.8.11.0
-pkgrel=3
+pkgver=2.8.12.0
+pkgrel=1
pkgdesc=A wxWidgets GUI toolkit for Python
arch=('i686' 'x86_64')
license=('custom:wxWindows')
url=http://www.wxpython.org;
depends=('wxgtk' 'python2')
makedepends=('mesa')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
editra-aui.diff)
-md5sums=('63f73aae49e530852db56a31b57529fa'
- '06c637c34c1570d8c82b870ce19c0622')
-sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17'
- '077fe341bf8822647934d6b1ea82ce9b0adbf93a')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
+md5sums=('402e0b81e06f596d849e221a7a76acc6')
+sha1sums=('f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4')
build() {
cd ${srcdir}/wxPython-src-${pkgver}
- patch -p1 ../editra-aui.diff
./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl
--enable-unicode \
--enable-graphics_ctx --with-gnomeprint --disable-optimize
--enable-mediactrl \
--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
Deleted: editra-aui.diff
===
--- editra-aui.diff 2011-04-19 21:53:29 UTC (rev 120104)
+++ editra-aui.diff 2011-04-20 04:06:15 UTC (rev 120105)
@@ -1,11 +0,0 @@
-diff -Naur wxPython-src-2.8.11.0-orig/wxPython/setup.py
wxPython-src-2.8.11.0/wxPython/setup.py
wxPython-src-2.8.11.0-orig/wxPython/setup.py 2010-06-04
04:15:47.0 -0400
-+++ wxPython-src-2.8.11.0/wxPython/setup.py2010-06-04 04:18:36.0
-0400
-@@ -893,6 +893,7 @@
- 'wx.tools.Editra.src.eclib',
- 'wx.tools.Editra.src.ebmlib',
- 'wx.tools.Editra.src.extern',
-+'wx.tools.Editra.src.extern.aui',
- 'wx.tools.Editra.src.syntax',
- ]
-
