[arch-commits] Commit in wxgtk/trunk (PKGBUILD wxgtk-freeze.patch)

[Eric Bélanger]

    Date: Tuesday, October 7, 2014 @ 01:31:23
  Author: eric
Revision: 223944

upgpkg: wxgtk 3.0.2-1

Upstream update, Remove old patch

Modified:
  wxgtk/trunk/PKGBUILD
Deleted:
  wxgtk/trunk/wxgtk-freeze.patch

--------------------+
 PKGBUILD           |   14 ++++----------
 wxgtk-freeze.patch |   48 ------------------------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-06 22:37:38 UTC (rev 223943)
+++ PKGBUILD	2014-10-06 23:31:23 UTC (rev 223944)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=wxgtk
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
@@ -12,15 +12,9 @@
 makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxgtk-freeze.patch)
-sha1sums=('73e58521d6871c9f4d1e7974c6e3a81629fddcf8'
-          'f9b70baea573e309c6adcbb08a742592b45b2084')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2)
+sha1sums=('705b0aff5ed323c63f49eb2dbe33691c80eb3945')
 
-prepare() {
-  cd wxWidgets-${pkgver}
-  patch -p3 -i "${srcdir}/wxgtk-freeze.patch"
-}
-
 build() {
   cd wxWidgets-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \

Deleted: wxgtk-freeze.patch
===================================================================
--- wxgtk-freeze.patch	2014-10-06 22:37:38 UTC (rev 223943)
+++ wxgtk-freeze.patch	2014-10-06 23:31:23 UTC (rev 223944)
@@ -1,48 +0,0 @@
---- 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 );
-