wok-4.x rev 4319
Up opencpn (1.3.2) + glib fix
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Sep 29 18:31:09 2009 +0200 (2009-09-29) |
parents | fa2a91c3bfa6 |
children | 930376a7ae91 |
files | opencpn/receipt opencpn/stuff/glib.u |
line diff
1.1 --- a/opencpn/receipt Tue Sep 29 14:35:37 2009 +0000 1.2 +++ b/opencpn/receipt Tue Sep 29 18:31:09 2009 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="opencpn" 1.7 -VERSION="1.2.8" 1.8 +VERSION="1.3.2" 1.9 CATEGORY="utilities" 1.10 SHORT_DESC="A concise Chart/plotter Navigator" 1.11 MAINTAINER="allan316@gmail.com" 1.12 @@ -15,6 +15,7 @@ 1.13 compile_rules() 1.14 { 1.15 cd $src 1.16 + busybox patch -p0 -i ../stuff/glib.u 1.17 ./configure \ 1.18 --prefix=/usr \ 1.19 --infodir=/usr/share/info \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/opencpn/stuff/glib.u Tue Sep 29 18:31:09 2009 +0200 2.3 @@ -0,0 +1,14 @@ 2.4 +Both glib and wx define GSocket, see http://trac.wxwidgets.org/ticket/10883 2.5 + 2.6 +--- include/dychart.h 2.7 ++++ include/dychart.h 2.8 +@@ -211,7 +211,9 @@ 2.9 + 2.10 + #ifdef __WXGTK__ 2.11 + #ifdef ocpnUSE_GTK_OPTIMIZE 2.12 ++#define GSocket GlibGSocket 2.13 + #include <gtk/gtk.h> 2.14 ++#undef GSocket 2.15 + #endif 2.16 + #endif 2.17 +