diff options
Diffstat (limited to 'app-text/zathura')
| -rw-r--r-- | app-text/zathura/Manifest | 5 | ||||
| -rw-r--r-- | app-text/zathura/files/zathura-find-libm.patch | 26 | ||||
| -rw-r--r-- | app-text/zathura/zathura-0.4.1.ebuild | 4 | ||||
| -rw-r--r-- | app-text/zathura/zathura-9999.ebuild | 71 |
4 files changed, 65 insertions, 41 deletions
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest index 4faecd68d540..7fa78409726a 100644 --- a/app-text/zathura/Manifest +++ b/app-text/zathura/Manifest @@ -1,6 +1,7 @@ +AUX zathura-find-libm.patch 896 BLAKE2B f28a1a967d274b0840f64bc94b7179bbcc5cfcb025b8450604c2e928cd4199e78a190e7766a33dd5b513d128f6567be45e667c75605397892745997b97c3b9ce SHA512 664440b3ca4e241f4d2072be5dbc52b00d962c264d5698649d7843e5ea54479a114a8c6ce731f4471fd600603898f4e571d23979aecd0447f592f0d3ebc51f2a DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109 DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6 EBUILD zathura-0.3.8.ebuild 1410 BLAKE2B 78e227aaf7716eadc6fc448b8f5d8bd0b1e2ab2f90914474270a7ef3700fe89225b8220cb46f617687d669b38c76d77f87dcd9f68858e79d5b16b593fcb89b1d SHA512 6148c69fd47e0342124ba49a6792422baaf4e9644a04473c42229f2e20c4f3559143f115703dde1d70e380a65b95f394acc19929ab59bb276c640c1d5e0697c1 -EBUILD zathura-0.4.1.ebuild 1425 BLAKE2B 389bf013932b8e990b85ce274159a4033852b1b39acdfb796452ecd6d99ff5506f8d2fd2f3c70d39019dffb9f285eb8a9e79813d082b305e3e2c08e369e2086f SHA512 f396dd3221ba19a8e9e666be3d21efa4f1ea684460de67177ee0d07781b77a830ff1c6fd42c42700c8811eec754f0dcff11b3b5b5f6fefd7ad666baabf63f4e0 -EBUILD zathura-9999.ebuild 1408 BLAKE2B 54b2855111b07b5901be97b75bc355bea4408fb4d56e3fc93f8adb8e79b5063ea80fbc2311e2849e52deb409cd1f4b43419c09027dfbaa88ee8ad306ccaf29d0 SHA512 87673c67c76d98776116a57ef204ff53dbc9ad3bf6d5fe2c37b4fe534994143c4626d7721977078af01bf36ace5e8691a686a6da66cb0ad199572739d5d951b4 +EBUILD zathura-0.4.1.ebuild 1473 BLAKE2B 90eeb93136fb2df9f339fce141149b0b8bcb55dd70f6cc28d182df37e88db28f76c819e53b02dda9b1a7a572c12ec90eade8cd3c7547051299e94a61678884ef SHA512 f668314e56613a62f43384e8a5b537f91c5f6441c8134c8d15640c9486c3d78363615e336aacc7cc55be48b483998935074a79d530eda39065119d74c5172eda +EBUILD zathura-9999.ebuild 1425 BLAKE2B 389bf013932b8e990b85ce274159a4033852b1b39acdfb796452ecd6d99ff5506f8d2fd2f3c70d39019dffb9f285eb8a9e79813d082b305e3e2c08e369e2086f SHA512 f396dd3221ba19a8e9e666be3d21efa4f1ea684460de67177ee0d07781b77a830ff1c6fd42c42700c8811eec754f0dcff11b3b5b5f6fefd7ad666baabf63f4e0 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87 diff --git a/app-text/zathura/files/zathura-find-libm.patch b/app-text/zathura/files/zathura-find-libm.patch new file mode 100644 index 000000000000..4995238fb8da --- /dev/null +++ b/app-text/zathura/files/zathura-find-libm.patch @@ -0,0 +1,26 @@ +From cc99b8d3491ce0cd30ba56decc33d811478bab0c Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sebastian@ramacher.at> +Date: Tue, 30 Oct 2018 00:39:19 +0100 +Subject: [PATCH] Search for m instead of libm (fixes #757) + +Thanks to Franz Trischberger for the fix. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f54f104..afe9ae8 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,7 +36,7 @@ dbusinterfacesdir = join_paths(datadir, 'dbus-1', 'interfaces') + plugindir = join_paths(get_option('libdir'), 'zathura') + + # required dependencies +-libm = cc.find_library('libm', required: false) ++libm = cc.find_library('m', required: false) + girara = dependency('girara-gtk3', version: '>=0.2.9') + glib = dependency('glib-2.0', version: '>=2.50') + gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows') +-- +2.18.0 + diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1.ebuild index 1b9071f73e74..49a7c2c24213 100644 --- a/app-text/zathura/zathura-0.4.1.ebuild +++ b/app-text/zathura/zathura-0.4.1.ebuild @@ -14,13 +14,15 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux" fi LICENSE="ZLIB" SLOT="0" IUSE="+magic seccomp sqlite synctex test" +PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch ) + RDEPEND="dev-libs/appstream >=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 89006688f4d4..1b9071f73e74 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -1,69 +1,64 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils multilib toolchain-funcs virtualx xdg-utils +inherit gnome2-utils meson virtualx xdg-utils + +DESCRIPTION="A highly customizable and functional document viewer" +HOMEPAGE="http://pwmt.org/projects/zathura/" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git" + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" EGIT_BRANCH="develop" else + SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" fi -DESCRIPTION="A highly customizable and functional document viewer" -HOMEPAGE="http://pwmt.org/projects/zathura/" - LICENSE="ZLIB" SLOT="0" -IUSE="+magic sqlite synctex test" +IUSE="+magic seccomp sqlite synctex test" + +RDEPEND="dev-libs/appstream + >=dev-libs/girara-0.3.1 + >=dev-libs/glib-2.50:2 + dev-util/desktop-file-utils + dev-python/sphinx + x11-libs/cairo + >=x11-libs/gtk+-3.22:3 + magic? ( sys-apps/file ) + seccomp? ( sys-libs/libseccomp ) + sqlite? ( >=dev-db/sqlite-3.5.9:3 ) + synctex? ( app-text/texlive-core )" -RDEPEND=">=dev-libs/girara-0.2.7:= - >=dev-libs/glib-2.32:2= - x11-libs/cairo:= - >=x11-libs/gtk+-3.6:3 - magic? ( sys-apps/file:= ) - sqlite? ( dev-db/sqlite:3= ) - synctex? ( >=app-text/texlive-core-2015 )" DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig test? ( dev-libs/check )" -src_configure() { - myzathuraconf=( - WITH_MAGIC=$(usex magic 1 0) - WITH_SQLITE=$(usex sqlite 1 0) - WITH_SYNCTEX=$(usex synctex 1 0) - PREFIX="${EPREFIX}"/usr - LIBDIR='${PREFIX}'/$(get_libdir) - CC="$(tc-getCC)" - SFLAGS='' - VERBOSE=1 - DESTDIR="${D}" - ) -} +BDEPEND="virtual/pkgconfig" -src_compile() { - emake "${myzathuraconf[@]}" +src_configure() { + local emesonargs=( + --libdir=/usr/$(get_libdir) + -Denable-magic=$(usex magic true false) + -Denable-seccomp=$(usex seccomp true false) + -Denable-sqlite=$(usex sqlite true false) + -Denable-synctex=$(usex synctex true false) + ) + meson_src_configure } src_test() { - Xemake "${myzathuraconf[@]}" test -} - -src_install() { - emake "${myzathuraconf[@]}" install - dodoc AUTHORS + virtx meson_src_test } pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update } |