[debrepatch] 01/01: toolchain-patches: update r-base patch
Ximin Luo
infinity0 at debian.org
Wed Jun 28 08:41:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository debrepatch.
commit 32b97ebef9a7b2c5a59710ac2357281d7f28179a
Author: Ximin Luo <infinity0 at debian.org>
Date: Wed Jun 28 10:41:00 2017 +0200
toolchain-patches: update r-base patch
---
toolchain-patches/r-base_WIP-XXXXXX.patch | 134 ++++++++++++++++--------------
1 file changed, 72 insertions(+), 62 deletions(-)
diff --git a/toolchain-patches/r-base_WIP-XXXXXX.patch b/toolchain-patches/r-base_WIP-XXXXXX.patch
index c59c37e..f104733 100644
--- a/toolchain-patches/r-base_WIP-XXXXXX.patch
+++ b/toolchain-patches/r-base_WIP-XXXXXX.patch
@@ -1,70 +1,80 @@
-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
+diff -Nru r-base-3.4.0.20170622/debian/changelog r-base-3.4.0.20170622/debian/changelog
+--- r-base-3.4.0.20170622/debian/changelog 2017-06-21 23:04:14.000000000 +0200
++++ r-base-3.4.0.20170622/debian/changelog 2017-05-02 18:40:55.000000000 +0200
@@ -1,3 +1,10 @@
-+r-base (3.4.0-1.0~reproducible2) UNRELEASED; urgency=medium
++r-base (3.4.0.20170622-1.0~reproducible2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Generate output reproducibly, independently of the build path.
+
+ -- Ximin Luo <infinity0 at debian.org> Tue, 02 May 2017 18:40:55 +0200
+
- r-base (3.4.0-1) unstable; urgency=medium
+ r-base (3.4.0.20170622-1) unstable; urgency=medium
- * New upstream version released this morning
---- 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"),
-- partial = FALSE, versionCheck = NULL)
-+ partial = FALSE, versionCheck = NULL,
-+ relpath = FALSE)
- {
- libpath <- attr(package, "LibPath")
- package <- as.character(package)[[1L]]
-@@ -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")
- {
-- dir <- file_path_as_absolute(dir)
- mandir <- file.path(dir, "man")
- manfiles <- if(!dir.exists(mandir)) character()
- else list_files_with_type(mandir, "docs")
---- 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")
-- 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.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"
-+ srcfile$wd <- "."
-
- if (encoding == "ASCII") {
- if (any(is.na(iconv(lines, "", "ASCII"))))
+ * Initial beta build (r72852) of R 3.4.1 expected for June 30
+diff -Nru r-base-3.4.0.20170622/debian/patches/reproducible.patch r-base-3.4.0.20170622/debian/patches/reproducible.patch
+--- r-base-3.4.0.20170622/debian/patches/reproducible.patch 1970-01-01 01:00:00.000000000 +0100
++++ r-base-3.4.0.20170622/debian/patches/reproducible.patch 2017-05-02 18:40:55.000000000 +0200
+@@ -0,0 +1,56 @@
++--- a/src/library/base/R/namespace.R
+++++ b/src/library/base/R/namespace.R
++@@ -192,7 +192,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]]
++@@ -506,6 +507,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)
++--- a/src/library/tools/R/admin.R
+++++ b/src/library/tools/R/admin.R
++@@ -788,7 +788,6 @@
++ .install_package_Rd_objects <-
++ function(dir, outDir, encoding = "unknown")
++ {
++- dir <- file_path_as_absolute(dir)
++ mandir <- file.path(dir, "man")
++ manfiles <- if(!dir.exists(mandir)) character()
++ else list_files_with_type(mandir, "docs")
++--- a/src/library/tools/R/makeLazyLoad.R
+++++ b/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")
++- 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
++--- a/src/library/tools/R/parseRd.R
+++++ b/src/library/tools/R/parseRd.R
++@@ -63,6 +63,7 @@
++ basename <- basename(srcfile$filename)
++ srcfile$encoding <- encoding
++ srcfile$Enc <- "UTF-8"
+++ srcfile$wd <- "."
++
++ if (encoding == "ASCII") {
++ if (any(is.na(iconv(lines, "", "ASCII"))))
+diff -Nru r-base-3.4.0.20170622/debian/patches/series r-base-3.4.0.20170622/debian/patches/series
+--- r-base-3.4.0.20170622/debian/patches/series 2017-06-21 23:04:14.000000000 +0200
++++ r-base-3.4.0.20170622/debian/patches/series 2017-05-02 18:40:55.000000000 +0200
+@@ -1 +1,2 @@
+ unset_R_LIBS_USER
++reproducible.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git
More information about the Reproducible-commits
mailing list