From 47c1047a0dbd89b2a61fb0dc98c18a87e5e876a3 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 30 Dec 2007 23:46:29 +0000 Subject: Use an explicit (void *)0 instead of NULL to indicate a varargs sentinel. This fixes the runtime on 64-bit platforms since since C++ treats NULL as simply 0. PR: 119127 --- editors/abiword/Makefile | 2 +- editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 981c1e639bdc..b0f5e4622378 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -8,7 +8,7 @@ PORTNAME= abiword PORTVERSION= 2.4.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ MASTER_SITE_SUBDIR= abiword diff --git a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp new file mode 100644 index 000000000000..c0ff7430562f --- /dev/null +++ b/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp @@ -0,0 +1,11 @@ +--- src/wp/ap/unix/ap_UnixApp.cpp.orig 2007-12-30 18:44:50.000000000 -0500 ++++ src/wp/ap/unix/ap_UnixApp.cpp 2007-12-30 18:41:23.000000000 -0500 +@@ -1405,7 +1405,7 @@ int AP_UnixApp::main(const char * szAppN + GNOME_PARAM_APP_DATADIR, ABIWORD_DATADIR, + GNOME_PARAM_APP_LIBDIR, ABIWORD_APP_LIBDIR, + GNOME_PARAM_POPT_TABLE, AP_Args::options, +- GNOME_PARAM_NONE); ++ (void *)0); + #ifdef LOGFILE + fprintf(logfile,"gnome_program_init completed \n"); + #endif -- cgit v1.2.3