Date: Tue, 18 Oct 2011 19:59:53 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161781: [maintainer][patch] math/saga: fix for failure with wxgtk2-2.8.12 Message-ID: <201110181959.p9IJxrR6060493@red.freebsd.org> Resent-Message-ID: <201110182000.p9IK0QhR087877@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161781
>Category: ports
>Synopsis: [maintainer][patch] math/saga: fix for failure with wxgtk2-2.8.12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 18 20:00:25 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Rainer Hurling
>Release: FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
FreeBSD xxx.xxx 9.0-BETA2 FreeBSD 9.0-BETA2 #0: Tue Sep 20 20:32:41 CEST 2011 xxx@xxx.xxx:/usr/obj/usr/src/sys/XXX amd64
>Description:
Since update of wxgtk2 to version 2.8.12 there where segfaults with 'saga_cmd' using two arguments. It turns out as an initialization problem of wxInitialize(), only with version 2.8.12.
This fix patches the SAGA GIS sources when detecting wxgtk2-2.8.12.
>How-To-Repeat:
Install math/saga. Then run 'saga_cmd libpj_proj4 6', this should segfault immediately.
>Fix:
Apply the following patch on math/saga and then try again 'saga_cmd libpj_proj4 6'. Now it should show a complete list of the usage of this SAGA GIS command.
Patch attached with submission follows:
diff -Naur saga.orig/Makefile saga/Makefile
--- saga.orig/Makefile 2011-07-19 08:04:02.000000000 +0200
+++ saga/Makefile 2011-10-18 21:42:53.000000000 +0200
@@ -7,7 +7,7 @@
PORTNAME= saga
PORTVERSION= 2.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff -Naur saga.orig/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp
--- saga.orig/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp 1970-01-01 01:00:00.000000000 +0100
+++ saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp 2011-10-17 08:27:58.000000000 +0200
@@ -0,0 +1,14 @@
+--- src/saga_core/saga_cmd/saga_cmd.cpp_orig 2011-05-17 15:36:45.000000000 +0200
++++ src/saga_core/saga_cmd/saga_cmd.cpp 2011-10-17 08:25:58.000000000 +0200
+@@ -126,7 +126,11 @@
+ #endif
+ //---------------------------------------------------------
+
++#if wxCHECK_VERSION(2, 8, 11)
++ if( !wxInitialize( argc, argv ) )
++#else
+ if( !wxInitialize() )
++#endif
+ {
+ Print_Error(SG_T("initialisation failed"));
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110181959.p9IJxrR6060493>