On Fri, Jan 17, 2020 at 09:03:12AM +0100, Landry Breuil wrote:
> On Thu, Jan 16, 2020 at 10:11:27PM -0600, Matthew Martin wrote:
> > Builds fine. I don't use it, so I'd appreciate if a user could test it
> > still works for them. Requires the girara update just sent. zsh tab
> > completion works without fpath modification.
>
> Fwiw, you should remove REVISION, and usually it's also nice to update
> the corresponding plugins when they have updates.
>
> for girara, port lib depends check complains about some extra WANTLIBs:
>
> girara-0.3.4(x11/girara):
> Extra: atk-1.0.21809 cairo-gobject.2 cairo.13 gdk_pixbuf-2.0.3200
> Extra: pangocairo-1.0.3801
>
> for zathura, same thing:
>
> zathura-0.4.5(textproc/zathura/core):
> Extra: atk-1.0.21809 cairo-gobject.2 gdk_pixbuf-2.0.3200 pangocairo-1.0.3801
> Extra: pthread.26
>
> Will fix all this..
Here's a version that:
- fixes WANTLIB everywhere
- factorizes HOMEPAGE & DISTNAME in Makefile.inc
- updates plugins where possible
- updates PLISTs with @so markers
works for me with mupdf plugin only, havent tested the others.
will commit in a few days, if ppl want to test the other plugins in the
meantime..
Landry
? zathura-0.3.4.diff
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- core/Makefile 12 Jul 2019 20:50:17 -0000 1.26
+++ core/Makefile 17 Jan 2020 08:31:21 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.26 2019/07/12 20:50:17 sthen Exp $
-V = 0.4.3
-REVISION = 0
+V = 0.4.5
COMMENT = document viewer for PDF and other formats with a
vi-like UI
DISTNAME = zathura-${V}
CATEGORIES = textproc x11
@@ -12,10 +11,8 @@
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 girara-gtk3 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gtk-3 intl m magic pango-1.0 pangocairo-1.0 pthread
-WANTLIB += sqlite3 synctex
+WANTLIB += c cairo gio-2.0 girara-gtk3 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += gdk-3 gtk-3 intl m magic pango-1.0 sqlite3 synctex
MASTER_SITES = https://pwmt.org/projects/zathura/download/
@@ -27,7 +24,7 @@
x11/gtk+3,-guic
LIB_DEPENDS = databases/sqlite3 \
devel/libmagic \
- x11/girara>=0.3.2 \
+ x11/girara>=0.3.4 \
print/texlive/base,-synctex
COMPILER = base-clang ports-gcc
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- core/distinfo 4 Mar 2019 14:46:21 -0000 1.9
+++ core/distinfo 17 Jan 2020 08:31:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.4.3.tar.xz) = fhIZRCbXCWcOD0sLEHyA3SEyKIG1fUoL+aCZmEAv/UE=
-SIZE (zathura-0.4.3.tar.xz) = 145796
+SHA256 (zathura-0.4.5.tar.xz) = DDmXqvvNqq5gpFIvIIra390nWLQyzpTqFvvO6TfLdiw=
+SIZE (zathura-0.4.5.tar.xz) = 152720
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- core/pkg/PLIST 4 Mar 2019 14:46:21 -0000 1.10
+++ core/pkg/PLIST 17 Jan 2020 08:31:21 -0000
@@ -19,6 +19,9 @@
share/dbus-1/interfaces/
share/dbus-1/interfaces/org.pwmt.zathura.xml
share/doc/pkg-readmes/${PKGSTEM}
+share/fish/
+share/fish/completions/
+share/fish/completions/zathura.fish
share/icons/hicolor/128x128/apps/org.pwmt.zathura.png
share/icons/hicolor/16x16/apps/org.pwmt.zathura.png
share/icons/hicolor/256x256/apps/org.pwmt.zathura.png
@@ -27,6 +30,7 @@
share/icons/scalable/
share/icons/scalable/apps/
share/icons/scalable/apps/org.pwmt.zathura.svg
+share/locale/ar/LC_MESSAGES/zathura.mo
share/locale/ca/LC_MESSAGES/zathura.mo
share/locale/cs/LC_MESSAGES/zathura.mo
share/locale/de/LC_MESSAGES/zathura.mo
@@ -61,8 +65,8 @@
share/metainfo/
share/metainfo/org.pwmt.zathura.appdata.xml
share/zsh/
-share/zsh/vendor-completions/
-share/zsh/vendor-completions/_zathura
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag gtk-update-icon-cache %D/share/icons/scalable
@tag update-desktop-database
+share/zsh/site-functions/
+share/zsh/site-functions/_zathura
Index: plugins/Makefile.inc
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/Makefile.inc,v
retrieving revision 1.12
diff -u -r1.12 Makefile.inc
--- plugins/Makefile.inc 13 Jul 2019 10:59:27 -0000 1.12
+++ plugins/Makefile.inc 17 Jan 2020 08:31:21 -0000
@@ -1,16 +1,18 @@
# $OpenBSD: Makefile.inc,v 1.12 2019/07/13 10:59:27 sthen Exp $
CATEGORIES ?= textproc x11
-MASTER_SITES ?=
https://pwmt.org/projects/zathura/plugins/download/
+MASTER_SITES ?= https://pwmt.org/projects/${PROJECT}/download/
+HOMEPAGE ?= http://pwmt.org/projects/${PROJECT}/
EXTRACT_SUFX ?= .tar.xz
+DISTNAME ?= ${PROJECT}-${V}
# MIT
PERMIT_PACKAGE ?= Yes
RUN_DEPENDS ?= devel/desktop-file-utils \
textproc/zathura/core
-LIB_DEPENDS += x11/girara>=0.2.9
-BUILD_DEPENDS ?= textproc/zathura/core>=0.3.9
+LIB_DEPENDS += x11/girara>=0.3.2
+BUILD_DEPENDS ?= textproc/zathura/core>=0.4.5
MODULES ?= devel/meson
NO_TEST ?= Yes
Index: plugins/cb/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/cb/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- plugins/cb/Makefile 21 May 2019 10:08:03 -0000 1.10
+++ plugins/cb/Makefile 17 Jan 2020 08:31:21 -0000
@@ -2,15 +2,12 @@
V = 0.1.8
COMMENT = comic book plugin for zathura
-DISTNAME = zathura-cb-${V}
-REVISION = 1
-
-HOMEPAGE = http://pwmt.org/projects/zathura/plugins/zathura-cb/
+PROJECT = zathura-cb
+REVISION = 2
LIB_DEPENDS += archivers/libarchive
-WANTLIB += archive atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl
-WANTLIB += pango-1.0 pangocairo-1.0
+WANTLIB += archive cairo gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 girara-gtk3 glib-2.0 gobject-2.0
.include <bsd.port.mk>
Index: plugins/cb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/cb/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- plugins/cb/pkg/PLIST 27 Jun 2018 21:04:04 -0000 1.3
+++ plugins/cb/pkg/PLIST 17 Jan 2020 08:31:21 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2018/06/27 21:04:04 espie Exp $
-lib/zathura/libcb.so
+@so lib/zathura/libcb.so
share/applications/org.pwmt.zathura-cb.desktop
share/metainfo/org.pwmt.zathura-cb.metainfo.xml
@tag update-desktop-database
Index: plugins/djvu/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- plugins/djvu/Makefile 21 May 2019 10:08:03 -0000 1.10
+++ plugins/djvu/Makefile 17 Jan 2020 08:31:21 -0000
@@ -1,16 +1,11 @@
# $OpenBSD: Makefile,v 1.10 2019/05/21 10:08:03 sthen Exp $
-V = 0.2.8
-REVISION = 1
+V = 0.2.9
COMMENT = djvu plugin for zathura
-DISTNAME = zathura-djvu-${V}
-
-HOMEPAGE = http://pwmt.org/projects/zathura/plugins/zathura-djvu
+PROJECT = zathura-djvu
LIB_DEPENDS += graphics/djvulibre
-WANTLIB += atk-1.0 cairo cairo-gobject djvulibre gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl
-WANTLIB += pango-1.0 pangocairo-1.0
+WANTLIB += cairo djvulibre girara-gtk3 glib-2.0
.include <bsd.port.mk>
Index: plugins/djvu/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- plugins/djvu/distinfo 28 Apr 2018 14:57:32 -0000 1.5
+++ plugins/djvu/distinfo 17 Jan 2020 08:31:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-djvu-0.2.8.tar.xz) =
0OZk1TEr3AZ0/fjMbiWcnuE2VxQXK8gJ+cD2llnYsys=
-SIZE (zathura-djvu-0.2.8.tar.xz) = 8860
+SHA256 (zathura-djvu-0.2.9.tar.xz) =
lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA=
+SIZE (zathura-djvu-0.2.9.tar.xz) = 8976
Index: plugins/djvu/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- plugins/djvu/pkg/PLIST 27 Jun 2018 21:04:04 -0000 1.3
+++ plugins/djvu/pkg/PLIST 17 Jan 2020 08:31:21 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2018/06/27 21:04:04 espie Exp $
-lib/zathura/libdjvu.so
+@so lib/zathura/libdjvu.so
share/applications/org.pwmt.zathura-djvu.desktop
share/metainfo/org.pwmt.zathura-djvu.metainfo.xml
@tag update-desktop-database
Index: plugins/mupdf/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- plugins/mupdf/Makefile 30 Jul 2019 13:41:37 -0000 1.19
+++ plugins/mupdf/Makefile 17 Jan 2020 08:31:21 -0000
@@ -1,14 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2019/07/30 13:41:37 sthen Exp $
-V = 0.3.4
-REVISION = 2
+V = 0.3.5
COMMENT = mupdf pdf plugin for zathura
-DISTNAME = zathura-pdf-mupdf-${V}
-
-HOMEPAGE = https://pwmt.org/projects/zathura-pdf-mupdf/
-
-MASTER_SITES = https://pwmt.org/projects/zathura/plugins/download/ \
- http://distfiles.gentoo.org/distfiles/
+PROJECT = zathura-pdf-mupdf
BUILD_DEPENDS = textproc/mupdf \
textproc/zathura/core
@@ -16,9 +10,8 @@
graphics/jpeg \
graphics/openjp2
-WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl jbig2dec
-WANTLIB += jpeg openjp2 pango-1.0 pangocairo-1.0
+WANTLIB += cairo girara-gtk3 glib-2.0 harfbuzz jbig2dec
+WANTLIB += jpeg openjp2
CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib `pkg-config
--libs libjpeg libopenjp2` -ljbig2dec"
Index: plugins/mupdf/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- plugins/mupdf/distinfo 3 Dec 2018 18:40:33 -0000 1.7
+++ plugins/mupdf/distinfo 17 Jan 2020 08:31:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-pdf-mupdf-0.3.4.tar.xz) =
1kMxub5D5C3OHRE3RsYuTm6cmitN93iJ5L/HQ74tzZg=
-SIZE (zathura-pdf-mupdf-0.3.4.tar.xz) = 8092
+SHA256 (zathura-pdf-mupdf-0.3.5.tar.xz) =
GKY/err5dRw38mps7uLYNzilhT/UJSH+1p0y/s/SXN4=
+SIZE (zathura-pdf-mupdf-0.3.5.tar.xz) = 8088
Index: plugins/mupdf/patches/patch-zathura-pdf-mupdf_search_c
===================================================================
RCS file: plugins/mupdf/patches/patch-zathura-pdf-mupdf_search_c
diff -N plugins/mupdf/patches/patch-zathura-pdf-mupdf_search_c
--- plugins/mupdf/patches/patch-zathura-pdf-mupdf_search_c 30 Jul 2019
13:41:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-zathura-pdf-mupdf_search_c,v 1.1 2019/07/30 13:41:37 sthen Exp
$
-
-mupdf 1.16.0 api change
-
-Index: zathura-pdf-mupdf/search.c
---- zathura-pdf-mupdf/search.c.orig
-+++ zathura-pdf-mupdf/search.c
-@@ -39,7 +39,7 @@ pdf_page_search_text(zathura_page_t* page, void* data,
- mupdf_page_extract_text(mupdf_document, mupdf_page);
- }
-
-- fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS,
sizeof(fz_quad));
-+ fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS,
fz_quad);
- int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
- text, hit_bbox, N_SEARCH_RESULTS);
-
Index: plugins/mupdf/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- plugins/mupdf/pkg/PLIST 27 Jun 2018 21:04:04 -0000 1.4
+++ plugins/mupdf/pkg/PLIST 17 Jan 2020 08:31:21 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:04:04 espie Exp $
@conflict zathura-pdf-poppler-*
-lib/zathura/libpdf-mupdf.so
+@so lib/zathura/libpdf-mupdf.so
share/applications/org.pwmt.zathura-pdf-mupdf.desktop
share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml
@tag update-desktop-database
Index: plugins/poppler/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- plugins/poppler/Makefile 21 May 2019 10:08:03 -0000 1.11
+++ plugins/poppler/Makefile 17 Jan 2020 08:31:21 -0000
@@ -1,16 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2019/05/21 10:08:03 sthen Exp $
-V = 0.2.9
+V = 0.3.0
COMMENT = poppler pdf plugin for zathura
-DISTNAME = zathura-pdf-poppler-${V}
-REVISION = 1
+PROJECT = zathura-pdf-poppler
-HOMEPAGE = http://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/
LIB_DEPENDS += print/poppler
-WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl pango-1.0
-WANTLIB += pangocairo-1.0 poppler-glib
+WANTLIB += girara-gtk3 glib-2.0 gobject-2.0 poppler-glib
.include <bsd.port.mk>
Index: plugins/poppler/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- plugins/poppler/distinfo 28 Apr 2018 14:57:32 -0000 1.5
+++ plugins/poppler/distinfo 17 Jan 2020 08:31:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-pdf-poppler-0.2.9.tar.xz) =
vggGEW6m5slUlfXiRODXDSVRqQWOVXS0fT5aCbxlktw=
-SIZE (zathura-pdf-poppler-0.2.9.tar.xz) = 7456
+SHA256 (zathura-pdf-poppler-0.3.0.tar.xz) =
1cw6fa5JRxuFtQO7uQScb40QkD9KYR1yGi4P7+cm1O0=
+SIZE (zathura-pdf-poppler-0.3.0.tar.xz) = 7696
Index: plugins/poppler/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- plugins/poppler/pkg/PLIST 27 Jun 2018 21:04:05 -0000 1.4
+++ plugins/poppler/pkg/PLIST 17 Jan 2020 08:31:21 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:04:05 espie Exp $
@conflict zathura-pdf-mupdf-*
-lib/zathura/libpdf-poppler.so
+@so lib/zathura/libpdf-poppler.so
share/applications/org.pwmt.zathura-pdf-poppler.desktop
share/metainfo/org.pwmt.zathura-pdf-poppler.metainfo.xml
@tag update-desktop-database
Index: plugins/ps/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/ps/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- plugins/ps/Makefile 21 May 2019 10:08:03 -0000 1.11
+++ plugins/ps/Makefile 17 Jan 2020 08:31:21 -0000
@@ -2,15 +2,11 @@
V = 0.2.6
COMMENT = spectre postscript plugin for zathura
-DISTNAME = zathura-ps-${V}
-REVISION = 1
-
-HOMEPAGE = http://pwmt.org/projects/zathura/plugins/zathura-ps/
+PROJECT = zathura-ps
+REVISION = 2
LIB_DEPENDS += print/libspectre
-WANTLIB += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl pango-1.0
-WANTLIB += pangocairo-1.0 spectre
+WANTLIB += cairo girara-gtk3 glib-2.0 spectre
.include <bsd.port.mk>
Index: plugins/ps/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/ps/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- plugins/ps/pkg/PLIST 27 Jun 2018 21:04:05 -0000 1.3
+++ plugins/ps/pkg/PLIST 17 Jan 2020 08:31:21 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2018/06/27 21:04:05 espie Exp $
-lib/zathura/libps.so
+@so lib/zathura/libps.so
share/applications/org.pwmt.zathura-ps.desktop
share/metainfo/org.pwmt.zathura-ps.metainfo.xml
@tag update-desktop-database
