* [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
@ 2018-08-09 18:22 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2018-08-09 18:22 UTC (permalink / raw
To: gentoo-commits
commit: d7d89ad147edc8b7b348777dc5c00c58abd59a37
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 9 17:56:14 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 9 18:19:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d89ad1
app-emacs/gnuserv: Fix runtime failure with Emacs 27.
Package-Manager: Portage-2.3.44, Repoman-2.3.10
.../gnuserv/files/gnuserv-3.12.8-backquotes.patch | 16 +++++
.../files/gnuserv-3.12.8-process-query.patch | 14 +++++
app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild | 71 ++++++++++++++++++++++
3 files changed, 101 insertions(+)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
new file mode 100644
index 00000000000..a16124821dd
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
@@ -0,0 +1,16 @@
+Use new-style backquotes, to make it compile with Emacs 27.
+
+--- gnuserv-3.12.8-orig/gnuserv-compat.el
++++ gnuserv-3.12.8/gnuserv-compat.el
+@@ -193,9 +193,9 @@
+ (defmacro defgroup (&rest args)
+ nil)
+ (defmacro defcustom (var value doc &rest args)
+- (` (defvar (, var) (, value) (, doc))))
++ `(defvar (, var) (, value) (, doc)))
+ (defmacro defface (var value doc &rest args)
+- (` (make-face (, var))))
++ `(make-face (, var)))
+ (defmacro define-widget (&rest args)
+ nil)))
+
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch
new file mode 100644
index 00000000000..4fcbccc2b59
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch
@@ -0,0 +1,14 @@
+Function process-kill-without-query is obsolete since 22.1 and no
+longer exists in 27.
+
+--- gnuserv-3.12.8-orig/gnuserv.el
++++ gnuserv-3.12.8/gnuserv.el
+@@ -738,7 +738,7 @@
+ (start-process "gnuserv" nil gnuserv-program)))
+ (set-process-sentinel gnuserv-process 'gnuserv-sentinel)
+ (set-process-filter gnuserv-process 'gnuserv-process-filter)
+- (process-kill-without-query gnuserv-process)
++ (set-process-query-on-exit-flag gnuserv-process nil)
+ (setq allow-deletion-of-last-visible-frame t)
+ (run-hooks 'gnuserv-init-hook)))
+
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
new file mode 100644
index 00000000000..935e23bd8c8
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp multilib desktop xdg-utils
+
+DESCRIPTION="Attach to an already running Emacs"
+HOMEPAGE="http://meltin.net/hacks/emacs/"
+SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND=">=app-eselect/eselect-emacs-1.15
+ X? ( x11-libs/libXau )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-backquotes.patch
+ eapply "${FILESDIR}"/${P}-process-query.patch
+ sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
+ eapply_user
+}
+
+src_configure() {
+ econf $(use_enable X xauth) \
+ --x-includes="${EPREFIX}"/usr/include \
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ exeinto /usr/libexec/emacs
+ doexe gnuserv
+ newbin gnuclient gnuclient-emacs
+ newbin gnudoit gnudoit-emacs
+ # Don't install gnuattach, it is not functional with FSF GNU Emacs
+
+ newman gnuserv.1 gnuserv-emacs.1
+ echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
+ echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
+
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ChangeLog README README.orig
+
+ if use X; then
+ domenu "${FILESDIR}"/gnuclient.desktop || die
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ use X && xdg_desktop_database_update
+ eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ use X && xdg_desktop_database_update
+ eselect gnuclient update ifunset
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
@ 2022-04-06 8:08 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2022-04-06 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 158a78e01498a6d92a353da0e9a3b58a6a3ca93d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 08:05:49 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 08:08:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158a78e0
app-emacs/gnuserv: Fix byte-compilation with Emacs 28
Update HOMEPAGE and SRC_URI.
Closes: https://bugs.gentoo.org/836892
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../gnuserv/files/gnuserv-3.12.8-emacs-28.patch | 36 ++++++++++++++++++++++
.../gnuserv/files/gnuserv-3.12.8-gnudoit.patch | 15 +++++++++
app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild | 18 +++++------
3 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch
new file mode 100644
index 000000000000..dde9fdc38043
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-28.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/836892
+
+--- gnuserv-3.12.8/gnuserv.el
++++ gnuserv-3.12.8/gnuserv.el
+@@ -98,31 +98,6 @@
+ :group 'gnuserv)
+
+
+-;; Provide the old variables as aliases, to avoid breaking .emacs
+-;; files. However, they are obsolete and should be converted to the
+-;; new forms. This ugly crock must be before the variable
+-;; declaration, or the scheme fails.
+-
+-(define-obsolete-variable-alias 'server-frame 'gnuserv-frame)
+-(define-obsolete-variable-alias 'server-done-function
+- 'gnuserv-done-function)
+-(define-obsolete-variable-alias 'server-done-temp-file-function
+- 'gnuserv-done-temp-file-function)
+-(define-obsolete-variable-alias 'server-find-file-function
+- 'gnuserv-find-file-function)
+-(define-obsolete-variable-alias 'server-program
+- 'gnuserv-program)
+-(define-obsolete-variable-alias 'server-visit-hook
+- 'gnuserv-visit-hook)
+-(define-obsolete-variable-alias 'server-done-hook
+- 'gnuserv-done-hook)
+-(define-obsolete-variable-alias 'server-kill-quietly
+- 'gnuserv-kill-quietly)
+-(define-obsolete-variable-alias 'server-temp-file-regexp
+- 'gnuserv-temp-file-regexp)
+-(define-obsolete-variable-alias 'server-make-temp-file-backup
+- 'gnuserv-make-temp-file-backup)
+-
+ ;;;###autoload
+ (defcustom gnuserv-frame nil
+ "*The frame to be used to display all edited files.
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch
new file mode 100644
index 000000000000..bcb0fdeeaecc
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-gnudoit.patch
@@ -0,0 +1,15 @@
+--- gnuserv-3.12.8/gnudoit
++++ gnuserv-3.12.8/gnudoit
+@@ -27,10 +27,10 @@
+
+ if [ $# -eq 0 ]
+ then
+- exec gnuclient $quick -batch
++ exec gnuclient-emacs $quick -batch
+ else
+ # I use "$*" instead of "$@" intentionally -- I don't want to have the
+ # arguments split.
+- exec gnuclient $quick -batch -eval "$*"
++ exec gnuclient-emacs $quick -batch -eval "$*"
+ fi
+
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
index fdd9b4a6d7ca..8c147acf559b 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
@@ -6,8 +6,9 @@ EAPI=7
inherit elisp desktop xdg-utils
DESCRIPTION="Attach to an already running Emacs"
-HOMEPAGE="http://meltin.net/hacks/emacs/"
-SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20160508134736/http://martin.meltin.net/hacks/emacs/
+ https://www.emacswiki.org/emacs/GnuClient"
+SRC_URI="https://web.archive.org/web/20150908031821/http://martin.meltin.net/sites/martin.meltin.net/files/hacks/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
@@ -19,15 +20,14 @@ RDEPEND=">=app-eselect/eselect-emacs-1.15
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
+PATCHES=(
+ "${FILESDIR}"/${P}-backquotes.patch
+ "${FILESDIR}"/${P}-process-query.patch
+ "${FILESDIR}"/${P}-gnudoit.patch
+ "${FILESDIR}"/${P}-emacs-28.patch
+)
SITEFILE="50${PN}-gentoo.el"
-src_prepare() {
- eapply "${FILESDIR}"/${P}-backquotes.patch
- eapply "${FILESDIR}"/${P}-process-query.patch
- sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
- eapply_user
-}
-
src_configure() {
econf $(use_enable X xauth) \
--x-includes="${EPREFIX}"/usr/include \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
@ 2023-10-13 11:37 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-10-13 11:37 UTC (permalink / raw
To: gentoo-commits
commit: c4d2bced9dc458803030f6b9938688485e192b21
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 11:32:18 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 11:36:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d2bced
app-emacs/gnuserv: Fix some more byte-compiler warnings
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../gnuserv/files/gnuserv-3.12.8-advice.patch | 7 +-
app-emacs/gnuserv/files/gnuserv-3.12.8-cl.patch | 62 -----------------
.../gnuserv/files/gnuserv-3.12.8-devices.patch | 47 +++++++++++++
...macs-29.patch => gnuserv-3.12.8-warnings.patch} | 77 ++--------------------
...v-3.12.8-r6.ebuild => gnuserv-3.12.8-r7.ebuild} | 6 +-
5 files changed, 62 insertions(+), 137 deletions(-)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
index e5f1cb9248f9..f4ac28efa662 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
@@ -2,7 +2,7 @@ defadvice is obsolete in Emacs 30.
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -112,38 +112,34 @@
+@@ -112,38 +112,35 @@
;; can do! If the device doesn't represent a live frame, we create
;; the frame as requested.
@@ -45,13 +45,14 @@ defadvice is obsolete in Emacs 30.
- first
- (predicate &optional device)
- activate)
-- ad-do-it)
+- ad-do-it))
+ (defun gnuserv-compat-filtered-frame-list (orig-fun predicate
+ &optional _device)
+ (funcall orig-fun predicate))
+
+ (advice-add 'filtered-frame-list
+ :around #'gnuserv-compat-filtered-frame-list)
- ;; )
++ )
\f
+ ;; Emulate XEmacs devices. A device is just a frame. For the most
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-cl.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-cl.patch
index df5d1098ce5e..cf5c062fdab1 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-cl.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-cl.patch
@@ -1,67 +1,5 @@
Most Common Lisp macros want a cl- prefix in Emacs 27 and later
---- gnuserv-3.12.8/devices.el
-+++ gnuserv-3.12.8/devices.el
-@@ -31,7 +31,7 @@
- ;; XEmacs 19.14. A 'device' for Emacs 19 is just a frame, from which we can
- ;; determine the connection to an X display, etc.
-
--(require 'cl)
-+(require 'cl-macs)
- (eval-when-compile
- (if (string-match "XEmacs" (emacs-version))
- (set 'byte-optimize nil)))
-@@ -220,43 +220,43 @@
- (setq frames (cdr frames)))))
-
- (defun device-color-cells (&optional device)
-- (case window-system
-+ (cl-case window-system
- ((x win32 w32 pm) (x-display-color-cells device))
- (ns (ns-display-color-cells device))
- (otherwise 1)))
-
- (defun device-pixel-width (&optional device)
-- (case window-system
-+ (cl-case window-system
- ((x win32 w32 pm) (x-display-pixel-width device))
- (ns (ns-display-pixel-width device))
- (otherwise (frame-width device))))
-
- (defun device-pixel-height (&optional device)
-- (case window-system
-+ (cl-case window-system
- ((x win32 w32 pm) (x-display-pixel-height device))
- (ns (ns-display-pixel-height device))
- (otherwise (frame-height device))))
-
- (defun device-mm-width (&optional device)
-- (case window-system
-+ (cl-case window-system
- ((x win32 w32 pm) (x-display-mm-width device))
- (ns (ns-display-mm-width device))
- (otherwise nil)))
-
- (defun device-mm-height (&optional device)
-- (case window-system
-+ (cl-case window-system
- ((x win32 w32 pm) (x-display-mm-height device))
- (ns (ns-display-mm-height device))
- (otherwise nil)))
-
- (defun device-bitplanes (&optional device)
-- (case window-system
-+ (cl-case window-system
- ((x win32 w32 pm) (x-display-planes device))
- (ns (ns-display-planes device))
- (otherwise 2)))
-
- (defun device-class (&optional device)
-- (case window-system
-+ (cl-case window-system
- (x ; X11
- (cond
- ((fboundp 'x-display-visual-class)
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
@@ -49,7 +49,7 @@
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
new file mode 100644
index 000000000000..0c509a7cd842
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
@@ -0,0 +1,47 @@
+Function device-class from devices.el is not used, but collides with
+a function of the same name in frame.el of Emacs 29. So, inline what
+we need, and drop devices.el altogether.
+
+--- gnuserv-3.12.8/gnuserv-compat.el
++++ gnuserv-3.12.8/gnuserv-compat.el
+@@ -153,9 +153,39 @@
+ (if (string-match "XEmacs" (emacs-version))
+ nil
+
+- (require 'devices)
+ (defalias 'device-list 'frame-list)
+ (defalias 'selected-device 'selected-frame)
++ (defalias 'device-live-p 'frame-live-p)
++ (defalias 'frame-device 'identity)
++ (defalias 'make-tty-device 'ignore)
++
++ (defun make-x-device (&optional display)
++ (if display
++ (make-frame-on-display display)
++ (make-frame)))
++
++ (defun device-on-window-system-p (&optional device)
++ "Return non-nil if DEVICE is on a window system.
++ This generally means that there is support for the mouse, the menubar,
++ the toolbar, glyphs, etc."
++ (and (cdr-safe (assq 'display (frame-parameters device))) t))
++
++ (defvar delete-device-hook nil
++ "Function or functions to call when a device is deleted.
++ One argument, the to-be-deleted device.")
++
++ (defun delete-device (device &optional force)
++ "Delete DEVICE, permanently eliminating it from use.
++ Normally, you cannot delete the last non-minibuffer-only frame (you must
++ use `save-buffers-kill-emacs' or `kill-emacs'). However, if optional
++ second argument FORCE is non-nil, you can delete the last frame. (This
++ will automatically call `save-buffers-kill-emacs'.)"
++ (let ((frames (device-frame-list device)))
++ (run-hook-with-args 'delete-device-hook device)
++ (while frames
++ (delete-frame (car frames) force)
++ (setq frames (cdr frames)))))
++
+ (defun device-frame-list (&optional device)
+ (list
+ (if device
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-29.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
similarity index 57%
rename from app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-29.patch
rename to app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
index 7b9c8d05cb07..113d7f0f5f37 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-emacs-29.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
@@ -1,88 +1,25 @@
-Fix collision of function device-class in Emacs 29.
-Fix some byte-compiler warnings.
+Fix some byte-compiler warnings
---- gnuserv-3.12.8/devices.el
-+++ gnuserv-3.12.8/devices.el
-@@ -32,13 +32,7 @@
- ;; determine the connection to an X display, etc.
-
- (require 'cl-macs)
--(eval-when-compile
-- (if (string-match "XEmacs" (emacs-version))
-- (set 'byte-optimize nil)))
-
--(if (string-match "XEmacs" (emacs-version))
-- nil
--'()
- (defalias 'selected-device 'ignore)
- (defalias 'device-or-frame-p 'framep)
- (defalias 'device-console 'ignore)
-@@ -219,6 +213,10 @@
- (delete-frame (car frames) force)
- (setq frames (cdr frames)))))
-
-+;; Apparently none of the functions below are used, and device-class
-+;; collides with a function of the same name in frame.el of Emacs 29.
-+'(
-+
- (defun device-color-cells (&optional device)
- (cl-case window-system
- ((x win32 w32 pm) (x-display-color-cells device))
-@@ -333,10 +331,6 @@
- "Given a TYPE, return t if it is valid."
- (memq type (device-type-list)))
-
--) ; This closes the conditional on whether we are in XEmacs or not
-+)
-
- (provide 'devices)
--
--(eval-when-compile
-- (if (string-match "XEmacs" (emacs-version))
-- (set 'byte-optimize t)))
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -100,8 +100,8 @@
+@@ -100,7 +100,7 @@
;; `delete-frame' and `filtered-frame-list' to handle some device
;; stuff.
-(if (string-match "XEmacs" (emacs-version))
-- nil
-+;;(if (string-match "XEmacs" (emacs-version))
-+;; nil
++(if (featurep 'xemacs)
+ nil
;; XEmacs `make-frame' takes an optional device to create the frame
- ;; on. Since `make-device' just calls 'make-frame', we don't want
-@@ -143,15 +143,16 @@
- first
- (predicate &optional device)
- activate)
-- ad-do-it))
-+ ad-do-it)
-+;; )
-
- \f
- ;; Emulate XEmacs devices. A device is just a frame. For the most
+@@ -150,7 +150,7 @@
;; part we use devices.el from the Emacs-W3 distribution. In some
;; places the implementation seems wrong, so we "fix" it!
-(if (string-match "XEmacs" (emacs-version))
-- nil
-+;;(if (string-match "XEmacs" (emacs-version))
-+;; nil
++(if (featurep 'xemacs)
+ nil
- (require 'devices)
(defalias 'device-list 'frame-list)
-@@ -160,7 +161,8 @@
- (list
- (if device
- device
-- (selected-frame)))))
-+ (selected-frame))))
-+;; )
-
-
- \f
--- gnuserv-3.12.8/gnuserv.el
+++ gnuserv-3.12.8/gnuserv.el
@@ -455,13 +455,14 @@
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r6.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
similarity index 92%
rename from app-emacs/gnuserv/gnuserv-3.12.8-r6.ebuild
rename to app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
index 644039c6feeb..dd5eabd64a13 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r6.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
@@ -25,10 +25,12 @@ PATCHES=(
"${FILESDIR}"/${P}-process-query.patch
"${FILESDIR}"/${P}-gnudoit.patch
"${FILESDIR}"/${P}-emacs-28.patch
+ "${FILESDIR}"/${P}-devices.patch
"${FILESDIR}"/${P}-cl.patch
- "${FILESDIR}"/${P}-emacs-29.patch
+ "${FILESDIR}"/${P}-warnings.patch
"${FILESDIR}"/${P}-advice.patch
)
+ELISP_REMOVE="devices.el"
SITEFILE="50${PN}-gentoo.el"
src_configure() {
@@ -39,7 +41,7 @@ src_configure() {
src_compile() {
emake gnuserv gnuclient
- elisp-compile *.el
+ BYTECOMPFLAGS+=" -l gnuserv-compat" elisp-compile *.el
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
@ 2023-10-13 19:23 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-10-13 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 02e9ca1ececf99d8a6afd8513be9907acd22c327
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 19:22:08 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 19:23:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e9ca1e
app-emacs/gnuserv: Drop obsolete elisp code
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../gnuserv/files/gnuserv-3.12.8-no-custom.patch | 31 ++++++++++++++++++++++
app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild | 2 +-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch
new file mode 100644
index 000000000000..12cd31c16c0e
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch
@@ -0,0 +1,31 @@
+Old-style backquotes don't work with Emacs 27 or later. Remove the
+code altogether, because it is no longer needed since Emacs 20.1.
+
+--- gnuserv-3.12.8/gnuserv-compat.el
++++ gnuserv-3.12.8/gnuserv-compat.el
+@@ -180,25 +180,6 @@
+ (defun frame-totally-visible-p (frame)
+ (eq t (frame-visible-p frame))))
+
+-;; Make custom stuff work even without customize
+-;; Courtesy of Hrvoje Niksic <hniksic@srce.hr>
+-;; via Ronan Waide <waider@scope.ie>.
+-(eval-and-compile
+- (condition-case ()
+- (require 'custom)
+- (error nil))
+- (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
+- nil ;; We've got what we needed
+- ;; We have the old custom-library, hack around it!
+- (defmacro defgroup (&rest args)
+- nil)
+- (defmacro defcustom (var value doc &rest args)
+- (` (defvar (, var) (, value) (, doc))))
+- (defmacro defface (var value doc &rest args)
+- (` (make-face (, var))))
+- (defmacro define-widget (&rest args)
+- nil)))
+-
+ ;; Now for gnuserv...
+ (require 'gnuserv)
+
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
index dd5eabd64a13..4cb5f7e12303 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
gui? ( x11-base/xorg-proto )"
PATCHES=(
- "${FILESDIR}"/${P}-backquotes.patch
+ "${FILESDIR}"/${P}-no-custom.patch
"${FILESDIR}"/${P}-process-query.patch
"${FILESDIR}"/${P}-gnudoit.patch
"${FILESDIR}"/${P}-emacs-28.patch
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
@ 2023-10-14 9:07 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-10-14 9:07 UTC (permalink / raw
To: gentoo-commits
commit: ee4089c376f57979ac2a9ab900bd9294aa37bf6f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 08:58:41 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 09:06:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4089c3
app-emacs/gnuserv: Don't advise delete-frame
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../gnuserv/files/gnuserv-3.12.8-advice.patch | 15 +-----------
.../gnuserv/files/gnuserv-3.12.8-devices.patch | 27 ++++++++++++++++++----
.../gnuserv/files/gnuserv-3.12.8-warnings.patch | 2 +-
...v-3.12.8-r7.ebuild => gnuserv-3.12.8-r8.ebuild} | 0
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
index f4ac28efa662..90d4938751e2 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
@@ -2,7 +2,7 @@ defadvice is obsolete in Emacs 30.
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -112,38 +112,35 @@
+@@ -112,28 +112,27 @@
;; can do! If the device doesn't represent a live frame, we create
;; the frame as requested.
@@ -24,19 +24,6 @@ defadvice is obsolete in Emacs 30.
+
+ (advice-add 'make-frame :around #'gnuserv-compat-make-frame)
- ;; Advise `delete-frame' to run `delete-device-hook'. This might be a
- ;; little too hacky, but it seems to work! If someone actually tries
- ;; to do something device specific then it will probably blow up!
-- (defadvice delete-frame (before
-- gnuserv-compat-delete-frame
-- first
-- nil
-- activate)
-+ (defun gnuserv-compat-delete-frame (&optional frame _force)
- (run-hook-with-args 'delete-device-hook frame))
-
-+ (advice-add 'delete-frame :before #'gnuserv-compat-delete-frame)
-+
;; Advise `filtered-frame-list' to ignore the optional device
;; argument. Here we don't follow the mapping of devices to frames.
;; We just assume that any frame satisfying the predicate will do.
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
index 0c509a7cd842..faab53e6da1e 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
@@ -2,9 +2,29 @@ Function device-class from devices.el is not used, but collides with
a function of the same name in frame.el of Emacs 29. So, inline what
we need, and drop devices.el altogether.
+Define delete-device-hook as an alias of delete-frame-functions, so we
+need no advice for delete-frame.
+
--- gnuserv-3.12.8/gnuserv-compat.el
+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -153,9 +153,39 @@
+@@ -125,16 +125,6 @@
+ (setq ad-return-value device))
+ ad-do-it))
+
+- ;; Advise `delete-frame' to run `delete-device-hook'. This might be a
+- ;; little too hacky, but it seems to work! If someone actually tries
+- ;; to do something device specific then it will probably blow up!
+- (defadvice delete-frame (before
+- gnuserv-compat-delete-frame
+- first
+- nil
+- activate)
+- (run-hook-with-args 'delete-device-hook frame))
+-
+ ;; Advise `filtered-frame-list' to ignore the optional device
+ ;; argument. Here we don't follow the mapping of devices to frames.
+ ;; We just assume that any frame satisfying the predicate will do.
+@@ -153,9 +143,36 @@
(if (string-match "XEmacs" (emacs-version))
nil
@@ -14,6 +34,7 @@ we need, and drop devices.el altogether.
+ (defalias 'device-live-p 'frame-live-p)
+ (defalias 'frame-device 'identity)
+ (defalias 'make-tty-device 'ignore)
++ (defvaralias 'delete-device-hook 'delete-frame-functions)
+
+ (defun make-x-device (&optional display)
+ (if display
@@ -26,10 +47,6 @@ we need, and drop devices.el altogether.
+ the toolbar, glyphs, etc."
+ (and (cdr-safe (assq 'display (frame-parameters device))) t))
+
-+ (defvar delete-device-hook nil
-+ "Function or functions to call when a device is deleted.
-+ One argument, the to-be-deleted device.")
-+
+ (defun delete-device (device &optional force)
+ "Delete DEVICE, permanently eliminating it from use.
+ Normally, you cannot delete the last non-minibuffer-only frame (you must
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
index 113d7f0f5f37..5310f357621f 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
@@ -11,7 +11,7 @@ Fix some byte-compiler warnings
nil
;; XEmacs `make-frame' takes an optional device to create the frame
-@@ -150,7 +150,7 @@
+@@ -140,7 +140,7 @@
;; part we use devices.el from the Emacs-W3 distribution. In some
;; places the implementation seems wrong, so we "fix" it!
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
similarity index 100%
rename from app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
rename to app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/
@ 2023-11-10 21:34 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-11-10 21:34 UTC (permalink / raw
To: gentoo-commits
commit: b402d774fc4a3b34a95ad2e05a28e68b677c1ec5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 21:33:16 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 21:34:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b402d774
app-emacs/gnuserv: drop 3.12.8-r5
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../gnuserv/files/gnuserv-3.12.8-backquotes.patch | 16 -----
app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild | 69 ----------------------
2 files changed, 85 deletions(-)
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
deleted file mode 100644
index fa31ac2e4017..000000000000
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use new-style backquotes, to make it compile with Emacs 27.
-
---- gnuserv-3.12.8-orig/gnuserv-compat.el
-+++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -193,9 +193,9 @@
- (defmacro defgroup (&rest args)
- nil)
- (defmacro defcustom (var value doc &rest args)
-- (` (defvar (, var) (, value) (, doc))))
-+ `(defvar ,var ,value ,doc))
- (defmacro defface (var value doc &rest args)
-- (` (make-face (, var))))
-+ `(make-face ,var))
- (defmacro define-widget (&rest args)
- nil)))
-
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
deleted file mode 100644
index 8c147acf559b..000000000000
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp desktop xdg-utils
-
-DESCRIPTION="Attach to an already running Emacs"
-HOMEPAGE="https://web.archive.org/web/20160508134736/http://martin.meltin.net/hacks/emacs/
- https://www.emacswiki.org/emacs/GnuClient"
-SRC_URI="https://web.archive.org/web/20150908031821/http://martin.meltin.net/sites/martin.meltin.net/files/hacks/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
-IUSE="X"
-
-RDEPEND=">=app-eselect/eselect-emacs-1.15
- X? ( x11-libs/libXau )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-backquotes.patch
- "${FILESDIR}"/${P}-process-query.patch
- "${FILESDIR}"/${P}-gnudoit.patch
- "${FILESDIR}"/${P}-emacs-28.patch
-)
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
- econf $(use_enable X xauth) \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- exeinto /usr/libexec/emacs
- doexe gnuserv
- newbin gnuclient gnuclient-emacs
- newbin gnudoit gnudoit-emacs
- # Don't install gnuattach, it is not functional with FSF GNU Emacs
-
- newman gnuserv.1 gnuserv-emacs.1
- echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
- echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
-
- elisp-install ${PN} *.el *.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- dodoc ChangeLog README README.orig
-
- use X && domenu "${FILESDIR}"/gnuclient.desktop
-}
-
-pkg_postinst() {
- elisp-site-regen
- use X && xdg_desktop_database_update
- eselect gnuclient update ifunset
-}
-
-pkg_postrm() {
- elisp-site-regen
- use X && xdg_desktop_database_update
- eselect gnuclient update ifunset
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-11-10 21:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-06 8:08 [gentoo-commits] repo/gentoo:master commit in: app-emacs/gnuserv/files/, app-emacs/gnuserv/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2023-11-10 21:34 Ulrich Müller
2023-10-14 9:07 Ulrich Müller
2023-10-13 19:23 Ulrich Müller
2023-10-13 11:37 Ulrich Müller
2018-08-09 18:22 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox