[debrepatch] 01/01: patches: r-base: fix most tests, still some failures remaining

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository debrepatch.

commit f648c80fe6f22fc978e77268ff5229d6d3da9043
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Apr 25 18:02:10 2017 +0200

    patches: r-base: fix most tests, still some failures remaining
---
 patches/r-base_WIP-XXXXXX.patch | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/patches/r-base_WIP-XXXXXX.patch b/patches/r-base_WIP-XXXXXX.patch
index 793974f..8667c44 100644
--- a/patches/r-base_WIP-XXXXXX.patch
+++ b/patches/r-base_WIP-XXXXXX.patch
@@ -14,12 +14,26 @@ diff -u r-base-3.3.3/debian/changelog r-base-3.3.3/debian/changelog
    * New upstream version released this morning
 --- r-base-3.3.3.orig/src/library/base/R/namespace.R
 +++ r-base-3.3.3/src/library/base/R/namespace.R
-@@ -248,7 +248,7 @@
+@@ -190,7 +190,8 @@
+ 
+ loadNamespace <- function (package, lib.loc = NULL,
+                            keep.source = getOption("keep.source.pkgs"),
+-                           partial = FALSE, versionCheck = NULL)
++                           partial = FALSE, versionCheck = NULL,
++                           relpath = FALSE)
+ {
+     libpath <- attr(package, "LibPath")
+     package <- as.character(package)[[1L]]
+@@ -246,9 +247,9 @@
+             attr(dimpenv, "name") <- paste("lazydata", name, sep = ":")
+             setNamespaceInfo(env, "lazydata", dimpenv)
              setNamespaceInfo(env, "imports", list("base" = TRUE))
-             ## this should be an absolute path
-             setNamespaceInfo(env, "path",
+-            ## this should be an absolute path
+-            setNamespaceInfo(env, "path",
 -                             normalizePath(file.path(lib, name), "/", TRUE))
-+                             file.path("R_LIBS", name))
++            path <- if (relpath) file.path(".", name)
++            else normalizePath(file.path(lib, name), "/", TRUE)
++            setNamespaceInfo(env, "path", path)
              setNamespaceInfo(env, "dynlibs", NULL)
              setNamespaceInfo(env, "S3methods", matrix(NA_character_, 0L, 3L))
              env$.__S3MethodsTable__. <-
@@ -33,8 +47,19 @@ diff -u r-base-3.3.3/debian/changelog r-base-3.3.3/debian/changelog
      mandir <- file.path(dir, "man")
      manfiles <- if(!dir.exists(mandir)) character()
      else list_files_with_type(mandir, "docs")
---- r-base-3.3.3/src/library/tools/R/parseRd.R
-+++ r-base-3.3.3.orig/src/library/tools/R/parseRd.R
+--- r-base-3.3.3.orig/src/library/tools/R/makeLazyLoad.R
++++ r-base-3.3.3/src/library/tools/R/makeLazyLoad.R
+@@ -29,7 +29,7 @@
+     if (packageHasNamespace(package, dirname(pkgpath))) {
+         if (! is.null(.getNamespace(as.name(package))))
+             stop("namespace must not be already loaded")
+-        ns <- suppressPackageStartupMessages(loadNamespace(package, lib.loc, keep.source, partial = TRUE))
++        ns <- suppressPackageStartupMessages(loadNamespace(package, lib.loc, keep.source, partial = TRUE, relpath = TRUE))
+         makeLazyLoadDB(ns, dbbase, compress = compress)
+     }
+     else
+--- r-base-3.3.3.orig/src/library/tools/R/parseRd.R
++++ r-base-3.3.3/src/library/tools/R/parseRd.R
 @@ -62,6 +62,7 @@
      basename <- basename(srcfile$filename)
      srcfile$encoding <- encoding

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git