From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- app-text/zathura-pdf-mupdf/Manifest | 5 +-- .../zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch | 24 +++++++++++++ .../zathura-pdf-mupdf-0.3.8-r1.ebuild | 38 ++++++++++++++++++++ .../zathura-pdf-mupdf-0.3.8.ebuild | 40 ---------------------- .../zathura-pdf-mupdf-9999.ebuild | 8 ++--- 5 files changed, 68 insertions(+), 47 deletions(-) create mode 100644 app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch create mode 100644 app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild delete mode 100644 app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild (limited to 'app-text/zathura-pdf-mupdf') diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest index d2cd67a980a2..9e5391b66a7f 100644 --- a/app-text/zathura-pdf-mupdf/Manifest +++ b/app-text/zathura-pdf-mupdf/Manifest @@ -1,8 +1,9 @@ +AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156eb48a69505bb81533751e29c9f05a46c5f93ea069eda042f72a24c4af1f804c28d2058ffe0d6ed646ba8f97610b113069cbadf05c841664 SHA512 a4b4a5b2d207ecd37a05d38f18f1f6a2df2acfaacf7a03fc97b14c3bf04441b3e0caa9aca30551fb4e12e0d41d1c4760d8033fb1c7a6b13dd8475453b59b529e DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97 DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 802 BLAKE2B 0d21f475acdc3b1db922101a735e23aa981ed6eac5f9998cd9f6c149ffbf4f127a76bff6dd2bb95fc610ad29367f498325de498f259a14ff46a5c8462b9822c5 SHA512 9f9e1d8f6600d6689a8f67d20cfea8a98b2884522e2e213ae48b33b6c229433f2e10cc502b7ee60672ead65ac6385096f812b07318dd4f082faaf7eae8a96c84 EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6 -EBUILD zathura-pdf-mupdf-0.3.8.ebuild 831 BLAKE2B c2f8f64744a4aaa57708745edb3d3256e22f51d0e96643376fb79b3af96e2904000b2a2b0fb5af9123d886da83d91544787e1e29e3bc485b507f3e7e2a33bd3e SHA512 1bafe45d1a7c84105845607d3676c5cfb912d49d1263316d6a1f39eee2315078ff3b52231d9f07a4276cd30aa789e92c75d467c26e5c3453739181d487676424 -EBUILD zathura-pdf-mupdf-9999.ebuild 846 BLAKE2B d950486cfcd743d7eb94028936de5987a8e179fb27b4b7bed7bc777990839b917beaaaf817deb847d7f7397a316940f608e5e7eea7f32b7a40a399a6884a0f5c SHA512 239dfe881f0c965a5e61efae8add848111e2f3734743bf4c66aefce9b1076ec05b4dac92ba64c122358ba50e3764fcda3c549eec629d82e484f0b6223c5cf905 +EBUILD zathura-pdf-mupdf-0.3.8-r1.ebuild 785 BLAKE2B 336dfbe9ca9871b1d71fee5cbd51f6fc769f5b9907c8a00ba61863df404448d127cfe7fe406eb2fc21f1f40bf4651d37a2260584356f18d5b2c62e650f356653 SHA512 92bcb8d41fcaf8c50db35bb4e32c03112e09713a67741acf52897063679251337a5c29ea6fed0d3cfdd0c6f68c3b9911b0017e2b8c928dd01fce3b5a93262f10 +EBUILD zathura-pdf-mupdf-9999.ebuild 800 BLAKE2B 8ba3913b6ba61dbc596710d20d0eac03ff8b9b7e047cb813068967535581ccfce9e090e207c050612e40f349e9ae261cba9946de0b8a1b63ef2df61ef761b8c4 SHA512 67a0f4320d42f8dcebe092ccb71fa3b1e21afd9292d7a7cd549ff6ef7fa79d9a493d61be06996b180787cdcfbd02934685c0ee83f4cf923e7aa3ec302e715bb2 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c 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..9c4de3d0fe9a --- /dev/null +++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/835592 +--- 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-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild new file mode 100644 index 000000000000..439355423fb1 --- /dev/null +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git" + EGIT_BRANCH="develop" +else + KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz" +fi + +DESCRIPTION="PDF plug-in for zathura" +HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" + +LICENSE="ZLIB" +SLOT="0" + +DEPEND=">=app-text/mupdf-1.19:= + >=app-text/zathura-0.3.9 + dev-libs/girara + dev-libs/glib:2 + x11-libs/cairo" + +RDEPEND="${DEPEND}" + +BDEPEND="app-text/tesseract + dev-lang/mujs + media-libs/leptonica + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch" +) 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.ebuild deleted file mode 100644 index f77ce12d862e..000000000000 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git" - EGIT_BRANCH="develop" -else - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz" -fi - -DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" - -LICENSE="ZLIB" -SLOT="0" - -DEPEND=">=app-text/mupdf-1.19:= - >=app-text/zathura-0.3.9 - dev-libs/girara - dev-libs/glib:2 - x11-libs/cairo" - -RDEPEND="${DEPEND}" - -BDEPEND="app-text/tesseract - dev-lang/mujs - media-libs/leptonica - virtual/pkgconfig" - -src_prepare() { - sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build" - - default -} 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" +) -- cgit v1.2.3