[gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
commit: 523c006893914c34bb63638d8e146fd5dc18016c Author: Ulrich Müller gentoo org> AuthorDate: Sat Feb 18 07:11:26 2017 + Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 18 07:11:26 2017 + URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=523c0068 Remove 24.4 patchset. emacs/24.4/01_all_pax-xattr.patch | 16 -- emacs/24.4/02_all_nil-in-load-path.patch | 14 -- emacs/24.4/03_all_gnus-image.patch | 25 --- emacs/24.4/04_all_games-sgid.patch | 259 - emacs/24.4/05_all_browse-url-firefox.patch | 110 5 files changed, 424 deletions(-) diff --git a/emacs/24.4/01_all_pax-xattr.patch b/emacs/24.4/01_all_pax-xattr.patch deleted file mode 100644 index 7cfce4b..000 --- a/emacs/24.4/01_all_pax-xattr.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix temacs startup failure with hardened Linux kernel when both -CONFIG_PAX_PT_PAX_FLAGS and CONFIG_PAX_XATTR_PAX_FLAGS are enabled. -https://bugs.gentoo.org/497498 -https://bugs.gentoo.org/526948 - emacs-24.4-orig/src/Makefile.in -+++ emacs-24.4/src/Makefile.in -@@ -497,7 +497,7 @@ - test "$(CANNOT_DUMP)" = "yes" || \ - test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT) - test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \ --$(SETFATTR) -n user.pax.flags -v r $@ -+$(SETFATTR) -n user.pax.flags -v er $@ - - ## The following oldxmenu-related rules are only (possibly) used if - ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them. diff --git a/emacs/24.4/02_all_nil-in-load-path.patch b/emacs/24.4/02_all_nil-in-load-path.patch deleted file mode 100644 index ffced77..000 --- a/emacs/24.4/02_all_nil-in-load-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix runtime failure when load-path contains a nil element. -https://bugs.gentoo.org/528664 -http://thread.gmane.org/gmane.emacs.devel/176646 - emacs-24.4-orig/lisp/startup.el -+++ emacs-24.4/lisp/startup.el -@@ -1319,6 +1319,7 @@ - (let (warned) - (dolist (dir load-path) - (and (not warned) -+ (stringp dir) - (string-match-p "/[._]emacs\\.d/?\\'" dir) - (string-equal (file-name-as-directory (expand-file-name dir)) -(expand-file-name user-emacs-directory)) diff --git a/emacs/24.4/03_all_gnus-image.patch b/emacs/24.4/03_all_gnus-image.patch deleted file mode 100644 index cb46e3b..000 --- a/emacs/24.4/03_all_gnus-image.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/537156 -http://debbugs.gnu.org/18813 - -commit 7515423bc1935efeb43a85097e00f8758a7cc394 -Author: Katsumi Yamaoka-Date: Mon Oct 27 22:51:18 2014 + - -[Backport] gnus.el (gnus-mode-line-buffer-identification): -Don't add image data for a non-graphic display; -Don't shadow load-path, it blocks autoloading of find-image (bug#18813) - emacs-24.4-orig/lisp/gnus/gnus.el -+++ emacs-24.4/lisp/gnus/gnus.el -@@ -328,8 +328,9 @@ - (if (fboundp 'find-image) - (defun gnus-mode-line-buffer-identification (line) - (let ((str (car-safe line)) --(load-path (mm-image-load-path))) --(if (and (stringp str) -+(load-path (append (mm-image-load-path) load-path))) -+(if (and (display-graphic-p) -+ (stringp str) - (string-match "^Gnus:" str)) - (progn (add-text-properties - 0 5 diff --git a/emacs/24.4/04_all_games-sgid.patch b/emacs/24.4/04_all_games-sgid.patch deleted file mode 100644 index 882e3ca..000 --- a/emacs/24.4/04_all_games-sgid.patch +++ /dev/null @@ -1,259 +0,0 @@ -Backport support for update-game-score to run sgid instead of suid. -This comprises parts of the following commits from upstream git: - -commit dbde138155118344b33dfd2db95f688a24a42fec -Author: Ulrich Müller -Date: Sun Feb 8 21:00:49 2015 +0100 - -configure --with-gameuser now defaults to games group. - -commit 74ab488ff2e57f31eb5290266f0f3b1995ebf83e -Author: Paul Eggert -Date: Thu Jan 22 00:39:30 2015 -0800 - -Check exit statuses in lib-src/Makefile - -commit 7f4e7dd378c456b498c270b47b46aaae365a72ab -Author: Ulrich Müller -Date: Thu Jan 22 08:24:42 2015 +0100 - -Don't fail if chown or chgrp for 'update-game-score' is unsuccessful. - -commit 20f66485526b69eb26f2e70bd835a5e1333559d5 -Author: Ulrich Müller -Date: Fri Jan 16 09:25:25 2015 +0100 - -Allow update-game-score to run sgid instead of suid. - emacs-24.4-orig/configure.ac -+++ emacs-24.4/configure.ac -@@ -313,10 +313,20 @@ - fi - - AC_ARG_WITH(gameuser,dnl --[AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])]) --test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \ -- && gameuser="${with_gameuser}" --test "X$gameuser" = X && gameuser=games -+[AS_HELP_STRING([--with-gameuser=USER_OR_GROUP], -+
[gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/, emacs/23.4/
commit: a46bb508acc1e3fd08a299243d95fffd5faf6c35 Author: Ulrich Müller ulm AT gentoo DOT org AuthorDate: Sat Mar 7 14:14:10 2015 + Commit: Ulrich Müller ulm AT gentoo DOT org CommitDate: Sat Mar 7 14:14:10 2015 + URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=a46bb508 Fix browse-url-firefox for firefox 36. emacs/23.4/24_all_browse-url-firefox.patch | 105 +++ emacs/24.4/05_all_browse-url-firefox.patch | 110 + 2 files changed, 215 insertions(+) diff --git a/emacs/23.4/24_all_browse-url-firefox.patch b/emacs/23.4/24_all_browse-url-firefox.patch new file mode 100644 index 000..d87c953 --- /dev/null +++ b/emacs/23.4/24_all_browse-url-firefox.patch @@ -0,0 +1,105 @@ +https://bugs.gentoo.org/542046 +http://debbugs.gnu.org/19921 + +This comprises parts of the following commit from upstream git: + +commit 1b0ebbdb566a8dfa5f45ce121b2c835e9760091f +Author: Glenn Morris r...@gnu.org +Date: Tue Feb 24 18:02:11 2015 -0500 + +browse-url-firefox: update for firefox 36's removal of -remote + +--- emacs-23.4-orig/lisp/net/browse-url.el emacs-23.4/lisp/net/browse-url.el +@@ -330,6 +330,9 @@ + :type '(repeat (string :tag Argument)) + :group 'browse-url) + ++(make-obsolete-variable 'browse-url-firefox-startup-arguments ++ it no longer has any effect. 23.4-r13) ++ + ;;;###autoload + (defcustom browse-url-galeon-program (purecopy galeon) + The name by which to invoke Galeon. +@@ -1024,63 +1027,32 @@ + ;;;###autoload + (defun browse-url-firefox (url optional new-window) + Ask the Firefox WWW browser to load URL. +-Default to the URL around or before point. The strings in +-variable `browse-url-firefox-arguments' are also passed to +-Firefox. ++Defaults to the URL around or before point. Passes the strings ++in the variable `browse-url-firefox-arguments' to Firefox. + +-When called interactively, if variable +-`browse-url-new-window-flag' is non-nil, load the document in a +-new Firefox window, otherwise use a random existing one. A +-non-nil interactive prefix argument reverses the effect of +-`browse-url-new-window-flag'. ++Interactively, if the variable `browse-url-new-window-flag' is non-nil, ++loads the document in a new Firefox window. A non-nil prefix argument ++reverses the effect of `browse-url-new-window-flag'. + + If `browse-url-firefox-new-window-is-tab' is non-nil, then + whenever a document would otherwise be loaded in a new window, it + is loaded in a new tab in an existing window instead. + +-When called non-interactively, optional second argument +-NEW-WINDOW is used instead of `browse-url-new-window-flag'. +- +-On MS-Windows systems the optional `new-window' parameter is +-ignored. Firefox for Windows does not support the \-remote\ +-command line parameter. Therefore, the +-`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab' +-are ignored as well. Firefox on Windows will always open the requested +-URL in a new window. ++Non-interactively, this uses the optional second argument NEW-WINDOW ++instead of `browse-url-new-window-flag'. + (interactive (browse-url-interactive-arg URL: )) + (setq url (browse-url-encode-url url)) +- (let* ((process-environment (browse-url-process-environment)) +- (process +-(apply 'start-process +- (concat firefox url) nil +- browse-url-firefox-program +- (append +-browse-url-firefox-arguments +-(if (or (featurep 'dos-w32) +-(string-match win32 system-configuration)) +-(list url) +- (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)) +- +-(set-process-sentinel process +-`(lambda (process change) +- (browse-url-firefox-sentinel process ,url) +- +-(defun browse-url-firefox-sentinel (process url) +- Handle a change to the process communicating with Firefox. +- (or (eq (process-exit-status process) 0) +- (let* ((process-environment (browse-url-process-environment))) +- ;; Firefox is not running - start it +- (message Starting Firefox...) +- (apply 'start-process (concat firefox url) nil +- browse-url-firefox-program +- (append browse-url-firefox-startup-arguments (list url)) ++ (let* ((process-environment (browse-url-process-environment))) ++(apply 'start-process ++ (concat firefox url) nil ++ browse-url-firefox-program ++ (append ++
[gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
commit: 7f10f7bade537956fda28461a0cf36aa63282ce4 Author: Ulrich Müller ulm AT gentoo DOT org AuthorDate: Fri Jan 23 07:26:55 2015 + Commit: Ulrich Müller ulm AT gentoo DOT org CommitDate: Fri Jan 23 07:26:55 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7f10f7ba Don't shadow load-path in gnus, bug 537156. --- emacs/24.4/03_all_gnus-image.patch | 25 + 1 file changed, 25 insertions(+) diff --git a/emacs/24.4/03_all_gnus-image.patch b/emacs/24.4/03_all_gnus-image.patch new file mode 100644 index 000..cb46e3b --- /dev/null +++ b/emacs/24.4/03_all_gnus-image.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/537156 +http://debbugs.gnu.org/18813 + +commit 7515423bc1935efeb43a85097e00f8758a7cc394 +Author: Katsumi Yamaoka yama...@jpl.org +Date: Mon Oct 27 22:51:18 2014 + + +[Backport] gnus.el (gnus-mode-line-buffer-identification): +Don't add image data for a non-graphic display; +Don't shadow load-path, it blocks autoloading of find-image (bug#18813) + +--- emacs-24.4-orig/lisp/gnus/gnus.el emacs-24.4/lisp/gnus/gnus.el +@@ -328,8 +328,9 @@ + (if (fboundp 'find-image) + (defun gnus-mode-line-buffer-identification (line) + (let ((str (car-safe line)) +-(load-path (mm-image-load-path))) +-(if (and (stringp str) ++(load-path (append (mm-image-load-path) load-path))) ++(if (and (display-graphic-p) ++ (stringp str) + (string-match ^Gnus: str)) + (progn (add-text-properties + 0 5
[gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
commit: 4b91be334a8f82cb5dc3df6d884c44eebfc605aa Author: Ulrich Müller ulm AT gentoo DOT org AuthorDate: Mon Nov 10 07:37:04 2014 + Commit: Ulrich Müller ulm AT gentoo DOT org CommitDate: Mon Nov 10 07:37:04 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4b91be33 Fix runtime failure when load-path contains a nil element, bug 528664. --- emacs/24.4/02_all_nil-in-load-path.patch | 14 ++ 1 file changed, 14 insertions(+) diff --git a/emacs/24.4/02_all_nil-in-load-path.patch b/emacs/24.4/02_all_nil-in-load-path.patch new file mode 100644 index 000..ffced77 --- /dev/null +++ b/emacs/24.4/02_all_nil-in-load-path.patch @@ -0,0 +1,14 @@ +Fix runtime failure when load-path contains a nil element. +https://bugs.gentoo.org/528664 +http://thread.gmane.org/gmane.emacs.devel/176646 + +--- emacs-24.4-orig/lisp/startup.el emacs-24.4/lisp/startup.el +@@ -1319,6 +1319,7 @@ + (let (warned) + (dolist (dir load-path) + (and (not warned) ++ (stringp dir) + (string-match-p /[._]emacs\\.d/?\\' dir) + (string-equal (file-name-as-directory (expand-file-name dir)) +(expand-file-name user-emacs-directory))
[gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
commit: 841b949f03976e0f9db1a7c55665e6ccfa466354 Author: Ulrich Müller ulm AT gentoo DOT org AuthorDate: Tue Oct 28 02:51:32 2014 + Commit: Ulrich Müller ulm AT gentoo DOT org CommitDate: Tue Oct 28 02:51:32 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=841b949f Add PaX/xattr patch to Emacs 24.4, bug 526948. --- emacs/24.4/01_all_pax-xattr.patch | 16 1 file changed, 16 insertions(+) diff --git a/emacs/24.4/01_all_pax-xattr.patch b/emacs/24.4/01_all_pax-xattr.patch new file mode 100644 index 000..7cfce4b --- /dev/null +++ b/emacs/24.4/01_all_pax-xattr.patch @@ -0,0 +1,16 @@ +Fix temacs startup failure with hardened Linux kernel when both +CONFIG_PAX_PT_PAX_FLAGS and CONFIG_PAX_XATTR_PAX_FLAGS are enabled. +https://bugs.gentoo.org/497498 +https://bugs.gentoo.org/526948 + +--- emacs-24.4-orig/src/Makefile.in emacs-24.4/src/Makefile.in +@@ -497,7 +497,7 @@ + test $(CANNOT_DUMP) = yes || \ + test X$(PAXCTL) = X || $(PAXCTL) -r temacs$(EXEEXT) + test $(CANNOT_DUMP) = yes || test -z $(SETFATTR) || \ +-$(SETFATTR) -n user.pax.flags -v r $@ ++$(SETFATTR) -n user.pax.flags -v er $@ + + ## The following oldxmenu-related rules are only (possibly) used if + ## HAVE_X11 !USE_GTK, but there is no harm in always defining them.