tek/contrib-tek
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

wxgtk: 2.8.12.1 -> 3.0.1

Browse Source
This commit is contained in:
Danny Rawlins 2014-09-18 21:33:22 +10:00
parent bf763c2728
commit 28d139856b
4 changed files with 846 additions and 708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1474
wxgtk/.footprint
View File

File diff suppressed because it is too large Load Diff

3
wxgtk/.md5sum
View File

@ -1 +1,2 @@
8c06c5941477beee213b4f2fa78be620 wxPython-src-2.8.12.1.tar.bz2
dad1f1cd9d4c370cbc22700dc492da31 wxWidgets-3.0.1.tar.bz2
f4a8f6f30ca2853fe22366fa2528f54a wxgtk-freeze.patch

29
wxgtk/Pkgfile
View File

@ -2,17 +2,18 @@
# URL: http://www.wxwidgets.org/
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Antti Nykanen, aon at iki dot fi
# Depends on: glitz gtk glu
# Depends on: gtk glu gst-plugins-base-compat
name=wxgtk
version=2.8.12.1
release=3
#source=(http://downloads.sourceforge.net/project/wxwindows/$version/wxGTK-$version.tar.bz2)
source=(http://downloads.sourceforge.net/project/wxpython/wxPython/$version/wxPython-src-$version.tar.bz2)
version=3.0.1
release=1
source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-$version.tar.bz2
wxgtk-freeze.patch)
build() {
# cd wxGTK-$version
cd wxPython-src-$version
cd wxWidgets-$version
patch -p3 -i $SRC/wxgtk-freeze.patch
./configure \
--prefix=/usr \
@ -21,18 +22,18 @@ build() {
--with-opengl \
--enable-unicode \
--enable-graphics_ctx \
--enable-mediactrl \
--enable-webview \
--with-regex=builtin \
--with-libpng=sys \
--with-libxpm=sys \
--with-libjpeg=sys \
--with-libtiff=sys \
--disable-precomp-headers
make
make DESTDIR=$PKG install
cd contrib/src
make
make DESTDIR=$PKG install
ln -sf /usr/lib/wx/config/gtk2-unicode-release-${version:0:3} \
$PKG/usr/bin/wx-config
rm -r \
$PKG/usr/share/locale \
$PKG/usr/share/bakefile

48
wxgtk/wxgtk-freeze.patch Normal file
View File

@ -0,0 +1,48 @@
--- wxWidgets/branches/WX_3_0_BRANCH/src/generic/listctrl.cpp 2013/12/02 12:56:44 75325
+++ wxWidgets/branches/WX_3_0_BRANCH/src/generic/listctrl.cpp 2014/07/03 14:16:37 76808
@@ -1420,6 +1420,13 @@
void wxListTextCtrlWrapper::EndEdit(EndReason reason)
{
+ if( m_aboutToFinish )
+ {
+ // We already called Finish which cannot be called
+ // more than once.
+ return;
+ }
+
m_aboutToFinish = true;
switch ( reason )
@@ -1525,6 +1532,7 @@
{
if ( !m_aboutToFinish )
{
+ m_aboutToFinish = true;
if ( !AcceptChanges() )
m_owner->OnRenameCancelled( m_itemEdited );
--- wxWidgets/branches/WX_3_0_BRANCH/src/generic/treectlg.cpp 2014/03/07 13:16:15 76093
+++ wxWidgets/branches/WX_3_0_BRANCH/src/generic/treectlg.cpp 2014/07/03 14:16:37 76808
@@ -458,6 +458,13 @@
void wxTreeTextCtrl::EndEdit(bool discardChanges)
{
+ if ( m_aboutToFinish )
+ {
+ // We already called Finish which cannot be called
+ // more than once.
+ return;
+ }
+
m_aboutToFinish = true;
if ( discardChanges )
@@ -555,6 +562,7 @@
{
if ( !m_aboutToFinish )
{
+ m_aboutToFinish = true;
if ( !AcceptChanges() )
m_owner->OnRenameCancelled( m_itemEdited );