commit: 7b411454909c30feac2134509bbc25aef46a1837 Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com> AuthorDate: Mon Mar 21 20:35:20 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 21 23:34:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b411454
app-text/zathura-pdf-mupdf: fix sed call Replace broken sed call by patch for meson.build Closes: https://bugs.gentoo.org/835592 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/24699 Signed-off-by: Sam James <sam <AT> gentoo.org> .../zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch | 23 ++++++++++++++++++++++ ....8.ebuild => zathura-pdf-mupdf-0.3.8-r1.ebuild} | 8 +++----- .../zathura-pdf-mupdf-9999.ebuild | 8 +++----- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch new file mode 100644 index 000000000000..942eb710343d --- /dev/null +++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch @@ -0,0 +1,23 @@ +--- a/meson.build ++++ b/meson.build +@@ -20,7 +20,6 @@ girara = dependency('girara-gtk3') + glib = dependency('glib-2.0') + cairo = dependency('cairo') + mupdf = dependency('mupdf', required: false) +-mupdfthird = cc.find_library('mupdf-third') + + build_dependencies = [ + zathura, +@@ -32,10 +31,10 @@ build_dependencies = [ + if not mupdf.found() + # normal build of mupdf + mupdf = cc.find_library('mupdf') +- build_dependencies += [mupdf, mupdfthird] ++ build_dependencies += [mupdf] + else + # build from Debian's libmupdf-dev +- build_dependencies += [mupdf, mupdfthird] ++ build_dependencies += [mupdf] + + libjpeg = dependency('libjpeg') + libjbig2dec = cc.find_library('jbig2dec') diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild similarity index 85% rename from app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild rename to app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild index f77ce12d862e..439355423fb1 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild @@ -33,8 +33,6 @@ BDEPEND="app-text/tesseract media-libs/leptonica virtual/pkgconfig" -src_prepare() { - sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build" - - default -} +PATCHES=( + "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch" +) diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild index 657da8ef975a..ee7721ceea68 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild @@ -33,8 +33,6 @@ BDEPEND="app-text/tesseract media-libs/leptonica dev-lang/mujs" -src_prepare() { - sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build" - - default -} +PATCHES=( + "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch" +)
