diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -12,6 +12,7 @@ libgtk-3.so.0 libm.so.6 libmagic.so.1 +libmupdf.so libpango-1.0.so.0 libpoppler-glib.so.8 libpthread.so.0 diff --git a/files/update-zathura-mupdf-to-1.17.0.patch b/files/update-zathura-mupdf-to-1.17.0.patch new file mode 100644 --- /dev/null +++ b/files/update-zathura-mupdf-to-1.17.0.patch @@ -0,0 +1,46 @@ +From c7f341addb76d5e6fd8c24c666d8fe97c451a4cb Mon Sep 17 00:00:00 2001 +From: Moritz Lipp +Date: Thu, 7 May 2020 20:42:01 +0200 +Subject: [PATCH] Update to mupdf 1.17 + +--- + zathura-pdf-mupdf/index.c | 4 +++- + zathura-pdf-mupdf/links.c | 5 +++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c +index c421f5c..cbbe978 100644 +--- a/zathura-pdf-mupdf/index.c ++++ b/zathura-pdf-mupdf/index.c +@@ -65,9 +65,11 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_ + float x = 0; + float y = 0; + ++ fz_location location = fz_resolve_link(ctx, document, outline->uri, &x, &y); ++ + type = ZATHURA_LINK_GOTO_DEST; + target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; +- target.page_number = fz_resolve_link(ctx, document, outline->uri, &x, &y); ++ target.page_number = location.page; + target.left = x; + target.top = y; + target.zoom = 0.0; +diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c +index 99c5715..157f039 100644 +--- a/zathura-pdf-mupdf/links.c ++++ b/zathura-pdf-mupdf/links.c +@@ -54,10 +54,11 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error) + float x = 0; + float y = 0; + ++ fz_location location = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, link->uri, &x, &y); ++ + type = ZATHURA_LINK_GOTO_DEST; + target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; +- target.page_number = fz_resolve_link(mupdf_document->ctx, +- mupdf_document->document, link->uri, &x, &y); ++ target.page_number = location.page; + target.left = x; + target.top = y; + target.zoom = 0.0; + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,29 +1,48 @@ name : zathura -version : 0.4.5 -release : 14 +version : 0.4.6 +release : 15 source : - - https://github.com/pwmt/zathura/archive/0.4.5.tar.gz : 317882fc4e05104591c011c237b2ba6bf0b3978c189f5cdf3c978cb333ee04fe + - https://github.com/pwmt/zathura/archive/0.4.6.tar.gz : d15e36d4a8f293c16766358ac4de3196c763453f87d31c7f9cfb00d3e281b76a - https://github.com/pwmt/zathura-pdf-poppler/archive/0.3.0.tar.gz : 2034f70a936d458ddc9276f769e77ff308ba3bb1b7a7cdc87bab8b9ef7ade84a - https://github.com/pwmt/zathura-djvu/archive/0.2.9.tar.gz : 84fae6da42e7cdc2e49ed4cd4f0315ac09716e95358b9c7487803a2cff47dbca - https://github.com/pwmt/zathura-cb/archive/0.1.8.tar.gz : 67206011fc375cd2f3d0bc0d7a36b182c10eb3c41961963910992393c34aa5d5 - https://github.com/pwmt/zathura-ps/archive/0.2.6.tar.gz : 08c1927bfb8a40e201fa3638f9523d4b6d70e3444ef070bd4aa8a869b6574567 + - https://github.com/pwmt/zathura-pdf-mupdf/archive/0.3.5.tar.gz : 6344acda225ca637fc72788cacce7448cd2e69ac13f19429726786a0b62cd7e3 homepage : https://pwmt.org/projects/zathura/ license : Zlib component : office.viewers summary : zathura is a highly customizable and functional document viewer -description: | - zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries +description: + - zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries + - mupdf : mupdf plugin for zathura + - poppler : poppler plugin for zathura +patterns : + - mupdf : + - /usr/lib64/zathura/libpdf-mupdf.so + - /usr/share/applications/org.pwmt.zathura-pdf-mupdf.desktop + - poppler : + - /usr/lib64/zathura/libpdf-poppler.so + - /usr/share/applications/org.pwmt.zathura-pdf-poppler.desktop builddeps : - pkgconfig(ddjvuapi) - pkgconfig(girara-gtk3) + - pkgconfig(jbig2dec) - pkgconfig(libarchive) + - pkgconfig(libopenjp2) - pkgconfig(librsvg-2.0) - pkgconfig(libspectre) + - pkgconfig(libturbojpeg) - pkgconfig(poppler) - pkgconfig(sqlite3) - pkgconfig(synctex) - intltool + - mupdf-devel - python-sphinx +rundeps : + - mupdf : + - zathura + - poppler : + - zathura setup : | %meson_configure build : | @@ -35,10 +54,16 @@ # Build the remaining plugins mkdir plugin_build pushd plugin_build - for plugin in 0.1.8 0.2.6 0.2.9 0.3.0; do + for plugin in 0.1.8 0.2.6 0.2.9 0.3.0 0.3.5; do tar xvf $sources/${plugin}.tar.gz pushd zathura-*-$plugin - CFLAGS="$CFLAGS -I${installdir}/usr/include" %meson_configure + mesonflag="" + if [ $plugin == '0.3.5' ]; then + perl -pi -e 's/\s*mupdfthird.*$//;' -e 's/ mupdf,/ mupdf/;' meson.build + %patch -p1 < $pkgfiles/update-zathura-mupdf-to-1.17.0.patch + mesonflag="-Dlink-external=true" + fi + CFLAGS="$CFLAGS -I${installdir}/usr/include" %meson_configure $mesonflag %ninja_build %ninja_install popd diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,42 +3,38 @@ zathura https://pwmt.org/projects/zathura/ - F. von Gellhorn - flinux@vongellhorn.ch + Martin Reboredo + yakoyoku@gmail.com Zlib office.viewers zathura is a highly customizable and functional document viewer - zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries - + zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries https://getsol.us/sources/README.Solus zathura zathura is a highly customizable and functional document viewer - zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries - + zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries office.viewers /usr/bin/zathura /usr/lib64/zathura/libcb.so /usr/lib64/zathura/libdjvu.so - /usr/lib64/zathura/libpdf-poppler.so /usr/lib64/zathura/libps.so /usr/share/applications/org.pwmt.zathura-cb.desktop /usr/share/applications/org.pwmt.zathura-djvu.desktop - /usr/share/applications/org.pwmt.zathura-pdf-poppler.desktop /usr/share/applications/org.pwmt.zathura-ps.desktop /usr/share/applications/org.pwmt.zathura.desktop /usr/share/bash-completion/completions/zathura /usr/share/dbus-1/interfaces/org.pwmt.zathura.xml - /usr/share/fish/completions/zathura.fish + /usr/share/fish/vendor_completions.d/zathura.fish /usr/share/icons/hicolor/128x128/apps/org.pwmt.zathura.png /usr/share/icons/hicolor/16x16/apps/org.pwmt.zathura.png /usr/share/icons/hicolor/256x256/apps/org.pwmt.zathura.png /usr/share/icons/hicolor/32x32/apps/org.pwmt.zathura.png /usr/share/icons/hicolor/64x64/apps/org.pwmt.zathura.png - /usr/share/icons/scalable/apps/org.pwmt.zathura.svg + /usr/share/icons/hicolor/scalable/apps/org.pwmt.zathura.svg /usr/share/locale/ar/LC_MESSAGES/zathura.mo /usr/share/locale/ca/LC_MESSAGES/zathura.mo /usr/share/locale/cs/LC_MESSAGES/zathura.mo @@ -72,11 +68,10 @@ zathura-devel Development files for zathura - zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries - + zathura is a highly customizable and functional document viewer based on the girara user interface library and several document libraries programming.devel - zathura + zathura /usr/include/zathura/document.h @@ -89,13 +84,37 @@ /usr/lib64/pkgconfig/zathura.pc + + zathura-mupdf + zathura is a highly customizable and functional document viewer + mupdf plugin for zathura + + zathura + + + /usr/lib64/zathura/libpdf-mupdf.so + /usr/share/applications/org.pwmt.zathura-pdf-mupdf.desktop + + + + zathura-poppler + zathura is a highly customizable and functional document viewer + poppler plugin for zathura + + zathura + + + /usr/lib64/zathura/libpdf-poppler.so + /usr/share/applications/org.pwmt.zathura-pdf-poppler.desktop + + - - 2020-06-22 - 0.4.5 + + 2020-08-19 + 0.4.6 Packaging update - F. von Gellhorn - flinux@vongellhorn.ch + Martin Reboredo + yakoyoku@gmail.com \ No newline at end of file