summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2022-04-06 18:25:06 +0200
committerUlrich Müller <ulm@gentoo.org>2022-04-06 18:43:08 +0200
commit02c64e95e3b7ed70642732b1cd8fe930db1ee34f (patch)
tree4bc118f9d412a39b84ccbe518a36876ec8f1c93c /app-emacs/volume
parentwww-client/opera-developer: remove old (diff)
downloadgentoo-02c64e95e3b7ed70642732b1cd8fe930db1ee34f.tar.gz
gentoo-02c64e95e3b7ed70642732b1cd8fe930db1ee34f.tar.bz2
gentoo-02c64e95e3b7ed70642732b1cd8fe930db1ee34f.zip
app-emacs/volume: Fix byte-compilation with Emacs 28
Closes: https://bugs.gentoo.org/836904 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'app-emacs/volume')
-rw-r--r--app-emacs/volume/files/volume-1.0-emacs-28.patch40
-rw-r--r--app-emacs/volume/metadata.xml2
-rw-r--r--app-emacs/volume/volume-1.0-r1.ebuild9
3 files changed, 47 insertions, 4 deletions
diff --git a/app-emacs/volume/files/volume-1.0-emacs-28.patch b/app-emacs/volume/files/volume-1.0-emacs-28.patch
new file mode 100644
index 000000000000..8a26b0441ebf
--- /dev/null
+++ b/app-emacs/volume/files/volume-1.0-emacs-28.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/836904
+
+--- a/volume.el
++++ b/volume.el
+@@ -448,7 +448,7 @@
+
+ (when (fboundp 'define-obsolete-variable-alias)
+ (define-obsolete-variable-alias 'volume-amixer-control
+- 'volume-amixer-default-channel))
++ 'volume-amixer-default-channel ""))
+
+ (defvar volume-amixer-current-channel volume-amixer-default-channel
+ "The name of the ALSA mixer channel to manipulate.")
+@@ -562,7 +562,7 @@
+
+ (when (fboundp 'define-obsolete-function-alias)
+ (define-obsolete-function-alias 'volume-channel-name
+- 'volume-channel-label))
++ 'volume-channel-label ""))
+
+ (defun volume-channels ()
+ "Return the list of available channels."
+@@ -775,7 +775,7 @@
+ (volume-lower (* n 10)))
+
+ (defalias 'volume-lower-more 'volume-lower-10)
+-(make-obsolete 'volume-lower-more 'volume-lower-10)
++(make-obsolete 'volume-lower-more 'volume-lower-10 "")
+
+ (defun volume-raise-10 (&optional n)
+ "Raise the volume by 10 N percentage units."
+@@ -783,7 +783,7 @@
+ (volume-raise (* n 10)))
+
+ (defalias 'volume-raise-more 'volume-raise-10)
+-(make-obsolete 'volume-raise-more 'volume-raise-10)
++(make-obsolete 'volume-raise-more 'volume-raise-10 "")
+
+ (defun volume-lower-50 (&optional n)
+ "Lower the volume by 50 N percentage units."
diff --git a/app-emacs/volume/metadata.xml b/app-emacs/volume/metadata.xml
index 978a4ffa187c..9241744bc512 100644
--- a/app-emacs/volume/metadata.xml
+++ b/app-emacs/volume/metadata.xml
@@ -7,6 +7,6 @@
</maintainer>
<stabilize-allarches/>
<upstream>
- <remote-id type="github">dbrock/volume-el</remote-id>
+ <remote-id type="github">dbrock/volume.el</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-emacs/volume/volume-1.0-r1.ebuild b/app-emacs/volume/volume-1.0-r1.ebuild
index 130913594d03..3bb752070488 100644
--- a/app-emacs/volume/volume-1.0-r1.ebuild
+++ b/app-emacs/volume/volume-1.0-r1.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
@@ -6,7 +6,7 @@ EAPI=7
inherit elisp
DESCRIPTION="Tweak your sound card volume from Emacs"
-HOMEPAGE="https://github.com/dbrock/volume-el"
+HOMEPAGE="https://github.com/dbrock/volume.el"
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
LICENSE="GPL-2+"
@@ -18,5 +18,8 @@ KEYWORDS="amd64 ppc sparc x86"
# RDEPEND="|| ( media-sound/aumixer media-sound/alsa-utils )"
-ELISP_PATCHES="${P}-mode-line.patch"
+PATCHES=(
+ "${FILESDIR}"/${P}-mode-line.patch
+ "${FILESDIR}"/${P}-emacs-28.patch
+)
SITEFILE="50${PN}-gentoo.el"