From 4289b59f30a8842b8bba3c3a29275f424a2f503f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sat, 7 Sep 2019 14:09:44 +0200 Subject: [PATCH] app-emacs/mediawiki: Compatibility fix in url-compat-retrieve. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Ulrich Müller --- .../files/50mediawiki-gentoo-2.2.9.el | 2 +- .../files/mediawiki-2.2.9-user-agent.patch | 25 +++++++++++++++++++ ...2.2.9.ebuild => mediawiki-2.2.9-r1.ebuild} | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch rename app-emacs/mediawiki/{mediawiki-2.2.9.ebuild => mediawiki-2.2.9-r1.ebuild} (92%) diff --git a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el index b1adfd79c7bf..cc9c5b714fb3 100644 --- a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el +++ b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el @@ -6,6 +6,6 @@ (eval-after-load "mediawiki" '(add-to-list 'mediawiki-site-alist - '("Gentoo" "https://wiki.gentoo.org/wiki/" "" "" nil "Main Page") + '("Gentoo" "https://wiki.gentoo.org/" "" "" nil "Main Page") nil (lambda (a b) (equal (car a) (car b))))) diff --git a/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch new file mode 100644 index 000000000000..2d64e410b9e0 --- /dev/null +++ b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch @@ -0,0 +1,25 @@ +Fix "(wrong-type-argument stringp default)" in url-compat-retrieve. +https://github.com/hexmode/mediawiki-el/issues/27 + +--- mediawiki-el-2.2.9-orig/mediawiki.el ++++ mediawiki-el-2.2.9/mediawiki.el +@@ -414,10 +414,15 @@ + POST-PROCESS is the function to call for post-processing. + BUFFER is the buffer to store the result in. CALLBACK will be + called in BUFFER with CBARGS, if given." +- (let ((url-user-agent (concat (string-trim (if (functionp url-user-agent) +- (funcall url-user-agent) +- url-user-agent)) +- " mediawiki.el " mediawiki-version "\r\n"))) ++ (let ((url-user-agent ++ (if (eq url-user-agent 'default) ++ 'default ++ (concat (string-trim (if (functionp url-user-agent) ++ (funcall url-user-agent) ++ url-user-agent)) ++ " mediawiki.el " mediawiki-version "\r\n"))) ++ (url-package-name "mediawiki.el") ++ (url-package-version mediawiki-version)) + (cond ((boundp 'url-be-asynchronous) ; Sniff w3 lib capability + (if callback + (setq url-be-asynchronous t) diff --git a/app-emacs/mediawiki/mediawiki-2.2.9.ebuild b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild similarity index 92% rename from app-emacs/mediawiki/mediawiki-2.2.9.ebuild rename to app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild index c896a51adca6..62d903056419 100644 --- a/app-emacs/mediawiki/mediawiki-2.2.9.ebuild +++ b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild @@ -15,5 +15,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" +ELISP_PATCHES="${P}-user-agent.patch" SITEFILE="50${PN}-gentoo-${PV}.el" DOCS="README.mediawiki" -- 2.26.2