summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2015-02-23 14:03:25 +0000
committerryoon <ryoon@pkgsrc.org>2015-02-23 14:03:25 +0000
commit5346880ce1d34a72a6ca9551467b0183d47c1536 (patch)
treeb80f556537d2c8165f038a09f950df9e8e200bb5 /editors
parentf0fd072531482d740a844734a900c6e120536620 (diff)
downloadpkgsrc-5346880ce1d34a72a6ca9551467b0183d47c1536.tar.gz
Bump PKGREVISION.
* Try to support firefox 36 or later too.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs24/Makefile4
-rw-r--r--editors/emacs24/distinfo3
-rw-r--r--editors/emacs24/patches/patch-lisp_net_browse-url.el29
3 files changed, 33 insertions, 3 deletions
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index 8bbd01f93b9..61c110bcd1c 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2015/01/10 16:15:29 gdt Exp $
+# $NetBSD: Makefile,v 1.32 2015/02/23 14:03:25 ryoon Exp $
-PKGREVISION= 1
+PKGREVISION= 2
CONFLICTS+= emacs24-nox11-[0-9]*
diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo
index 498c2dc2c44..d64c703c1ff 100644
--- a/editors/emacs24/distinfo
+++ b/editors/emacs24/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2015/01/31 23:40:09 jperkin Exp $
+$NetBSD: distinfo,v 1.17 2015/02/23 14:03:25 ryoon Exp $
SHA1 (emacs-24.4.tar.gz) = df540d889a685a3ccaae94682b3ff131968e2706
RMD160 (emacs-24.4.tar.gz) = 52bec18c5f8e4ee7ea3b765620c0f19d2ee524c9
Size (emacs-24.4.tar.gz) = 59020082 bytes
SHA1 (patch-gnu_readlinkat.c) = 9252c92290ccf1d4094bbd3972d8309ebf9e57d6
+SHA1 (patch-lisp_net_browse-url.el) = ff9e3a12852b6b54ce80ba35f2ed6cf8dc2e6cf8
SHA1 (patch-src_inotify.c) = 9dfddb9db39e84f376cad1d5a5a32861e7838cac
diff --git a/editors/emacs24/patches/patch-lisp_net_browse-url.el b/editors/emacs24/patches/patch-lisp_net_browse-url.el
new file mode 100644
index 00000000000..e08686ec29a
--- /dev/null
+++ b/editors/emacs24/patches/patch-lisp_net_browse-url.el
@@ -0,0 +1,29 @@
+$NetBSD: patch-lisp_net_browse-url.el,v 1.1 2015/02/23 14:03:25 ryoon Exp $
+
+* Support firefox 36.0 or later.
+ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19921
+
+--- lisp/net/browse-url.el.orig 2015-02-22 06:52:03.000000000 +0000
++++ lisp/net/browse-url.el
+@@ -1137,15 +1137,12 @@ URL in a new window."
+ (append
+ browse-url-firefox-arguments
+ (if use-remote
+- (list "-remote"
+- (concat
+- "openURL("
+- url
+- (if (browse-url-maybe-new-window new-window)
+- (if browse-url-firefox-new-window-is-tab
+- ",new-tab"
+- ",new-window"))
+- ")"))
++ (list
++ (if (browse-url-maybe-new-window new-window)
++ (if browse-url-firefox-new-window-is-tab
++ "--new-tab"
++ "--new-window"))
++ url)
+ (list url))))))
+ ;; If we use -remote, the process exits with status code 2 if
+ ;; Firefox is not already running. The sentinel runs firefox