| 1 |
commit: 4289b59f30a8842b8bba3c3a29275f424a2f503f |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 7 12:09:44 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 7 12:10:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4289b59f |
| 7 |
|
| 8 |
app-emacs/mediawiki: Compatibility fix in url-compat-retrieve. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../mediawiki/files/50mediawiki-gentoo-2.2.9.el | 2 +- |
| 14 |
.../files/mediawiki-2.2.9-user-agent.patch | 25 ++++++++++++++++++++++ |
| 15 |
...wiki-2.2.9.ebuild => mediawiki-2.2.9-r1.ebuild} | 1 + |
| 16 |
3 files changed, 27 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el |
| 19 |
index b1adfd79c7b..cc9c5b714fb 100644 |
| 20 |
--- a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el |
| 21 |
+++ b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el |
| 22 |
@@ -6,6 +6,6 @@ |
| 23 |
(eval-after-load "mediawiki" |
| 24 |
'(add-to-list |
| 25 |
'mediawiki-site-alist |
| 26 |
- '("Gentoo" "https://wiki.gentoo.org/wiki/" "" "" nil "Main Page") |
| 27 |
+ '("Gentoo" "https://wiki.gentoo.org/" "" "" nil "Main Page") |
| 28 |
nil |
| 29 |
(lambda (a b) (equal (car a) (car b))))) |
| 30 |
|
| 31 |
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 |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..2d64e410b9e |
| 34 |
--- /dev/null |
| 35 |
+++ b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch |
| 36 |
@@ -0,0 +1,25 @@ |
| 37 |
+Fix "(wrong-type-argument stringp default)" in url-compat-retrieve. |
| 38 |
+https://github.com/hexmode/mediawiki-el/issues/27 |
| 39 |
+ |
| 40 |
+--- mediawiki-el-2.2.9-orig/mediawiki.el |
| 41 |
++++ mediawiki-el-2.2.9/mediawiki.el |
| 42 |
+@@ -414,10 +414,15 @@ |
| 43 |
+ POST-PROCESS is the function to call for post-processing. |
| 44 |
+ BUFFER is the buffer to store the result in. CALLBACK will be |
| 45 |
+ called in BUFFER with CBARGS, if given." |
| 46 |
+- (let ((url-user-agent (concat (string-trim (if (functionp url-user-agent) |
| 47 |
+- (funcall url-user-agent) |
| 48 |
+- url-user-agent)) |
| 49 |
+- " mediawiki.el " mediawiki-version "\r\n"))) |
| 50 |
++ (let ((url-user-agent |
| 51 |
++ (if (eq url-user-agent 'default) |
| 52 |
++ 'default |
| 53 |
++ (concat (string-trim (if (functionp url-user-agent) |
| 54 |
++ (funcall url-user-agent) |
| 55 |
++ url-user-agent)) |
| 56 |
++ " mediawiki.el " mediawiki-version "\r\n"))) |
| 57 |
++ (url-package-name "mediawiki.el") |
| 58 |
++ (url-package-version mediawiki-version)) |
| 59 |
+ (cond ((boundp 'url-be-asynchronous) ; Sniff w3 lib capability |
| 60 |
+ (if callback |
| 61 |
+ (setq url-be-asynchronous t) |
| 62 |
|
| 63 |
diff --git a/app-emacs/mediawiki/mediawiki-2.2.9.ebuild b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild |
| 64 |
similarity index 92% |
| 65 |
rename from app-emacs/mediawiki/mediawiki-2.2.9.ebuild |
| 66 |
rename to app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild |
| 67 |
index c896a51adca..62d90305641 100644 |
| 68 |
--- a/app-emacs/mediawiki/mediawiki-2.2.9.ebuild |
| 69 |
+++ b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild |
| 70 |
@@ -15,5 +15,6 @@ SLOT="0" |
| 71 |
KEYWORDS="~amd64 ~x86" |
| 72 |
|
| 73 |
S="${WORKDIR}/${MY_PN}-${PV}" |
| 74 |
+ELISP_PATCHES="${P}-user-agent.patch" |
| 75 |
SITEFILE="50${PN}-gentoo-${PV}.el" |
| 76 |
DOCS="README.mediawiki" |
Archives