[debrepatch] 01/01: toolchain-patches: r-base: fix 2 FTBFS, the other is not our problem

[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 e92ec70c0add293a3444fed6332898a384cfd2c1
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue May 2 19:31:34 2017 +0200

    toolchain-patches: r-base: fix 2 FTBFS, the other is not our problem
---
 toolchain-patches/r-base_WIP-XXXXXX.patch | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/toolchain-patches/r-base_WIP-XXXXXX.patch b/toolchain-patches/r-base_WIP-XXXXXX.patch
index 4b9cdc1..c59c37e 100644
--- a/toolchain-patches/r-base_WIP-XXXXXX.patch
+++ b/toolchain-patches/r-base_WIP-XXXXXX.patch
@@ -1,20 +1,20 @@
-diff -u r-base-3.3.3/debian/changelog r-base-3.3.3/debian/changelog
---- r-base-3.3.3/debian/changelog
-+++ r-base-3.3.3/debian/changelog
+diff -u r-base-3.4.0/debian/changelog r-base-3.4.0/debian/changelog
+--- r-base-3.4.0/debian/changelog
++++ r-base-3.4.0/debian/changelog
 @@ -1,3 +1,10 @@
-+r-base (3.3.3-1.0~reproducible1) UNRELEASED; urgency=medium
++r-base (3.4.0-1.0~reproducible2) UNRELEASED; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Generate output reproducibly, independently of the build path.
 +
-+ -- Ximin Luo <infinity0 at debian.org>  Thu, 20 Apr 2017 22:13:43 +0200
++ -- Ximin Luo <infinity0 at debian.org>  Tue, 02 May 2017 18:40:55 +0200
 +
- r-base (3.3.3-1) unstable; urgency=medium
+ r-base (3.4.0-1) unstable; urgency=medium
  
    * 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
-@@ -190,7 +190,8 @@
+--- r-base-3.4.0.orig/src/library/base/R/namespace.R
++++ r-base-3.4.0/src/library/base/R/namespace.R
+@@ -192,7 +192,8 @@
  
  loadNamespace <- function (package, lib.loc = NULL,
                             keep.source = getOption("keep.source.pkgs"),
@@ -24,22 +24,22 @@ diff -u r-base-3.3.3/debian/changelog r-base-3.3.3/debian/changelog
  {
      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",
--                             normalizePath(file.path(lib, name), "/", TRUE))
-+            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__. <-
---- r-base-3.3.3.orig/src/library/tools/R/admin.R
-+++ r-base-3.3.3/src/library/tools/R/admin.R
-@@ -785,7 +785,6 @@
+@@ -506,6 +505,12 @@
+         # else warning(gettextf("package %s contains no R code",
+         #                        sQuote(package)), call. = FALSE, domain = NA)
+ 
++        # if relpath is asked for, set this here. we do this *after* the
++        # sys.source() step just above, because some packages' top-level code
++        # like to call things like packageDescription() which requires an
++        # actually-existing path info for them to work.
++        if (relpath) setNamespaceInfo(ns, "path", file.path(".", package))
++
+         ## partial loading stops at this point
+         ## -- used in preparing for lazy-loading
+         if (partial) return(ns)
+--- r-base-3.4.0.orig/src/library/tools/R/admin.R
++++ r-base-3.4.0/src/library/tools/R/admin.R
+@@ -788,7 +788,6 @@
  .install_package_Rd_objects <-
  function(dir, outDir, encoding = "unknown")
  {
@@ -47,9 +47,9 @@ 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.orig/src/library/tools/R/makeLazyLoad.R
-+++ r-base-3.3.3/src/library/tools/R/makeLazyLoad.R
-@@ -29,7 +29,7 @@
+--- r-base-3.4.0.orig/src/library/tools/R/makeLazyLoad.R
++++ r-base-3.4.0/src/library/tools/R/makeLazyLoad.R
+@@ -28,7 +28,7 @@
      if (packageHasNamespace(package, dirname(pkgpath))) {
          if (! is.null(.getNamespace(as.name(package))))
              stop("namespace must not be already loaded")
@@ -58,9 +58,9 @@ diff -u r-base-3.3.3/debian/changelog r-base-3.3.3/debian/changelog
          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 @@
+--- r-base-3.4.0.orig/src/library/tools/R/parseRd.R
++++ r-base-3.4.0/src/library/tools/R/parseRd.R
+@@ -63,6 +63,7 @@
      basename <- basename(srcfile$filename)
      srcfile$encoding <- encoding
      srcfile$Enc <- "UTF-8"

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