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

2020-05-10 Thread Antonio Rojas via arch-commits 
Date: Sunday, May 10, 2020 @ 07:50:05
  Author: arojas
Revision: 382990

Update to 3.0.5.1

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-10 07:26:45 UTC (rev 382989)
+++ PKGBUILD2020-05-10 07:50:05 UTC (rev 382990)
@@ -2,7 +2,7 @@
 
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.5
+pkgver=3.0.5.1
 pkgrel=1
 arch=('x86_64')
 url="https://wxwidgets.org;
@@ -11,7 +11,7 @@
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)
-sha256sums=('8aacd56b462f42fb6e33b4d8f5d40be5abc3d3b41348ea968aa515cc8285d813'
+sha256sums=('440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807'
 '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
 
 prepare() {

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

2020-05-02 Thread Antonio Rojas via arch-commits 
Date: Saturday, May 2, 2020 @ 11:19:23
  Author: arojas
Revision: 382142

Update to 3.0.5

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   48 +++-
 1 file changed, 23 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-02 11:05:07 UTC (rev 382141)
+++ PKGBUILD2020-05-02 11:19:23 UTC (rev 382142)
@@ -2,20 +2,20 @@
 
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.0.5
+pkgrel=1
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
+makedepends=(gst-plugins-base glu webkit2gtk libnotify gtk2)
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)
-sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
+sha256sums=('8aacd56b462f42fb6e33b4d8f5d40be5abc3d3b41348ea968aa515cc8285d813'
 '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
 
 prepare() {
-  cd wxWidgets-${pkgver}
+  cd wxWidgets-$pkgver
 
   # C++ ABI check is too strict and breaks with GCC 5.1
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
@@ -22,12 +22,11 @@
   patch -Np1 -i ../make-abicheck-non-fatal.patch
 
   cd ..
-  cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
+  cp -r wxWidgets-$pkgver wxWidgets-$pkgver-gtk3
 }
 
 build() {
-  cd wxWidgets-${pkgver}
-  ./autogen.sh
+  cd wxWidgets-$pkgver
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
 --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
@@ -35,8 +34,7 @@
   make
   make -C locale allmo
 
-  cd ../wxWidgets-${pkgver}-gtk3
-  ./autogen.sh
+  cd ../wxWidgets-$pkgver-gtk3
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --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 \
@@ -46,39 +44,39 @@
 
 package_wxgtk-common() {
   pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
-  depends=('zlib' 'gcc-libs' 'expat')
+  depends=(zlib gcc-libs expat)
 
-  cd wxWidgets-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd wxWidgets-$pkgver
+  make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}}
 
-  install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 docs/licence.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 
'wxgtk-common' 'libnotify')
-  conflicts=('wxgtk')
-  provides=('wxgtk')
-  replaces=('wxgtk')
+  depends=(gtk2 libgl gst-plugins-base-libs libsm libxxf86vm wxgtk-common 
libnotify)
+  conflicts=(wxgtk)
+  provides=(wxgtk)
+  replaces=(wxgtk)
 
-  cd wxWidgets-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd wxWidgets-$pkgver
+  make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
   
-  install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 docs/licence.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_wxgtk3() {
   pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
-  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 
'libnotify')
+  depends=(gtk3 gst-plugins-base-libs libsm libxxf86vm wxgtk-common libnotify)
   optdepends=('webkit2gtk: for webview support')
   conflicts=('wxgtk<3.0.3.1-2')
 
-  cd wxWidgets-${pkgver}-gtk3
-  make DESTDIR="${pkgdir}" install  
+  cd wxWidgets-$pkgver-gtk3
+  make DESTDIR="$pkgdir" install  
   rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
   mv "$pkgdir"/usr/bin/wx-config{,-gtk3}

-  install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 docs/licence.txt 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }

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

2019-03-31 Thread Antonio Rojas via arch-commits 
Date: Sunday, March 31, 2019 @ 09:54:01
  Author: arojas
Revision: 349476

Revert to 3.0, no everything supports 3.1 yet

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-31 09:46:58 UTC (rev 349475)
+++ PKGBUILD2019-03-31 09:54:01 UTC (rev 349476)
@@ -2,8 +2,8 @@
 
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.1.2
-pkgrel=1
+pkgver=3.0.4
+pkgrel=2
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -11,7 +11,7 @@
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)
-sha256sums=('4cb8d23d70f9261debf7d6cfeca667fc0a7d2b6565adb8f1c484f9b674f1f27a'
+sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
 '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
 
 prepare() {
@@ -46,7 +46,7 @@
 
 package_wxgtk-common() {
   pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
-  depends=('zlib' 'gcc-libs' 'expat' 'xz' 'libsecret')
+  depends=('zlib' 'gcc-libs' 'expat')
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
@@ -57,7 +57,7 @@
 
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxtst' 
'wxgtk-common' 'libnotify')
+  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 
'wxgtk-common' 'libnotify')
   conflicts=('wxgtk')
   provides=('wxgtk')
   replaces=('wxgtk')

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

2019-03-25 Thread Antonio Rojas via arch-commits 
Date: Monday, March 25, 2019 @ 08:05:43
  Author: arojas
Revision: 349157

Update to 3.1.2

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-24 22:45:44 UTC (rev 349156)
+++ PKGBUILD2019-03-25 08:05:43 UTC (rev 349157)
@@ -2,8 +2,8 @@
 
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -11,7 +11,7 @@
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)
-sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
+sha256sums=('4cb8d23d70f9261debf7d6cfeca667fc0a7d2b6565adb8f1c484f9b674f1f27a'
 '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
 
 prepare() {
@@ -46,7 +46,7 @@
 
 package_wxgtk-common() {
   pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
-  depends=('zlib' 'gcc-libs' 'expat')
+  depends=('zlib' 'gcc-libs' 'expat' 'xz' 'libsecret')
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
@@ -57,7 +57,7 @@
 
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 
'wxgtk-common' 'libnotify')
+  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxtst' 
'wxgtk-common' 'libnotify')
   conflicts=('wxgtk')
   provides=('wxgtk')
   replaces=('wxgtk')

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

2018-09-11 Thread Antonio Rojas via arch-commits 
Date: Tuesday, September 11, 2018 @ 15:51:29
  Author: arojas
Revision: 334381

Drop gconf makedepends (FS#60014)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-11 14:28:37 UTC (rev 334380)
+++ PKGBUILD2018-09-11 15:51:29 UTC (rev 334381)
@@ -4,11 +4,11 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
+makedepends=('gst-plugins-base' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)

[arch-commits] Commit in wxgtk/trunk (PKGBUILD wxgtk-webkit-infinite-loop.patch)

2018-03-09 Thread Antonio Rojas via arch-commits 
Date: Friday, March 9, 2018 @ 19:51:45
  Author: arojas
Revision: 318358

Update to 3.0.4

Modified:
  wxgtk/trunk/PKGBUILD
Deleted:
  wxgtk/trunk/wxgtk-webkit-infinite-loop.patch

--+
 PKGBUILD |   33 ++---
 wxgtk-webkit-infinite-loop.patch |   36 
 2 files changed, 6 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-09 19:50:46 UTC (rev 318357)
+++ PKGBUILD2018-03-09 19:51:45 UTC (rev 318358)
@@ -3,8 +3,8 @@
 
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.3.1
-pkgrel=11
+pkgver=3.0.4
+pkgrel=1
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -11,18 +11,9 @@
 makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
-make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;
-
wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch;
-
wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch;
-wxgtk-webkit-infinite-loop.patch
-
wxgtk3-scroll.patch::"https://github.com/wxWidgets/wxWidgets/commit/7626292f.patch;)
-sha256sums=('3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4'
-'46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453'
-'5cc7804696d94f88470d99899d628f1873a5ecff359a5e6fcf67318f3dcfd3ee'
-'c441ae48381b1d92522e6f125d733d5710105065099327c00fa35f50e146bdf4'
-'168deb2e76e21bcd46c3a1efd86c0f3e1354e9511cf12a9dc54b7dc82c0e3d63'
-'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5'
-'7f21db7139d5c3423282227698fd31f68299fd75ed0e028da979e091bd02d168')
+make-abicheck-non-fatal.patch)
+sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
+'46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -31,18 +22,6 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
   patch -Np1 -i ../make-abicheck-non-fatal.patch
 
-  # Support webkit2gtk
-  sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
-  patch -p1 -i ../wxgtk-webkit2gtk.patch
-  # fix webview after webkit2gtk port
-  patch -p1 -i ../wxgtk2-fix-webview.patch
-  # fix assert in FileZilla
-  patch -p1 -i ../wxgtk-filezilla-assert.patch
-  # fix infinite loop in webkit
-  patch -p1 -i ../wxgtk-webkit-infinite-loop.patch
-  # fix scrolling in wxgtk3
-  patch -p1 -i ../wxgtk3-scroll.patch
-
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
 }
@@ -79,7 +58,7 @@
 
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 
'libnotify')
+  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 
'wxgtk-common' 'libnotify')
   conflicts=('wxgtk')
   provides=('wxgtk')
   replaces=('wxgtk')

Deleted: wxgtk-webkit-infinite-loop.patch
===
--- wxgtk-webkit-infinite-loop.patch2018-03-09 19:50:46 UTC (rev 318357)
+++ wxgtk-webkit-infinite-loop.patch2018-03-09 19:51:45 UTC (rev 318358)
@@ -1,36 +0,0 @@
-From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
-From: Paul Cornett 
-Date: Sat, 6 Jan 2018 11:07:11 -0800
-Subject: [PATCH] Avoid calling default "key-press-event" handler
-
-We have already done everything it does, and doing it again seems to
-cause an infinite loop with WebKitGTK. See #17932

- src/gtk/toplevel.cpp | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
-index f63fdd3e463..ae825d40396 100644
 a/src/gtk/toplevel.cpp
-+++ b/src/gtk/toplevel.cpp
-@@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey 
*event)
- // GTK+ gtk_window_key_press_event() handler.
- 
- if ( gtk_window_propagate_key_event(window, event) )
--return TRUE;
-+return true;
- 
- if ( gtk_window_activate_key(window, event) )
--return TRUE;
-+return true;
- 
--if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
--return TRUE;
-+GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
- 
--return FALSE;
-+// Avoid calling the default handler, we have already done everything it 
does
-+return true;
- }
- }
-

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

2018-01-21 Thread Antonio Rojas via arch-commits 
Date: Sunday, January 21, 2018 @ 18:13:51
  Author: arojas
Revision: 315195

Fix scrolling in wxgtk3 applications (FS#57179)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-21 18:02:55 UTC (rev 315194)
+++ PKGBUILD2018-01-21 18:13:51 UTC (rev 315195)
@@ -4,7 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=10
+pkgrel=11
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -14,13 +14,15 @@
 make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;
 
wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch;
 
wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch;
-wxgtk-webkit-infinite-loop.patch)
+wxgtk-webkit-infinite-loop.patch
+
wxgtk3-scroll.patch::"https://github.com/wxWidgets/wxWidgets/commit/7626292f.patch;)
 sha256sums=('3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4'
 '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453'
 '5cc7804696d94f88470d99899d628f1873a5ecff359a5e6fcf67318f3dcfd3ee'
 'c441ae48381b1d92522e6f125d733d5710105065099327c00fa35f50e146bdf4'
 '168deb2e76e21bcd46c3a1efd86c0f3e1354e9511cf12a9dc54b7dc82c0e3d63'
-'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5')
+'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5'
+'7f21db7139d5c3423282227698fd31f68299fd75ed0e028da979e091bd02d168')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -38,6 +40,8 @@
   patch -p1 -i ../wxgtk-filezilla-assert.patch
   # fix infinite loop in webkit
   patch -p1 -i ../wxgtk-webkit-infinite-loop.patch
+  # fix scrolling in wxgtk3
+  patch -p1 -i ../wxgtk3-scroll.patch
 
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3

[arch-commits] Commit in wxgtk/trunk (PKGBUILD wxgtk-webkit-infinite-loop.patch)

2018-01-07 Thread Antonio Rojas via arch-commits 
Date: Sunday, January 7, 2018 @ 22:47:41
  Author: arojas
Revision: 314256

Fix infinite loop in webkit (FS#54630)

Added:
  wxgtk/trunk/wxgtk-webkit-infinite-loop.patch
Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 wxgtk-webkit-infinite-loop.patch |   36 
 2 files changed, 47 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-07 21:20:59 UTC (rev 314255)
+++ PKGBUILD2018-01-07 22:47:41 UTC (rev 314256)
@@ -4,7 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=9
+pkgrel=10
 arch=('x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -13,12 +13,14 @@
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;
 
wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch;
-
wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch;)
-sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
-  'dfe38650c655395b90bf082b5734c4093508bfa3'
-  'c9d013552b3078d7a9700df897333c2960207b0f'
-  '550c368a68eec8b6c32c61da289df76e4dd5a798'
-  '1da8af91ef6c590da9c43dd115f52d605730f16a')
+
wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch;
+wxgtk-webkit-infinite-loop.patch)
+sha256sums=('3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4'
+'46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453'
+'5cc7804696d94f88470d99899d628f1873a5ecff359a5e6fcf67318f3dcfd3ee'
+'c441ae48381b1d92522e6f125d733d5710105065099327c00fa35f50e146bdf4'
+'168deb2e76e21bcd46c3a1efd86c0f3e1354e9511cf12a9dc54b7dc82c0e3d63'
+'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -34,6 +36,8 @@
   patch -p1 -i ../wxgtk2-fix-webview.patch
   # fix assert in FileZilla
   patch -p1 -i ../wxgtk-filezilla-assert.patch
+  # fix infinite loop in webkit
+  patch -p1 -i ../wxgtk-webkit-infinite-loop.patch
 
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3

Added: wxgtk-webkit-infinite-loop.patch
===
--- wxgtk-webkit-infinite-loop.patch(rev 0)
+++ wxgtk-webkit-infinite-loop.patch2018-01-07 22:47:41 UTC (rev 314256)
@@ -0,0 +1,36 @@
+From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
+From: Paul Cornett 
+Date: Sat, 6 Jan 2018 11:07:11 -0800
+Subject: [PATCH] Avoid calling default "key-press-event" handler
+
+We have already done everything it does, and doing it again seems to
+cause an infinite loop with WebKitGTK. See #17932
+---
+ src/gtk/toplevel.cpp | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
+index f63fdd3e463..ae825d40396 100644
+--- a/src/gtk/toplevel.cpp
 b/src/gtk/toplevel.cpp
+@@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey 
*event)
+ // GTK+ gtk_window_key_press_event() handler.
+ 
+ if ( gtk_window_propagate_key_event(window, event) )
+-return TRUE;
++return true;
+ 
+ if ( gtk_window_activate_key(window, event) )
+-return TRUE;
++return true;
+ 
+-if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
+-return TRUE;
++GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
+ 
+-return FALSE;
++// Avoid calling the default handler, we have already done everything it 
does
++return true;
+ }
+ }
+

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

2017-09-10 Thread Antonio Rojas 
Date: Sunday, September 10, 2017 @ 11:33:20
  Author: arojas
Revision: 305242

Add missing libxxf86vm dependency

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-10 11:32:45 UTC (rev 305241)
+++ PKGBUILD2017-09-10 11:33:20 UTC (rev 305242)
@@ -4,7 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -71,7 +71,7 @@
 
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
+  depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 
'libnotify')
   conflicts=('wxgtk')
   provides=('wxgtk')
   replaces=('wxgtk')
@@ -85,7 +85,7 @@
 
 package_wxgtk3() {
   pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
-  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
+  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 
'libnotify')
   optdepends=('webkit2gtk: for webview support')
   conflicts=('wxgtk<3.0.3.1-2')

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

2017-09-05 Thread Antonio Rojas 
Date: Tuesday, September 5, 2017 @ 07:39:18
  Author: arojas
Revision: 304672

Fix FileZilla assertion (FS#55509)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-05 06:39:57 UTC (rev 304671)
+++ PKGBUILD2017-09-05 07:39:18 UTC (rev 304672)
@@ -4,7 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -12,11 +12,13 @@
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;
-
wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch;)
+
wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch;
+
wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch;)
 sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
   'dfe38650c655395b90bf082b5734c4093508bfa3'
   'c9d013552b3078d7a9700df897333c2960207b0f'
-  '550c368a68eec8b6c32c61da289df76e4dd5a798')
+  '550c368a68eec8b6c32c61da289df76e4dd5a798'
+  '1da8af91ef6c590da9c43dd115f52d605730f16a')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -30,6 +32,8 @@
   patch -p1 -i ../wxgtk-webkit2gtk.patch
   # fix webview after webkit2gtk port
   patch -p1 -i ../wxgtk2-fix-webview.patch
+  # fix assert in FileZilla
+  patch -p1 -i ../wxgtk-filezilla-assert.patch
 
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3

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

2017-06-19 Thread Antonio Rojas 
Date: Tuesday, June 20, 2017 @ 05:59:07
  Author: arojas
Revision: 298999

Drop webview for wxgtk2

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-20 05:54:43 UTC (rev 298998)
+++ PKGBUILD2017-06-20 05:59:07 UTC (rev 298999)
@@ -4,11 +4,11 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 
'libnotify')
+makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;
@@ -39,7 +39,7 @@
   cd wxWidgets-${pkgver}
   ./autogen.sh
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
---enable-graphics_ctx --enable-mediactrl --enable-webview 
--with-regex=builtin \
+--enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
 --disable-precomp-headers
   make
@@ -68,7 +68,6 @@
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
   depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
-  optdepends=('webkitgtk2: for webview support')
   conflicts=('wxgtk')
   provides=('wxgtk')
   replaces=('wxgtk')

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

2017-06-12 Thread Antonio Rojas 
Date: Monday, June 12, 2017 @ 17:52:23
  Author: arojas
Revision: 298706

Fix wxgtk2 webview regression after webkit2gtk port (FS#54419)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-12 13:18:20 UTC (rev 298705)
+++ PKGBUILD2017-06-12 17:52:23 UTC (rev 298706)
@@ -4,7 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -11,10 +11,12 @@
 makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 
'libnotify')
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
-make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;)
+make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;
+
wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch;)
 sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
   'dfe38650c655395b90bf082b5734c4093508bfa3'
-  'c9d013552b3078d7a9700df897333c2960207b0f')
+  'c9d013552b3078d7a9700df897333c2960207b0f'
+  '550c368a68eec8b6c32c61da289df76e4dd5a798')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -26,6 +28,8 @@
   # Support webkit2gtk
   sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
   patch -p1 -i ../wxgtk-webkit2gtk.patch
+  # fix webview after webkit2gtk port
+  patch -p1 -i ../wxgtk2-fix-webview.patch
 
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3

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

2017-06-12 Thread Antonio Rojas 
Date: Monday, June 12, 2017 @ 07:19:48
  Author: arojas
Revision: 298625

Make sure the webkit2gtk patch is also applied to the wxgtk-common package 
(FS#54412)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-12 06:44:26 UTC (rev 298624)
+++ PKGBUILD2017-06-12 07:19:48 UTC (rev 298625)
@@ -4,7 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -23,13 +23,12 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
   patch -Np1 -i ../make-abicheck-non-fatal.patch
 
-  cd ..
-  cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
-
   # Support webkit2gtk
-  cd wxWidgets-${pkgver}-gtk3
   sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
   patch -p1 -i ../wxgtk-webkit2gtk.patch
+
+  cd ..
+  cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
 }
 
 build() {

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

2017-06-08 Thread Antonio Rojas 
Date: Thursday, June 8, 2017 @ 19:57:40
  Author: arojas
Revision: 298443

Port wxgtk3 to webkit2gtk (FS#54370)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-08 19:56:38 UTC (rev 298442)
+++ PKGBUILD2017-06-08 19:57:40 UTC (rev 298443)
@@ -4,16 +4,17 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 
'libnotify')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 
'libnotify')
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
-make-abicheck-non-fatal.patch)
+make-abicheck-non-fatal.patch 
wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch;)
 sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
-  'dfe38650c655395b90bf082b5734c4093508bfa3')
+  'dfe38650c655395b90bf082b5734c4093508bfa3'
+  'c9d013552b3078d7a9700df897333c2960207b0f')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -24,6 +25,11 @@
 
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
+
+  # Support webkit2gtk
+  cd wxWidgets-${pkgver}-gtk3
+  sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
+  patch -p1 -i ../wxgtk-webkit2gtk.patch
 }
 
 build() {
@@ -74,7 +80,7 @@
 package_wxgtk3() {
   pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
   depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
-  optdepends=('webkitgtk: for webview support')
+  optdepends=('webkit2gtk: for webview support')
   conflicts=('wxgtk<3.0.3.1-2')
 
   cd wxWidgets-${pkgver}-gtk3

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

2017-06-05 Thread Antonio Rojas 
Date: Monday, June 5, 2017 @ 21:23:05
  Author: arojas
Revision: 297824

Move wxrc to common subpackage

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-05 21:08:28 UTC (rev 297823)
+++ PKGBUILD2017-06-05 21:23:05 UTC (rev 297824)
@@ -4,8 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=2
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+pkgrel=3
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
@@ -47,16 +46,18 @@
 }
 
 package_wxgtk-common() {
+  pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
   depends=('zlib' 'gcc-libs' 'expat')
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  rm -r "$pkgdir"/usr/{bin,lib/{wx,libwx_gtk*}}
+  rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}}
 
   install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_wxgtk2() {
+  pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
   depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
   optdepends=('webkitgtk2: for webview support')
   conflicts=('wxgtk')
@@ -65,12 +66,13 @@
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
   
   install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_wxgtk3() {
+  pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
   depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
   optdepends=('webkitgtk: for webview support')
   conflicts=('wxgtk<3.0.3.1-2')
@@ -77,14 +79,8 @@
 
   cd wxWidgets-${pkgver}-gtk3
   make DESTDIR="${pkgdir}" install  
-  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
-  for _i in wx-config wxrc-3.0
-  do
-mv "$pkgdir"/usr/bin/{${_i},${_i}-gtk3}
-  done
-  rm "$pkgdir"/usr/bin/wxrc
-  ln -s wxrc-3.0-gtk3 "$pkgdir"/usr/bin/wxrc-gtk3
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
+  mv "$pkgdir"/usr/bin/wx-config{,-gtk3}

   install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-

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

2017-06-04 Thread Antonio Rojas 
Date: Sunday, June 4, 2017 @ 22:33:07
  Author: arojas
Revision: 297789

First attempt at adding a GTK3 version

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   59 +--
 1 file changed, 53 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-04 22:31:40 UTC (rev 297788)
+++ PKGBUILD2017-06-04 22:33:07 UTC (rev 297789)
@@ -1,16 +1,15 @@
 # $Id$
 # Maintainer: Eric Bélanger 
 
-pkgname=wxgtk
+pkgbase=wxgtk
+pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'gst-plugins-base-libs' 'libsm')
-makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu')
-optdepends=('webkitgtk2: for webview support')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 
'libnotify')
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)
@@ -23,6 +22,9 @@
   # C++ ABI check is too strict and breaks with GCC 5.1
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
   patch -Np1 -i ../make-abicheck-non-fatal.patch
+
+  cd ..
+  cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
 }
 
 build() {
@@ -34,10 +36,55 @@
 --disable-precomp-headers
   make
   make -C locale allmo
+
+  cd ../wxWidgets-${pkgver}-gtk3
+  ./autogen.sh
+  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --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
 }
 
-package() {
+package_wxgtk-common() {
+  depends=('zlib' 'gcc-libs' 'expat')
+
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
+  rm -r "$pkgdir"/usr/{bin,lib/{wx,libwx_gtk*}}
+
   install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+package_wxgtk2() {
+  depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
+  optdepends=('webkitgtk2: for webview support')
+  conflicts=('wxgtk')
+  provides=('wxgtk')
+  replaces=('wxgtk')
+
+  cd wxWidgets-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
+  
+  install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_wxgtk3() {
+  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
+  optdepends=('webkitgtk: for webview support')
+  conflicts=('wxgtk<3.0.3.1-2')
+
+  cd wxWidgets-${pkgver}-gtk3
+  make DESTDIR="${pkgdir}" install  
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
+  for _i in wx-config wxrc-3.0
+  do
+mv "$pkgdir"/usr/bin/{${_i},${_i}-gtk3}
+  done
+  rm "$pkgdir"/usr/bin/wxrc
+  ln -s wxrc-3.0-gtk3 "$pkgdir"/usr/bin/wxrc-gtk3
+   
+  install -D -m644 docs/licence.txt 
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+

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

2017-05-16 Thread Antonio Rojas 
Date: Tuesday, May 16, 2017 @ 21:17:56
  Author: arojas
Revision: 296194

Update to 3.0.3.1

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-16 19:46:45 UTC (rev 296193)
+++ PKGBUILD2017-05-16 21:17:56 UTC (rev 296194)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=wxgtk
-pkgver=3.0.3
+pkgver=3.0.3.1
 pkgrel=1
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 options=('!emptydirs')
 
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
 make-abicheck-non-fatal.patch)
-sha1sums=('3525306c926e208d9b0272aaa9c091b8c7264e5b'
+sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
   'dfe38650c655395b90bf082b5734c4093508bfa3')
 
 prepare() {

[arch-commits] Commit in wxgtk/trunk (PKGBUILD gst1.0.patch wxgtk-gcc6.patch)

2017-05-02 Thread Antonio Rojas 
Date: Tuesday, May 2, 2017 @ 15:06:37
  Author: arojas
Revision: 295185

Update to 3.0.3

Modified:
  wxgtk/trunk/PKGBUILD
Deleted:
  wxgtk/trunk/gst1.0.patch
  wxgtk/trunk/wxgtk-gcc6.patch

--+
 PKGBUILD |   20 -
 gst1.0.patch |  886 -
 wxgtk-gcc6.patch |   39 --
 3 files changed, 6 insertions(+), 939 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-02 14:59:11 UTC (rev 295184)
+++ PKGBUILD2017-05-02 15:06:37 UTC (rev 295185)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=wxgtk
-pkgver=3.0.2
-pkgrel=6
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org;
@@ -12,12 +12,10 @@
 makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu')
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
-source=(https://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
-make-abicheck-non-fatal.patch wxgtk-gcc6.patch gst1.0.patch)
-sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
-  'dfe38650c655395b90bf082b5734c4093508bfa3'
-  '498202334c69d49c1ebbc9d36ad382cfa237f3f8'
-  '07d47f2fb2efd400ab54302b3bb55da141d76d61')
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
+make-abicheck-non-fatal.patch)
+sha1sums=('3525306c926e208d9b0272aaa9c091b8c7264e5b'
+  'dfe38650c655395b90bf082b5734c4093508bfa3')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -25,12 +23,6 @@
   # C++ ABI check is too strict and breaks with GCC 5.1
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
   patch -Np1 -i ../make-abicheck-non-fatal.patch
-
-  # Fix build with GCC 6
-  patch -p1 -i ../wxgtk-gcc6.patch
-
-  # Gstreamer 0.10 -> 1.0 patch
-  patch -Np1 -i ../gst1.0.patch
 }
 
 build() {

Deleted: gst1.0.patch
===
--- gst1.0.patch2017-05-02 14:59:11 UTC (rev 295184)
+++ gst1.0.patch2017-05-02 15:06:37 UTC (rev 295185)
@@ -1,886 +0,0 @@
-Index: wxwidgets3.0-3.0.2+dfsg/configure.in
-===
 wxwidgets3.0-3.0.2+dfsg.orig/configure.in
-+++ wxwidgets3.0-3.0.2+dfsg/configure.in
-@@ -7543,43 +7543,22 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$
- wxUSE_GSTREAMER="no"
- 
- dnl 
---
--dnl Test for at least 0.8 gstreamer module from pkg-config
--dnl Even totem doesn't accept 0.9 evidently.
--dnl
--dnl So, we first check to see if 0.10 if available - if not we
--dnl try the older 0.8 version
-+dnl Test for at least gstreamer 1.0 module from pkg-config
- dnl 
---
--GST_VERSION_MAJOR=0
--GST_VERSION_MINOR=10
-+GST_VERSION_MAJOR=1
-+GST_VERSION_MINOR=0
- GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
- 
--if test "$wxUSE_GSTREAMER8" = "no"; then
--PKG_CHECK_MODULES(GST,
--[gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
--[
--wxUSE_GSTREAMER="yes"
--GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
--],
--[
--AC_MSG_WARN([GStreamer 0.10 not available, falling back 
to 0.8])
--GST_VERSION_MINOR=8
--]
--)
--else
--dnl check only for 0.8
--GST_VERSION_MINOR=8
--fi
--
--if test $GST_VERSION_MINOR = "8"; then
--GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
--PKG_CHECK_MODULES(GST,
--[gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION 
gstreamer-gconf-$GST_VERSION],
--wxUSE_GSTREAMER="yes",
--[
--AC_MSG_WARN([GStreamer 0.8/0.10 not available.])
--])
--fi
--
-+PKG_CHECK_MODULES(GST,
-+[gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
-+[
-+wxUSE_GSTREAMER="yes"
-+GST_LIBS="$GST_LIBS -lgstvideo-$GST_VERSION"
-+],
-+[
-+AC_MSG_WARN([GStreamer 1.0 not available])
-+]
-+)
- 
- if test "$wxUSE_GSTREAMER" = "yes"; then
- CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
-Index: wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp
-===
 wxwidgets3.0-3.0.2+dfsg.orig/src/unix/mediactrl.cpp
-+++ wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp
-@@ -19,13 +19,7 @@
- 
- #include // main gstreamer header
- 
--//

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

2017-01-19 Thread Jan de Groot 
Date: Thursday, January 19, 2017 @ 15:18:20
  Author: jgc
Revision: 286972

upgpkg: wxgtk 3.0.2-6

Use GStreamer 1.0 for media plugin

Added:
  wxgtk/trunk/gst1.0.patch
Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   19 -
 gst1.0.patch |  886 +
 2 files changed, 898 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-19 12:22:54 UTC (rev 286971)
+++ PKGBUILD2017-01-19 15:18:20 UTC (rev 286972)
@@ -3,20 +3,21 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
-url="http://wxwidgets.org;
+url="https://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
+depends=('gtk2' 'gst-plugins-base-libs' 'libsm')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu')
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
-make-abicheck-non-fatal.patch wxgtk-gcc6.patch)
+source=(https://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
+make-abicheck-non-fatal.patch wxgtk-gcc6.patch gst1.0.patch)
 sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
   'dfe38650c655395b90bf082b5734c4093508bfa3'
-  '498202334c69d49c1ebbc9d36ad382cfa237f3f8')
+  '498202334c69d49c1ebbc9d36ad382cfa237f3f8'
+  '07d47f2fb2efd400ab54302b3bb55da141d76d61')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -27,10 +28,14 @@
 
   # Fix build with GCC 6
   patch -p1 -i ../wxgtk-gcc6.patch
+
+  # Gstreamer 0.10 -> 1.0 patch
+  patch -Np1 -i ../gst1.0.patch
 }
 
 build() {
   cd wxWidgets-${pkgver}
+  ./autogen.sh
   ./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 \

Added: gst1.0.patch
===
--- gst1.0.patch(rev 0)
+++ gst1.0.patch2017-01-19 15:18:20 UTC (rev 286972)
@@ -0,0 +1,886 @@
+Index: wxwidgets3.0-3.0.2+dfsg/configure.in
+===
+--- wxwidgets3.0-3.0.2+dfsg.orig/configure.in
 wxwidgets3.0-3.0.2+dfsg/configure.in
+@@ -7543,43 +7543,22 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$
+ wxUSE_GSTREAMER="no"
+ 
+ dnl 
---
+-dnl Test for at least 0.8 gstreamer module from pkg-config
+-dnl Even totem doesn't accept 0.9 evidently.
+-dnl
+-dnl So, we first check to see if 0.10 if available - if not we
+-dnl try the older 0.8 version
++dnl Test for at least gstreamer 1.0 module from pkg-config
+ dnl 
---
+-GST_VERSION_MAJOR=0
+-GST_VERSION_MINOR=10
++GST_VERSION_MAJOR=1
++GST_VERSION_MINOR=0
+ GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+ 
+-if test "$wxUSE_GSTREAMER8" = "no"; then
+-PKG_CHECK_MODULES(GST,
+-[gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
+-[
+-wxUSE_GSTREAMER="yes"
+-GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
+-],
+-[
+-AC_MSG_WARN([GStreamer 0.10 not available, falling back 
to 0.8])
+-GST_VERSION_MINOR=8
+-]
+-)
+-else
+-dnl check only for 0.8
+-GST_VERSION_MINOR=8
+-fi
+-
+-if test $GST_VERSION_MINOR = "8"; then
+-GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+-PKG_CHECK_MODULES(GST,
+-[gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION 
gstreamer-gconf-$GST_VERSION],
+-wxUSE_GSTREAMER="yes",
+-[
+-AC_MSG_WARN([GStreamer 0.8/0.10 not available.])
+-])
+-fi
+-
++PKG_CHECK_MODULES(GST,
++[gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
++[
++wxUSE_GSTREAMER="yes"
++GST_LIBS="$GST_LIBS -lgstvideo-$GST_VERSION"
++],
++[
++AC_MSG_WARN([GStreamer 1.0 not available])
++]
++)
+ 
+ if test "$wxUSE_GSTREAMER" = "yes"; then
+ CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+Index: wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp
+===
+---

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

2016-05-19 Thread Antonio Rojas 
Date: Thursday, May 19, 2016 @ 23:16:41
  Author: arojas
Revision: 268337

Fix build with GCC 6 (FS#49402)

Added:
  wxgtk/trunk/wxgtk-gcc6.patch
Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 wxgtk-gcc6.patch |   39 +++
 2 files changed, 45 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-19 21:09:53 UTC (rev 268336)
+++ PKGBUILD2016-05-19 21:16:41 UTC (rev 268337)
@@ -13,9 +13,10 @@
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
-make-abicheck-non-fatal.patch)
+make-abicheck-non-fatal.patch wxgtk-gcc6.patch)
 sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
-  'dfe38650c655395b90bf082b5734c4093508bfa3')
+  'dfe38650c655395b90bf082b5734c4093508bfa3'
+  '498202334c69d49c1ebbc9d36ad382cfa237f3f8')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -23,6 +24,9 @@
   # C++ ABI check is too strict and breaks with GCC 5.1
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
   patch -Np1 -i ../make-abicheck-non-fatal.patch
+
+  # Fix build with GCC 6
+  patch -p1 -i ../wxgtk-gcc6.patch
 }
 
 build() {

Added: wxgtk-gcc6.patch
===
--- wxgtk-gcc6.patch(rev 0)
+++ wxgtk-gcc6.patch2016-05-19 21:16:41 UTC (rev 268337)
@@ -0,0 +1,39 @@
+From 73e9e18ea09caac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
+From: Scott Talbert 
+Date: Sat, 20 Feb 2016 00:08:14 -0500
+Subject: [PATCH] Fix STC compilation with GCC6
+
+Use std::abs() from  instead of abs() from  to avoid problems
+with ambiguous overloads.
+
+Closes #17147.
+
+Closes https://github.com/wxWidgets/wxWidgets/pull/222
+---
+ src/stc/scintilla/src/Editor.cxx | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/stc/scintilla/src/Editor.cxx 
b/src/stc/scintilla/src/Editor.cxx
+index cd72953..2081df2 100644
+--- a/src/stc/scintilla/src/Editor.cxx
 b/src/stc/scintilla/src/Editor.cxx
+@@ -11,6 +11,7 @@
+ #include 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
+ }
+ 
+ static bool Close(Point pt1, Point pt2) {
+-  if (abs(pt1.x - pt2.x) > 3)
++  if (std::abs(pt1.x - pt2.x) > 3)
+   return false;
+-  if (abs(pt1.y - pt2.y) > 3)
++  if (std::abs(pt1.y - pt2.y) > 3)
+   return false;
+   return true;
+ }

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

2015-12-06 Thread Felix Yan 
Date: Sunday, December 6, 2015 @ 19:58:14
  Author: fyan
Revision: 252948

C++11 ABI rebuild

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 18:55:49 UTC (rev 252947)
+++ PKGBUILD2015-12-06 18:58:14 UTC (rev 252948)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org;

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

2015-04-24 Thread Bartłomiej Piotrowski 
Date: Friday, April 24, 2015 @ 21:29:54
  Author: bpiotrowski
Revision: 238017

upgpkg: wxgtk 3.0.2-3

rebuild using gcc 5.1

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-24 19:24:33 UTC (rev 238016)
+++ PKGBUILD2015-04-24 19:29:54 UTC (rev 238017)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;

[arch-commits] Commit in wxgtk/trunk (PKGBUILD make-abicheck-non-fatal.patch)

2015-04-24 Thread Evangelos Foutras 
Date: Friday, April 24, 2015 @ 22:32:09
  Author: foutrelis
Revision: 238022

upgpkg: wxgtk 3.0.2-4

Make C++ ABI check non-fatal.

Added:
  wxgtk/trunk/make-abicheck-non-fatal.patch
Modified:
  wxgtk/trunk/PKGBUILD

---+
 PKGBUILD  |   16 +---
 make-abicheck-non-fatal.patch |   15 +++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-24 20:11:08 UTC (rev 238021)
+++ PKGBUILD2015-04-24 20:32:09 UTC (rev 238022)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -12,9 +12,19 @@
 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=('6461eab4428c0a8b9e41781b8787510484dea800')
+source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2
+make-abicheck-non-fatal.patch)
+sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800'
+  'dfe38650c655395b90bf082b5734c4093508bfa3')
 
+prepare() {
+  cd wxWidgets-${pkgver}
+
+  # C++ ABI check is too strict and breaks with GCC 5.1
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+  patch -Np1 -i ../make-abicheck-non-fatal.patch
+}
+
 build() {
   cd wxWidgets-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \

Added: make-abicheck-non-fatal.patch
===
--- make-abicheck-non-fatal.patch   (rev 0)
+++ make-abicheck-non-fatal.patch   2015-04-24 20:32:09 UTC (rev 238022)
@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck 
wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck   2015-03-12 
17:15:18.0 +0100
 wxGTK-2.8.12/src/common/appbase.cpp2015-03-12 17:15:57.0 
+0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+ msg.Printf(_T(Mismatch between the program and library build 
versions detected.\nThe library used %s,\nand %s used %s.),
+lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-wxLogFatalError(msg.c_str());
+-
+-// normally wxLogFatalError doesn't return
+-return false;
++wxLogWarning(msg.c_str());
+ }
+ #undef wxCMP
+

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

2014-10-08 Thread Eric Bélanger 
Date: Wednesday, October 8, 2014 @ 22:09:46
  Author: eric
Revision: 224123

upgpkg: wxgtk 3.0.2-2

Fix version in wx-config

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-08 20:02:35 UTC (rev 224122)
+++ PKGBUILD2014-10-08 20:09:46 UTC (rev 224123)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -13,7 +13,7 @@
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2)
-sha1sums=('705b0aff5ed323c63f49eb2dbe33691c80eb3945')
+sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800')
 
 build() {
   cd wxWidgets-${pkgver}

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

2014-10-06 Thread 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
===
--- PKGBUILD2014-10-06 22:37:38 UTC (rev 223943)
+++ PKGBUILD2014-10-06 23:31:23 UTC (rev 223944)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger e...@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 );
-

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

2014-09-02 Thread Eric Bélanger 
Date: Tuesday, September 2, 2014 @ 20:43:40
  Author: eric
Revision: 220905

upgpkg: wxgtk 3.0.1-3

Add patch to fix freeze (close FS#41781)

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

+
 PKGBUILD   |   12 +---
 wxgtk-freeze.patch |   48 
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-02 17:41:52 UTC (rev 220904)
+++ PKGBUILD2014-09-02 18:43:40 UTC (rev 220905)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -12,9 +12,15 @@
 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')
+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 \

Added: wxgtk-freeze.patch
===
--- wxgtk-freeze.patch  (rev 0)
+++ wxgtk-freeze.patch  2014-09-02 18:43:40 UTC (rev 220905)
@@ -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 );
+

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

2014-08-08 Thread Florian Pritz 
Date: Friday, August 8, 2014 @ 12:33:43
  Author: bluewind
Revision: 219494

upgpkg: wxgtk 3.0.1-2

disable stl; FS#41500

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-08 06:25:33 UTC (rev 219493)
+++ PKGBUILD2014-08-08 10:33:43 UTC (rev 219494)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -18,7 +18,7 @@
 build() {
   cd wxWidgets-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
---enable-graphics_ctx --enable-mediactrl --enable-webview --enable-stl 
--with-regex=builtin \
+--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

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

2014-06-17 Thread Eric Bélanger 
Date: Tuesday, June 17, 2014 @ 22:41:43
  Author: eric
Revision: 215259

upgpkg: wxgtk 3.0.1-1

Upstream update

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-17 19:24:44 UTC (rev 215258)
+++ PKGBUILD2014-06-17 20:41:43 UTC (rev 215259)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=wxgtk
-pkgver=3.0.0
-pkgrel=3
+pkgver=3.0.1
+pkgrel=1
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -13,7 +13,7 @@
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2)
-sha1sums=('756a9c54d1f411e262f03bacb78ccef085a9880a')
+sha1sums=('73e58521d6871c9f4d1e7974c6e3a81629fddcf8')
 
 build() {
   cd wxWidgets-${pkgver}

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

2014-04-23 Thread Eric Bélanger 
Date: Wednesday, April 23, 2014 @ 17:46:55
  Author: eric
Revision: 211703

upgpkg: wxgtk 3.0.0-3

Add libsm depends (close FS#40047)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-23 15:31:57 UTC (rev 211702)
+++ PKGBUILD2014-04-23 15:46:55 UTC (rev 211703)
@@ -3,12 +3,12 @@
 
 pkgname=wxgtk
 pkgver=3.0.0
-pkgrel=2
+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')
+depends=('gtk2' 'gstreamer0.10-base' 'libsm')
 makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu')
 optdepends=('webkitgtk2: for webview support')
 options=('!emptydirs')

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

2014-01-07 Thread Eric Bélanger 
Date: Tuesday, January 7, 2014 @ 21:51:02
  Author: eric
Revision: 203301

upgpkg: wxgtk 3.0.0-2

Add STL support

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-07 20:11:01 UTC (rev 203300)
+++ PKGBUILD2014-01-07 20:51:02 UTC (rev 203301)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -18,7 +18,7 @@
 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 \
+--enable-graphics_ctx --enable-mediactrl --enable-webview --enable-stl 
--with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
 --disable-precomp-headers
   make

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

2014-01-05 Thread Eric Bélanger 
Date: Sunday, January 5, 2014 @ 17:01:12
  Author: eric
Revision: 203207

upgpkg: wxgtk 3.0.0-1

Upstream update, Add glu makedepends, Add webkitgtk2 optdepends

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-05 15:57:51 UTC (rev 203206)
+++ PKGBUILD2014-01-05 16:01:12 UTC (rev 203207)
@@ -2,32 +2,31 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=wxgtk
-pkgver=2.8.12.1
-pkgrel=5
+pkgver=3.0.0
+pkgrel=1
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'sdl')
-makedepends=('gstreamer0.10-base-plugins' 'gconf')
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
+depends=('gtk2' 'gstreamer0.10-base')
+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=('756a9c54d1f411e262f03bacb78ccef085a9880a')
 
 build() {
-  cd wx*-${pkgver}
+  cd wxWidgets-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
---enable-graphics_ctx  --disable-optimize --enable-mediactrl 
--with-regex=builtin \
+--enable-graphics_ctx --enable-mediactrl --enable-webview 
--with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
---with-sdl --disable-precomp-headers
+--disable-precomp-headers
   make
   make -C locale allmo
-  make -C contrib/src
 }
 
 package() {
-  cd wx*-${pkgver}
+  cd wxWidgets-${pkgver}
   make DESTDIR=${pkgdir} install
-  make -C contrib/src DESTDIR=${pkgdir} install
   install -D -m644 docs/licence.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

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

2013-04-27 Thread Eric Bélanger 
Date: Saturday, April 27, 2013 @ 23:15:54
  Author: eric
Revision: 183765

upgpkg: wxgtk 2.8.12.1-5

Rebuild against libpng 1.6, Clean up depends and makedepends

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-27 20:07:28 UTC (rev 183764)
+++ PKGBUILD2013-04-27 21:15:54 UTC (rev 183765)
@@ -3,35 +3,31 @@
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=4
+pkgrel=5
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm' 'sdl')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa' 'glu' 'libxt')
+depends=('gtk2' 'gstreamer0.10-base' 'sdl')
+makedepends=('gstreamer0.10-base-plugins' 'gconf')
 #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
 
 build() {
-  cd ${srcdir}/wxPython-src-${pkgver}
-#  cd ${srcdir}/wxGTK-${pkgver}
+  cd wx*-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
 --enable-graphics_ctx  --disable-optimize --enable-mediactrl 
--with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
 --with-sdl --disable-precomp-headers
   make
   make -C locale allmo
-  cd contrib/src
-  make
+  make -C contrib/src
 }
 
 package() {
-  cd ${srcdir}/wxPython-src-${pkgver}
-#  cd ${srcdir}/wxGTK-${pkgver}
+  cd wx*-${pkgver}
   make DESTDIR=${pkgdir} install
-  cd contrib/src
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ../../docs/licence.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  make -C contrib/src DESTDIR=${pkgdir} install
+  install -D -m644 docs/licence.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

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

2012-11-16 Thread Eric Bélanger 
Date: Friday, November 16, 2012 @ 22:08:05
  Author: eric
Revision: 171303

upgpkg: wxgtk 2.8.12.1-4

Add sound support (close FS#32299), Add glu and libxt makedepends

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-17 02:52:11 UTC (rev 171302)
+++ PKGBUILD2012-11-17 03:08:05 UTC (rev 171303)
@@ -3,13 +3,13 @@
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=3
+pkgrel=4
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm' 'sdl')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa' 'glu' 'libxt')
 #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
@@ -20,7 +20,7 @@
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
 --enable-graphics_ctx  --disable-optimize --enable-mediactrl 
--with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
---disable-precomp-headers
+--with-sdl --disable-precomp-headers
   make
   make -C locale allmo
   cd contrib/src

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

2012-01-18 Thread Eric Bélanger 
Date: Wednesday, January 18, 2012 @ 18:43:24
  Author: eric
Revision: 146862

upgpkg: wxgtk 2.8.12.1-3

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-18 21:36:12 UTC (rev 146861)
+++ PKGBUILD2012-01-18 23:43:24 UTC (rev 146862)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;

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

2012-01-09 Thread Eric Bélanger 
Date: Monday, January 9, 2012 @ 18:28:23
  Author: eric
Revision: 146386

Use buildin regex (close FS#27878)

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-09 23:16:23 UTC (rev 146385)
+++ PKGBUILD2012-01-09 23:28:23 UTC (rev 146386)
@@ -18,7 +18,7 @@
   cd ${srcdir}/wxPython-src-${pkgver}
 #  cd ${srcdir}/wxGTK-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
---enable-graphics_ctx  --disable-optimize --enable-mediactrl 
--with-regex=sys \
+--enable-graphics_ctx  --disable-optimize --enable-mediactrl 
--with-regex=builtin \
 --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
 --disable-precomp-headers
   make

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

2011-12-13 Thread Eric Bélanger 
Date: Tuesday, December 13, 2011 @ 09:41:12
  Author: eric
Revision: 144987

upgpkg: wxgtk 2.8.12.1-2

Remove libgnomeprintui makedepends (disable gnomeprint), Use system regex, 
Disable precomp-headers to build libwx_gtk2u_mmedia-2.8.so

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-13 07:05:25 UTC (rev 144986)
+++ PKGBUILD2011-12-13 14:41:12 UTC (rev 144987)
@@ -3,24 +3,24 @@
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=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' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
 #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 
source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-md5sums=('8c06c5941477beee213b4f2fa78be620')
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
 
 build() {
   cd ${srcdir}/wxPython-src-${pkgver}
 #  cd ${srcdir}/wxGTK-${pkgver}
   ./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
   make
   make -C locale allmo
   cd contrib/src

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

2011-08-06 Thread Eric Bélanger 
Date: Saturday, August 6, 2011 @ 22:49:25
  Author: eric
Revision: 134643

upgpkg: wxgtk 2.8.12.1-1
Upstream update

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-07 02:40:08 UTC (rev 134642)
+++ PKGBUILD2011-08-07 02:49:25 UTC (rev 134643)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=wxgtk
-pkgver=2.8.12
+pkgver=2.8.12.1
 pkgrel=1
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
@@ -10,14 +10,14 @@
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
 makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
-#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-md5sums=('08f81ab60647308058f6ce99712b14f8')
-sha1sums=('a8d31ef924ae49e97690646b13d5a2a7be7dda10')
+#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
+md5sums=('8c06c5941477beee213b4f2fa78be620')
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
 
 build() {
-#  cd ${srcdir}/wxPython-src-${pkgver}
-  cd ${srcdir}/wxGTK-${pkgver}
+  cd ${srcdir}/wxPython-src-${pkgver}
+#  cd ${srcdir}/wxGTK-${pkgver}
   ./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
@@ -28,7 +28,8 @@
 }
 
 package() {
-  cd ${srcdir}/wxGTK-${pkgver}
+  cd ${srcdir}/wxPython-src-${pkgver}
+#  cd ${srcdir}/wxGTK-${pkgver}
   make DESTDIR=${pkgdir} install
   cd contrib/src
   make DESTDIR=${pkgdir} install

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

2011-04-10 Thread Eric Bélanger 
Date: Sunday, April 10, 2011 @ 18:59:50
  Author: eric
Revision: 119104

upgpkg: wxgtk 2.8.12-1
Upstream update, Added libsm depends

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-10 21:46:02 UTC (rev 119103)
+++ PKGBUILD2011-04-10 22:59:50 UTC (rev 119104)
@@ -1,19 +1,19 @@
 # $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
+# Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=wxgtk
-pkgver=2.8.11
-pkgrel=2
+pkgver=2.8.12
+pkgrel=1
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
 makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
 
#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-md5sums=('6040933d200037f90f6aa1c5169e7ec6')
-sha1sums=('e979d9d2b1ee5bd10e90fd00b02f3306327c661a')
+md5sums=('08f81ab60647308058f6ce99712b14f8')
+sha1sums=('a8d31ef924ae49e97690646b13d5a2a7be7dda10')
 
 build() {
 #  cd ${srcdir}/wxPython-src-${pkgver}

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

2010-01-18 Thread Pierre Schmitz 
Date: Monday, January 18, 2010 @ 09:31:06
  Author: pierre
Revision: 63766

upgpkg: wxgtk 2.8.10.1-6
jpng rebuild

Modified:
  wxgtk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-18 14:08:46 UTC (rev 63765)
+++ PKGBUILD2010-01-18 14:31:06 UTC (rev 63766)
@@ -6,7 +6,7 @@
 
 pkgname=wxgtk
 pkgver=2.8.10.1
-pkgrel=5
+pkgrel=6
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;