commit: a370d9e0cf9af3561db6ae100ffffb5713172329 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Oct 24 16:20:36 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Oct 24 16:37:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a370d9e0
app-editors/emacs: Add use-dependency on imagemagick Propagate the flags for the jpeg, png, svg and tiff backends. Otherwise, when visiting an image file, the following error will occur for svg: ImageMagick error: Document is empty `No such file or directory` @ error/svg.c/SVGError/3370 For jpeg, png and TIFF, a different error message is printed: ImageMagick error: no decode delegate for this image format `PNG' @ error/constitute.c/ReadImage/746 [8 times] No error occurs for webp. Bug: https://bugs.gentoo.org/916204 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-editors/emacs/{emacs-29.1.90.ebuild => emacs-29.1-r5.ebuild} | 5 ++++- app-editors/emacs/emacs-29.1.90.ebuild | 2 +- app-editors/emacs/emacs-29.1.9999.ebuild | 2 +- app-editors/emacs/emacs-30.0.9999.ebuild | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app-editors/emacs/emacs-29.1.90.ebuild b/app-editors/emacs/emacs-29.1-r5.ebuild similarity index 98% copy from app-editors/emacs/emacs-29.1.90.ebuild copy to app-editors/emacs/emacs-29.1-r5.ebuild index 25d19bc31d28..45d31c1e4311 100644 --- a/app-editors/emacs/emacs-29.1.90.ebuild +++ b/app-editors/emacs/emacs-29.1-r5.ebuild @@ -31,6 +31,9 @@ else elif [[ ${PV//[0-9]} != "." ]]; then SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"; fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"; + PATCHES=("${WORKDIR}/patch") SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" @@ -128,7 +131,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] diff --git a/app-editors/emacs/emacs-29.1.90.ebuild b/app-editors/emacs/emacs-29.1.90.ebuild index 25d19bc31d28..ac342a06b3fd 100644 --- a/app-editors/emacs/emacs-29.1.90.ebuild +++ b/app-editors/emacs/emacs-29.1.90.ebuild @@ -128,7 +128,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild index 25d19bc31d28..ac342a06b3fd 100644 --- a/app-editors/emacs/emacs-29.1.9999.ebuild +++ b/app-editors/emacs/emacs-29.1.9999.ebuild @@ -128,7 +128,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 256307d1056b..5f9be5cc4991 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -129,7 +129,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)]
