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

2010-11-15 Thread Eric Bélanger
Date: Monday, November 15, 2010 @ 16:53:38
  Author: eric
Revision: 99629

upgpkg: wxgtk 2.8.11-2
Added missing libxxf86vm depends (close FS#21699), Removed ChangeLog

Modified:
  wxgtk/trunk/PKGBUILD
Deleted:
  wxgtk/trunk/ChangeLog

---+
 ChangeLog |   56 
 PKGBUILD  |5 ++---
 2 files changed, 2 insertions(+), 59 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2010-11-15 21:36:57 UTC (rev 99628)
+++ ChangeLog   2010-11-15 21:53:38 UTC (rev 99629)
@@ -1,56 +0,0 @@
-2010-09-22  Eric Belanger  e...@archlinux.org
-
-   * Removed ccache makedepends
-   * PKGBUILD cleanup
-
-2010-05-08  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.11-1
-   * Upstream update
-   * Removed old patches
-
-2010-05-01  Ionut Biru ib...@archlinux.org
-
-   * wxgtk 2.8.10.1-7
-   * use system libpng,libjpeg,libtiff (close FS#19216)
-
-2009-10-20  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.10.1-5
-   * Added mediactrl support (close FS#15377)
-   * Added glib2 build patch
-   * Improved description
-
-2009-07-11  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.10.1-4
-   * Added security fix (close FS#15469)
-
-2009-05-21  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.10.1-1
-   * Upstream update
-
-2009-05-05  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.10-1
-   * Upstream update
-
-2009-03-06  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.9.2-1
-   * Upstream update
-   * Switched to wxpython source tarball
-
-2008-09-26  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.9-1
-   * Upstream update
-   * Added mediactrl support (close FS#11220)
-
-2008-07-05  Eric Belanger  e...@archlinux.org
-
-   * wxgtk 2.8.8-1
-   * Upstream update
-   * Enabled gnomeprint - needed for wxpython to build
-   * Added ChangeLog

Modified: PKGBUILD
===
--- PKGBUILD2010-11-15 21:36:57 UTC (rev 99628)
+++ PKGBUILD2010-11-15 21:53:38 UTC (rev 99629)
@@ -3,14 +3,13 @@
 
 pkgname=wxgtk
 pkgver=2.8.11
-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')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm')
 makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
-changelog=ChangeLog
 
#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 md5sums=('6040933d200037f90f6aa1c5169e7ec6')



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

2010-09-22 Thread Eric Bélanger
Date: Wednesday, September 22, 2010 @ 17:51:17
  Author: eric
Revision: 91127

Removed ccache makedepends, PKGBUILD cleanup

Modified:
  wxgtk/trunk/ChangeLog
  wxgtk/trunk/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |   21 +
 2 files changed, 14 insertions(+), 12 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-09-22 21:38:28 UTC (rev 91126)
+++ ChangeLog   2010-09-22 21:51:17 UTC (rev 91127)
@@ -1,3 +1,8 @@
+2010-09-22  Eric Belanger  e...@archlinux.org
+
+   * Removed ccache makedepends
+   * PKGBUILD cleanup
+
 2010-05-08  Eric Belanger  e...@archlinux.org
 
* wxgtk 2.8.11-1

Modified: PKGBUILD
===
--- PKGBUILD2010-09-22 21:38:28 UTC (rev 91126)
+++ PKGBUILD2010-09-22 21:51:17 UTC (rev 91127)
@@ -1,8 +1,5 @@
 # $Id$
 # Maintainer: Eric Belanger e...@archlinux.org
-# Original Contributor: Tom Newsom jeeps...@gmx.co.uk
-# New Version - Contributor: Bob Finch w...@arrl.net
-# with help from J. Santiago Hirschfeld jsantia...@yahoo.com.ar aka Angelus
 
 pkgname=wxgtk
 pkgver=2.8.11
@@ -12,8 +9,8 @@
 url=http://wxwidgets.org;
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl')
-makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache' 
'mesa')
-options=('ccache') # required to build libwx_gtk2u_mmedia
+makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
+changelog=ChangeLog
 
#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
 source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 md5sums=('6040933d200037f90f6aa1c5169e7ec6')
@@ -24,17 +21,17 @@
   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 
|| return 1
-  make || return 1
-  make -C locale allmo || return 1
+--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+  make
+  make -C locale allmo
   cd contrib/src
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/wxGTK-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
   cd contrib/src
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ../../docs/licence.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ../../docs/licence.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



[arch-commits] Commit in wxgtk/trunk (ChangeLog PKGBUILD gsocket.patch overflow.patch)

2010-05-08 Thread Eric Bélanger
Date: Saturday, May 8, 2010 @ 20:49:47
  Author: eric
Revision: 79883

upgpkg: wxgtk 2.8.11-1
Upstream update, Removed old patches

Modified:
  wxgtk/trunk/ChangeLog
  wxgtk/trunk/PKGBUILD
Deleted:
  wxgtk/trunk/gsocket.patch
  wxgtk/trunk/overflow.patch

+
 ChangeLog  |6 +
 PKGBUILD   |   35 ++---
 gsocket.patch  |   18 ---
 overflow.patch |   66 ---
 4 files changed, 23 insertions(+), 102 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-05-08 18:43:04 UTC (rev 79882)
+++ ChangeLog   2010-05-09 00:49:47 UTC (rev 79883)
@@ -1,3 +1,9 @@
+2010-05-08  Eric Belanger  e...@archlinux.org
+
+   * wxgtk 2.8.11-1
+   * Upstream update
+   * Removed old patches
+
 2010-05-01  Ionut Biru ib...@archlinux.org
 
* wxgtk 2.8.10.1-7

Modified: PKGBUILD
===
--- PKGBUILD2010-05-08 18:43:04 UTC (rev 79882)
+++ PKGBUILD2010-05-09 00:49:47 UTC (rev 79883)
@@ -5,37 +5,36 @@
 # with help from J. Santiago Hirschfeld jsantia...@yahoo.com.ar aka Angelus
 
 pkgname=wxgtk
-pkgver=2.8.10.1
-pkgrel=7
+pkgver=2.8.11
+pkgrel=1
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
 license=('custom:wxWindows')
-depends=('gtk2' 'mesa' 'gstreamer0.10-base')
-makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl')
+makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache' 
'mesa')
 options=('ccache') # required to build libwx_gtk2u_mmedia
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
 \
-overflow.patch gsocket.patch)
-md5sums=('65d5ef166f23fe8b4c67f58df164f93e' '325dba65152bc0cfbc1400a2bf54508e'\
- 'b56113a94125e4f9a3cc2680052bdfde')
-sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' 
'7c4d1d507aad0b7c25a0de55234be42ea3e3f55f'\
- '5b0e985afd77153e8e4b9e14987d4b1a9de53acc')
+#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')
 
 build() {
-  cd ${srcdir}/wxPython-src-${pkgver}
-#  cd ${srcdir}/wxGTK-${pkgver}
-  patch -p4  ../overflow.patch || return 1
-  patch -p1  ../gsocket.patch || return 1
-  sed -i -e 's:png_check_sig:png_sig_cmp:g' configure
+#  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|| return 1
+--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys 
|| return 1
   make || return 1
   make -C locale allmo || return 1
-  make DESTDIR=${pkgdir} install || return 1
   cd contrib/src
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/wxGTK-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
+  cd contrib/src
+  make DESTDIR=${pkgdir} install || return 1
   install -D -m644 ../../docs/licence.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 }

Deleted: gsocket.patch
===
--- gsocket.patch   2010-05-08 18:43:04 UTC (rev 79882)
+++ gsocket.patch   2010-05-09 00:49:47 UTC (rev 79883)
@@ -1,18 +0,0 @@
-Index: 2.8/src/gtk/gsockgtk.cpp
-===
 2.8/src/gtk/gsockgtk.cpp (revision 60599)
-+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
-@@ -15,8 +15,13 @@
- #include stdlib.h
- #include stdio.h
-
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include gdk/gdk.h
- #include glib.h
-+#undef GSocket
-
- #include wx/gsocket.h
- #include wx/unix/gsockunx.h

Deleted: overflow.patch
===
--- overflow.patch  2010-05-08 18:43:04 UTC (rev 79882)
+++ overflow.patch  2010-05-09 00:49:47 UTC (rev 79883)
@@ -1,66 +0,0 @@
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp
-===
 /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 53479)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 60875)
-@@ -569,5 +569,7 @@
- goto error;
- 
--lines = (unsigned char **)malloc( (size_t)(height 

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

2010-05-01 Thread Ionut Biru
Date: Saturday, May 1, 2010 @ 09:16:54
  Author: ibiru
Revision: 79172

upgpkg: wxgtk 2.8.10.1-7
use system libpng,libjpeg,libtiff. using internal some applications doesn't 
function well. closes FS#19216

Modified:
  wxgtk/trunk/ChangeLog
  wxgtk/trunk/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |6 --
 2 files changed, 9 insertions(+), 2 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-05-01 11:40:23 UTC (rev 79171)
+++ ChangeLog   2010-05-01 13:16:54 UTC (rev 79172)
@@ -1,3 +1,8 @@
+2010-05-01  Ionut Biru ib...@archlinux.org
+
+   * wxgtk 2.8.10.1-7
+   * use system libpng,libjpeg,libtiff (close FS#19216)
+
 2009-10-20  Eric Belanger  e...@archlinux.org
 
* wxgtk 2.8.10.1-5

Modified: PKGBUILD
===
--- PKGBUILD2010-05-01 11:40:23 UTC (rev 79171)
+++ PKGBUILD2010-05-01 13:16:54 UTC (rev 79172)
@@ -6,7 +6,7 @@
 
 pkgname=wxgtk
 pkgver=2.8.10.1
-pkgrel=6
+pkgrel=7
 pkgdesc=GTK+ implementation of wxWidgets API for GUI
 arch=('i686' 'x86_64')
 url=http://wxwidgets.org;
@@ -27,8 +27,10 @@
 #  cd ${srcdir}/wxGTK-${pkgver}
   patch -p4  ../overflow.patch || return 1
   patch -p1  ../gsocket.patch || return 1
+  sed -i -e 's:png_check_sig:png_sig_cmp:g' configure
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl 
--enable-unicode \
---enable-graphics_ctx --with-gnomeprint --disable-optimize 
--enable-mediactrl || return 1
+--enable-graphics_ctx --with-gnomeprint --disable-optimize 
--enable-mediactrl \
+--with-libpng=sys --with-libxpm=sys --with-libjpeg=sys 
--with-libtiff=sys|| return 1
   make || return 1
   make -C locale allmo || return 1
   make DESTDIR=${pkgdir} install || return 1