# HG changeset patch # User Pascal Bellard # Date 1254241869 -7200 # Node ID 92d081d995a286d535ecd220aa90b9429008a2f8 # Parent fa2a91c3bfa662897978f09c30003a7472be4c4c Up opencpn (1.3.2) + glib fix diff -r fa2a91c3bfa6 -r 92d081d995a2 opencpn/receipt --- a/opencpn/receipt Tue Sep 29 14:35:37 2009 +0000 +++ b/opencpn/receipt Tue Sep 29 18:31:09 2009 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="opencpn" -VERSION="1.2.8" +VERSION="1.3.2" CATEGORY="utilities" SHORT_DESC="A concise Chart/plotter Navigator" MAINTAINER="allan316@gmail.com" @@ -15,6 +15,7 @@ compile_rules() { cd $src + busybox patch -p0 -i ../stuff/glib.u ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ diff -r fa2a91c3bfa6 -r 92d081d995a2 opencpn/stuff/glib.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/opencpn/stuff/glib.u Tue Sep 29 18:31:09 2009 +0200 @@ -0,0 +1,14 @@ +Both glib and wx define GSocket, see http://trac.wxwidgets.org/ticket/10883 + +--- include/dychart.h ++++ include/dychart.h +@@ -211,7 +211,9 @@ + + #ifdef __WXGTK__ + #ifdef ocpnUSE_GTK_OPTIMIZE ++#define GSocket GlibGSocket + #include ++#undef GSocket + #endif + #endif +