[arch-commits] Commit in wxgtk/repos (4 files)

[Eric Bélanger]

    Date: Tuesday, October 20, 2009 @ 19:26:20
  Author: eric
Revision: 56274

Merged revisions 56273 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/wxgtk/trunk

........
  r56273 | eric | 2009-10-20 19:26:00 -0400 (Tue, 20 Oct 2009) | 2 lines
  
  upgpkg: wxgtk 2.8.10.1-5
      Added mediactrl support (close FS#15377), Added glib2 build patch, Improved description
........

Added:
  wxgtk/repos/extra-x86_64/gsocket.patch
    (from rev 56273, wxgtk/trunk/gsocket.patch)
Modified:
  wxgtk/repos/extra-x86_64/	(properties)
  wxgtk/repos/extra-x86_64/ChangeLog
  wxgtk/repos/extra-x86_64/PKGBUILD

---------------+
 ChangeLog     |    7 +++++++
 PKGBUILD      |   21 +++++++++++++--------
 gsocket.patch |   18 ++++++++++++++++++
 3 files changed, 38 insertions(+), 8 deletions(-)


Property changes on: wxgtk/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /wxgtk/trunk:1-45457
   + /wxgtk/trunk:1-56273

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-20 23:26:00 UTC (rev 56273)
+++ extra-x86_64/ChangeLog	2009-10-20 23:26:20 UTC (rev 56274)
@@ -1,3 +1,10 @@
+2009-10-20  Eric Belanger  <eric at 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  <eric at archlinux.org>
 
 	* wxgtk 2.8.10.1-4

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-20 23:26:00 UTC (rev 56273)
+++ extra-x86_64/PKGBUILD	2009-10-20 23:26:20 UTC (rev 56274)
@@ -6,24 +6,29 @@
 
 pkgname=wxgtk
 pkgver=2.8.10.1
-pkgrel=4
-pkgdesc="wxGTK - GTK+ implementation of wxWidgets API for GUI"
+pkgrel=5
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
-depends=('gtk2>=2.16.2' 'mesa')
-makedepends=('libgnomeprintui')
+depends=('gtk2' 'mesa' 'gstreamer0.10-base')
+makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'ccache')
+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)
-md5sums=('65d5ef166f23fe8b4c67f58df164f93e' '325dba65152bc0cfbc1400a2bf54508e')
-sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' '7c4d1d507aad0b7c25a0de55234be42ea3e3f55f')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 \
+        overflow.patch gsocket.patch)
+md5sums=('65d5ef166f23fe8b4c67f58df164f93e' '325dba65152bc0cfbc1400a2bf54508e'\
+         'b56113a94125e4f9a3cc2680052bdfde')
+sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' '7c4d1d507aad0b7c25a0de55234be42ea3e3f55f'\
+         '5b0e985afd77153e8e4b9e14987d4b1a9de53acc')
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
 #  cd "${srcdir}/wxGTK-${pkgver}"
   patch -p4 < ../overflow.patch || return 1
+  patch -p1 < ../gsocket.patch || return 1
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-	  --enable-graphics_ctx --with-gnomeprint --disable-optimize || return 1
+    --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl || return 1
   make || return 1
   make -C locale allmo || return 1
   make DESTDIR="${pkgdir}" install || return 1

Copied: wxgtk/repos/extra-x86_64/gsocket.patch (from rev 56273, wxgtk/trunk/gsocket.patch)
===================================================================
--- extra-x86_64/gsocket.patch	                        (rev 0)
+++ extra-x86_64/gsocket.patch	2009-10-20 23:26:20 UTC (rev 56274)
@@ -0,0 +1,18 @@
+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"