Date: Tue, 11 Mar 2014 08:40:08 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347868 - in head/math/rkward-kde4: . files Message-ID: <201403110840.s2B8e8cl078787@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Tue Mar 11 08:40:08 2014 New Revision: 347868 URL: http://svnweb.freebsd.org/changeset/ports/347868 QAT: https://qat.redports.org/buildarchive/r347868/ Log: - Import a patch from upstream to unbreak Suggested by: rakuco - Support staging Patch provided by gerald. Added: head/math/rkward-kde4/files/patch-rkward_rbackend_rkstructuregetter.cpp (contents, props changed) Modified: head/math/rkward-kde4/Makefile head/math/rkward-kde4/pkg-plist Modified: head/math/rkward-kde4/Makefile ============================================================================== --- head/math/rkward-kde4/Makefile Tue Mar 11 08:23:24 2014 (r347867) +++ head/math/rkward-kde4/Makefile Tue Mar 11 08:40:08 2014 (r347868) @@ -30,13 +30,11 @@ INSTALLS_ICONS= yes CFLAGS+= -I${LOCALBASE}/include DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward -MAN1= rkward.1 OPTIONS_DEFINE= RECDEP RECDEP_DESC= Recommended runtime dependencies OPTIONS_DEFAULT=RECDEP -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -75,6 +73,9 @@ pre-configure: ${ECHO_MSG} "==> ${PKGNAME} requires math/R to be built WITH_LIBR" ; \ exit 1; fi) +post-install: + ${RM} ${STAGEDIR}${PREFIX}/share/apps/katepart/syntax/r.xml # Conflicts with kate + .if defined(MAINTAINER_MODE) regression-test: install @${ECHO_MSG} "To pass the tests, some CRAN packages like R2HTML" Added: head/math/rkward-kde4/files/patch-rkward_rbackend_rkstructuregetter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/rkward-kde4/files/patch-rkward_rbackend_rkstructuregetter.cpp Tue Mar 11 08:40:08 2014 (r347868) @@ -0,0 +1,38 @@ +--- rkward/rbackend/rkstructuregetter.cpp.orig 2013-03-26 17:21:34.000000000 +0100 ++++ rkward/rbackend/rkstructuregetter.cpp 2014-03-10 21:03:17.000000000 +0100 +@@ -193,22 +193,27 @@ + + // get classes + SEXP classes_s; ++ QStringList classes; + + if ((TYPEOF (value) == LANGSXP) || (TYPEOF (value) == SYMSXP)) { // if it's a call, we should NEVER send it through eval +- extern SEXP R_data_class (SEXP, Rboolean); +- classes_s = R_data_class (value, (Rboolean) 0); ++ // stripped down and adjusted from R_data_class ++ classes = RKRSupport::SEXPToStringList(Rf_getAttrib (value, R_ClassSymbol)); ++ if (classes.isEmpty ()) { ++ if (TYPEOF (value) == LANGSXP) { ++ QString cl = RKRSupport::SEXPToString (PRINTNAME (value)); ++ if ((cl != "if") && (cl != "while") && (cl != "for") && (cl != "=") && (cl != "<-") && (cl != "(") && (cl != "{")) cl = "call"; ++ classes = QStringList (cl); ++ } else { ++ classes = QStringList ("name"); ++ } ++ } + + REPROTECT (value = Rf_coerceVector (value, EXPRSXP), value_index); // make sure the object is safe for everything to come +- +- PROTECT (classes_s); + } else { + classes_s = RKRSupport::callSimpleFun (class_fun, value, baseenv); +- PROTECT (classes_s); ++ classes = RKRSupport::SEXPToStringList (classes_s); + } + +- QStringList classes = RKRSupport::SEXPToStringList (classes_s); +- UNPROTECT (1); /* classes_s */ +- + // store classes + RData *classdata = new RData; + classdata->setData (classes); Modified: head/math/rkward-kde4/pkg-plist ============================================================================== --- head/math/rkward-kde4/pkg-plist Tue Mar 11 08:23:24 2014 (r347867) +++ head/math/rkward-kde4/pkg-plist Tue Mar 11 08:40:08 2014 (r347868) @@ -1,6 +1,7 @@ bin/rkward lib/kde4/libexec/rkward.frontend lib/kde4/libexec/rkward.rbackend +man/man1/rkward.1.gz share/applications/kde4/rkward.desktop share/apps/katepart/syntax/rkward.xml share/apps/rkward/00saveload/import/import_csv.js
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403110840.s2B8e8cl078787>