[gentoo-commits] repo/gentoo:master commit in: app-emacs/emacs-jabber/, app-emacs/emacs-jabber/files/

[Ulrich Müller]

commit:     e518196562b5d021cd31ba47eae406fcfe9d66c5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 10:21:12 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 10:21:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5181965

app-emacs/emacs-jabber: Fix byte-compilation with Emacs 28

Closes: https://bugs.gentoo.org/836817
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild  |  3 ++-
 .../files/emacs-jabber-0.8.92-emacs-28.patch       | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
index 02f3fb71c349..91ccdffb5d2b 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ RDEPEND="app-emacs/hexrgb"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="jabber.texi"
 DOCS="AUTHORS NEWS README"

diff --git a/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch b/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch
new file mode 100644
index 000000000000..28a108bafa32
--- /dev/null
+++ b/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/836817
+
+--- emacs-jabber-0.8.92/jabber-menu.el
++++ emacs-jabber-0.8.92/jabber-menu.el
+@@ -100,7 +100,7 @@
+   (interactive "P")
+   (setq jabber-display-menu (if remove nil t))
+   (force-mode-line-update))
+-(make-obsolete 'jabber-menu "set the variable `jabber-display-menu' instead.")
++(make-obsolete 'jabber-menu 'jabber-display-menu "")
+ 
+ ;; This used to be:
+ ;; (define-key-after global-map [menu-bar jabber-menu] ...)
+--- emacs-jabber-0.8.92/jabber-roster.el
++++ emacs-jabber-0.8.92/jabber-roster.el
+@@ -816,7 +816,7 @@
+ (defalias 'jabber-presence-update-roster 'ignore)
+ ;;jabber-presence-update-roster is not needed anymore.
+ ;;Its work is done in `jabber-process-presence'."
+-(make-obsolete 'jabber-presence-update-roster 'ignore)
++(make-obsolete 'jabber-presence-update-roster 'ignore "")
+ 
+ (defun jabber-next-property (&optional prev)
+   "Return position of next property appearence or nil if there is none.