Hi,
here's a trivial update to girara, zathura and its plugins. mupdf plugin
stays at 0.3.1 as 0.3.2 was adapted to work with mupdf 1.12 API, and we
don't have it yet (cf
https://git.pwmt.org/pwmt/zathura-pdf-mupdf/commit/a3f703788f77b19bb986e14666fe0c47911adddc
& https://pwmt.org/news/zathura-pdf-mupdf-0-3-2/)
tested working fine here with poppler plugin.
Landry
? girara-0.2.6-libgirara-gtk3.so.0.1
? girara-0.2.7-libgirara-gtk3.so.0.1
? girara-0.2.7-libgirara-gtk3.so.0.2
? girara-0.2.8-libgirara-gtk3.so.0.2
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/girara/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 16 Nov 2017 23:20:40 -0000 1.12
+++ Makefile 9 Jan 2018 16:23:53 -0000
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:40 naddy Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.2.7
+DISTNAME = girara-0.2.8
-SHARED_LIBS += girara-gtk3 0.2 # 2.3
+SHARED_LIBS += girara-gtk3 1.0 # 2.3
CATEGORIES = x11
HOMEPAGE = http://pwmt.org/projects/girara/
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/girara/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 1 Mar 2017 15:47:01 -0000 1.6
+++ distinfo 9 Jan 2018 16:23:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (girara-0.2.7.tar.gz) = mOajQymK5GhpyZC8bgcyVV4Zry44bNwakR8QmxxcMuU=
-SIZE (girara-0.2.7.tar.gz) = 76723
+SHA256 (girara-0.2.8.tar.gz) = KFkF41N17L3+QYxrdzXjc9eA92pbbJDAjbKNqfTQmqM=
+SIZE (girara-0.2.8.tar.gz) = 73646
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/girara/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- patches/patch-Makefile 15 Jun 2016 07:23:27 -0000 1.4
+++ patches/patch-Makefile 9 Jan 2018 16:23:53 -0000
@@ -3,9 +3,10 @@
Create libs with a correct soname.
Don't symlink libs.
---- Makefile.orig Tue Jun 14 21:20:42 2016
-+++ Makefile Tue Jun 14 21:25:35 2016
-@@ -134,7 +134,7 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a: ${OBJEC
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -130,7 +130,7 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a: ${OBJEC
${BUILDDIR_RELEASE}/${BINDIR}/${SOVERSIONFILE}: ${OBJECTS}
$(call colorecho,LD,$@)
@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
@@ -14,7 +15,7 @@
${SHARED_FLAG} ${PLATFORMFLAGS} ${LDFLAGS} -o $@ ${OBJECTS}
${LIBS}
${PROJECT}: static shared
-@@ -266,10 +266,6 @@ install-shared: shared
+@@ -264,10 +264,6 @@ install-shared: shared
$(call colorecho,INSTALL,"Install shared library")
$(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
$(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/${SOVERSIONFILE}
${DESTDIR}${LIBDIR}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/girara/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 1 Mar 2017 15:47:01 -0000 1.4
+++ pkg/PLIST 9 Jan 2018 16:23:53 -0000
@@ -15,7 +15,6 @@
include/girara/settings.h
include/girara/shortcuts.h
include/girara/statusbar.h
-include/girara/tabs.h
include/girara/template.h
include/girara/types.h
include/girara/utils.h
@@ -23,14 +22,14 @@
lib/libgirara-gtk3.a
@lib lib/libgirara-gtk3.so.${LIBgirara-gtk3_VERSION}
lib/pkgconfig/girara-gtk3.pc
-share/locale/de/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/el/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/eo/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/es/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/fr/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/he/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/it/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/pl/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/ru/LC_MESSAGES/libgirara-gtk3-2.mo
-share/locale/tr/LC_MESSAGES/libgirara-gtk3-2.mo
+share/locale/de/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/el/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/eo/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/es/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/fr/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/he/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/it/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/pl/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/ru/LC_MESSAGES/libgirara-gtk3-3.mo
+share/locale/tr/LC_MESSAGES/libgirara-gtk3-3.mo
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- core/Makefile 16 Nov 2017 23:20:40 -0000 1.13
+++ core/Makefile 9 Jan 2018 16:29:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:40 naddy Exp $
-V = 0.3.7
+V = 0.3.8
COMMENT = document viewer for PDF and other formats with a
vi-like UI
DISTNAME = zathura-${V}
CATEGORIES = textproc x11
@@ -23,7 +23,7 @@
LIB_DEPENDS = databases/sqlite3 \
graphics/gdk-pixbuf2 \
devel/libmagic \
- x11/girara>=0.2.7
+ x11/girara>=0.2.8
MAKE_FLAGS = MANPREFIX=${PREFIX}/man \
DESKTOPPREFIX=${PREFIX}/share/applications \
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- core/distinfo 3 Mar 2017 09:41:01 -0000 1.5
+++ core/distinfo 9 Jan 2018 16:29:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.3.7.tar.gz) = Iq//ifQJPyL7ghiEF/+b+paVsZpP6JTcoFt8ghs5D/A=
-SIZE (zathura-0.3.7.tar.gz) = 174095
+SHA256 (zathura-0.3.8.tar.gz) = Rr+FWPf/Eu/hG/XRnm4iOqyXEmBhZ3GZ0MPVPfy85Tc=
+SIZE (zathura-0.3.8.tar.gz) = 174962
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- core/pkg/PLIST 16 Oct 2016 13:50:35 -0000 1.3
+++ core/pkg/PLIST 9 Jan 2018 16:29:14 -0000
@@ -14,8 +14,6 @@
lib/zathura/
@man man/man1/zathura.1
@man man/man5/zathurarc.5
-share/appdata/
-share/appdata/zathura.appdata.xml
share/applications/zathura.desktop
share/dbus-1/interfaces/
share/dbus-1/interfaces/org.pwmt.zathura.xml
@@ -49,5 +47,7 @@
share/locale/uk_UA/
share/locale/uk_UA/LC_MESSAGES/
share/locale/uk_UA/LC_MESSAGES/zathura.mo
+share/metainfo/
+share/metainfo/zathura.appdata.xml
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
Index: plugins/Makefile.inc
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- plugins/Makefile.inc 16 Oct 2016 13:51:21 -0000 1.6
+++ plugins/Makefile.inc 9 Jan 2018 16:29:14 -0000
@@ -8,7 +8,7 @@
RUN_DEPENDS ?= devel/desktop-file-utils \
textproc/zathura/core
-LIB_DEPENDS += x11/girara
+LIB_DEPENDS += x11/girara>=0.2.8
BUILD_DEPENDS ?= textproc/zathura/core
MAKE_FLAGS ?= VERBOSE=1 \
Index: plugins/cb/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/cb/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- plugins/cb/Makefile 3 Mar 2017 09:41:01 -0000 1.6
+++ plugins/cb/Makefile 9 Jan 2018 16:29:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2017/03/03 09:41:01 landry Exp $
-V = 0.1.6
+V = 0.1.7
COMMENT = comic book plugin for zathura
DISTNAME = zathura-cb-${V}
Index: plugins/cb/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/cb/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- plugins/cb/distinfo 3 Mar 2017 09:41:01 -0000 1.3
+++ plugins/cb/distinfo 9 Jan 2018 16:29:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-cb-0.1.6.tar.gz) = iI6VQh4TuUTRlgT6sSnlmSY29ATn7SB1HU9QVG8lNbo=
-SIZE (zathura-cb-0.1.6.tar.gz) = 7205
+SHA256 (zathura-cb-0.1.7.tar.gz) = g18rPEb4I1uIs8fR2kzChSd78qwsIEG+mmlI5nWMm2Q=
+SIZE (zathura-cb-0.1.7.tar.gz) = 6971
Index: plugins/djvu/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- plugins/djvu/Makefile 3 Mar 2017 09:41:01 -0000 1.6
+++ plugins/djvu/Makefile 9 Jan 2018 16:29:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2017/03/03 09:41:01 landry Exp $
-V = 0.2.6
+V = 0.2.7
COMMENT = djvu plugin for zathura
DISTNAME = zathura-djvu-${V}
Index: plugins/djvu/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- plugins/djvu/distinfo 3 Mar 2017 09:41:01 -0000 1.3
+++ plugins/djvu/distinfo 9 Jan 2018 16:29:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-djvu-0.2.6.tar.gz) =
rv72o7cC+gYUXxbyVZSQ9NltMga6/U4MeKwYR4jKwF8=
-SIZE (zathura-djvu-0.2.6.tar.gz) = 11137
+SHA256 (zathura-djvu-0.2.7.tar.gz) =
DW6UcKv6Oipnyazy9vzCYefAidWoEMJ6QQyDcr1ubuk=
+SIZE (zathura-djvu-0.2.7.tar.gz) = 10909
Index: plugins/mupdf/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- plugins/mupdf/Makefile 3 Mar 2017 09:41:01 -0000 1.10
+++ plugins/mupdf/Makefile 9 Jan 2018 16:29:14 -0000
@@ -1,6 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2017/03/03 09:41:01 landry Exp $
+# mupdf plugin 0.3.2 targets mupdf 1.12 API
V = 0.3.1
+REVISION = 0
COMMENT = mupdf pdf plugin for zathura
DISTNAME = zathura-pdf-mupdf-${V}
Index: plugins/poppler/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- plugins/poppler/Makefile 3 Mar 2017 09:41:02 -0000 1.7
+++ plugins/poppler/Makefile 9 Jan 2018 16:29:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.7 2017/03/03 09:41:02 landry Exp $
-V = 0.2.7
+V = 0.2.8
COMMENT = poppler pdf plugin for zathura
DISTNAME = zathura-pdf-poppler-${V}
Index: plugins/poppler/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- plugins/poppler/distinfo 3 Mar 2017 09:41:02 -0000 1.3
+++ plugins/poppler/distinfo 9 Jan 2018 16:29:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-pdf-poppler-0.2.7.tar.gz) =
mF5OTc5hQ/39JG54sMy+8NMriAnGpPCLtTovffvTg8A=
-SIZE (zathura-pdf-poppler-0.2.7.tar.gz) = 9610
+SHA256 (zathura-pdf-poppler-0.2.8.tar.gz) =
Qh1Xo5jZfIJkus7YdDeZ/exfLPmJs0qPQs8id/SppdQ=
+SIZE (zathura-pdf-poppler-0.2.8.tar.gz) = 9504
Index: plugins/ps/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/ps/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- plugins/ps/Makefile 3 Mar 2017 09:41:02 -0000 1.7
+++ plugins/ps/Makefile 9 Jan 2018 16:29:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.7 2017/03/03 09:41:02 landry Exp $
-V = 0.2.4
+V = 0.2.5
COMMENT = spectre postscript plugin for zathura
DISTNAME = zathura-ps-${V}
Index: plugins/ps/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/ps/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- plugins/ps/distinfo 3 Mar 2017 09:41:02 -0000 1.3
+++ plugins/ps/distinfo 9 Jan 2018 16:29:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-ps-0.2.4.tar.gz) = +5/H6ed2X7CqKTW5P/NmMzLQ2ITfNejQsep+Sx+gq9s=
-SIZE (zathura-ps-0.2.4.tar.gz) = 5980
+SHA256 (zathura-ps-0.2.5.tar.gz) = EvfmgpH52rIR8Vpxi36QrcWRbQJC+LFYUYJfpCS2k/Q=
+SIZE (zathura-ps-0.2.5.tar.gz) = 5845
