components/r/patches/01-fix-RSiteSearch.patch
changeset 5365 447b67338e7f
parent 5364 17f26e606ed1
child 5366 6eaed9347ba1
--- a/components/r/patches/01-fix-RSiteSearch.patch	Thu Jan 28 16:55:44 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-Fix Bug 16329 - RSiteSearch fails for all search strings
-https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=16329
-
-Change already intergrated upstream.
-
-diff --git a/src/library/utils/R/RSiteSearch.R b/src/library/utils/R/RSiteSearch.R
-index 4578cb9..9323ddb 100644
---- a/src/library/utils/R/RSiteSearch.R
-+++ b/src/library/utils/R/RSiteSearch.R
-@@ -1,7 +1,7 @@
- #  File src/library/utils/R/RSiteSearch.R
- #  Part of the R package, http://www.R-project.org
- #
--#  Copyright (C) 1995-2012 The R Core Team
-+#  Copyright (C) 1995-2015 The R Core Team
- #
- #  This program is free software; you can redistribute it and/or modify
- #  it under the terms of the GNU General Public License as published by
-@@ -25,7 +25,7 @@ RSiteSearch <- function(string,
- 			matchesPerPage = 20)
- {
-     string <- paste0("http://search.r-project.org/cgi-bin/namazu.cgi?query=",
--		     gsub(" ", "+", string))
-+		     URLencode(gsub(" ", "+", string), reserved = TRUE))
-     mpp <- paste0("max=", matchesPerPage)
-     format <- paste0("result=", match.arg(format))
- 
-@@ -47,8 +47,7 @@ RSiteSearch <- function(string,
-     ## we know this is a http:// URL, so encoding should be safe.
-     ## it seems that firefox on Mac OS needs it for {...}
-     ## OTOH, Namazu does not decode in, say, sort=date:late.
--    qstring <- paste(URLencode(string, reserved = TRUE),
--                     mpp, format, sortby, restr, sep = "&")
-+    qstring <- paste(string, mpp, format, sortby, restr, sep = "&")
-     browseURL(qstring)
-     cat(gettextf("A search query has been submitted to %s",
-                  "http://search.r-project.org"), "\n", sep = "")