[arch-commits] Commit in wxgtk/repos (6 files)
Eric Bélanger
eric at archlinux.org
Tue Sep 2 18:45:57 UTC 2014
Date: Tuesday, September 2, 2014 @ 20:45:57
Author: eric
Revision: 220906
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wxgtk/repos/extra-i686/PKGBUILD
(from rev 220905, wxgtk/trunk/PKGBUILD)
wxgtk/repos/extra-i686/wxgtk-freeze.patch
(from rev 220905, wxgtk/trunk/wxgtk-freeze.patch)
wxgtk/repos/extra-x86_64/PKGBUILD
(from rev 220905, wxgtk/trunk/PKGBUILD)
wxgtk/repos/extra-x86_64/wxgtk-freeze.patch
(from rev 220905, wxgtk/trunk/wxgtk-freeze.patch)
Deleted:
wxgtk/repos/extra-i686/PKGBUILD
wxgtk/repos/extra-x86_64/PKGBUILD
---------------------------------+
/PKGBUILD | 76 ++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 32 ----------------
extra-i686/wxgtk-freeze.patch | 48 ++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 32 ----------------
extra-x86_64/wxgtk-freeze.patch | 48 ++++++++++++++++++++++++
5 files changed, 172 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-09-02 18:43:40 UTC (rev 220905)
+++ extra-i686/PKGBUILD 2014-09-02 18:45:57 UTC (rev 220906)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=wxgtk
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libsm')
-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)
-sha1sums=('73e58521d6871c9f4d1e7974c6e3a81629fddcf8')
-
-build() {
- cd wxWidgets-${pkgver}
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --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 -C locale allmo
-}
-
-package() {
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: wxgtk/repos/extra-i686/PKGBUILD (from rev 220905, wxgtk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-09-02 18:45:57 UTC (rev 220906)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=wxgtk
+pkgver=3.0.1
+pkgrel=3
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gstreamer0.10-base' 'libsm')
+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')
+
+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 \
+ --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 -C locale allmo
+}
+
+package() {
+ cd wxWidgets-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: wxgtk/repos/extra-i686/wxgtk-freeze.patch (from rev 220905, wxgtk/trunk/wxgtk-freeze.patch)
===================================================================
--- extra-i686/wxgtk-freeze.patch (rev 0)
+++ extra-i686/wxgtk-freeze.patch 2014-09-02 18:45:57 UTC (rev 220906)
@@ -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 );
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-09-02 18:43:40 UTC (rev 220905)
+++ extra-x86_64/PKGBUILD 2014-09-02 18:45:57 UTC (rev 220906)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=wxgtk
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libsm')
-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)
-sha1sums=('73e58521d6871c9f4d1e7974c6e3a81629fddcf8')
-
-build() {
- cd wxWidgets-${pkgver}
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --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 -C locale allmo
-}
-
-package() {
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: wxgtk/repos/extra-x86_64/PKGBUILD (from rev 220905, wxgtk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-09-02 18:45:57 UTC (rev 220906)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=wxgtk
+pkgver=3.0.1
+pkgrel=3
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gstreamer0.10-base' 'libsm')
+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')
+
+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 \
+ --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 -C locale allmo
+}
+
+package() {
+ cd wxWidgets-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: wxgtk/repos/extra-x86_64/wxgtk-freeze.patch (from rev 220905, wxgtk/trunk/wxgtk-freeze.patch)
===================================================================
--- extra-x86_64/wxgtk-freeze.patch (rev 0)
+++ extra-x86_64/wxgtk-freeze.patch 2014-09-02 18:45:57 UTC (rev 220906)
@@ -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 );
+
More information about the arch-commits
mailing list