a previous update moved the definition of all keybindings to pdfpcrc which,

if you didn't previously have this file installed (e.g. in ~/.config/pdfpc/pdfpcrc),
it would seem as if all keybindings broke.
fix this by installing the defalut config file to /etc (as hinted to by pdfpcrc(5))
which can still be overriden by a user's local config

regen WANTLIB and remove unused -DMANDIR while here

reminded by espie@
This commit is contained in:
jasper 2020-02-13 19:08:01 +00:00
parent cc66566235
commit ecae08d250
4 changed files with 36 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2019/11/03 15:40:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2020/02/13 19:08:01 jasper Exp $
COMMENT= presenter console with multi-monitor support
@ -6,6 +6,7 @@ GH_ACCOUNT= pdfpc
GH_PROJECT= pdfpc
GH_TAGNAME= v4.3.4
PKGNAME= pdfpc-${GH_TAGNAME:S/v//:S/-/./:S/_/./}
REVISION= 0
CATEGORIES= textproc
@ -17,7 +18,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gee-0.8 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3
WANTLIB += gstbase-1.0 gstreamer-1.0 gstvideo-1.0 m pango-1.0
WANTLIB += pangocairo-1.0 poppler-glib X11 intl
WANTLIB += pangocairo-1.0 poppler-glib X11 intl harfbuzz
MODULES= devel/cmake
@ -28,11 +29,13 @@ LIB_DEPENDS= devel/libgee \
print/poppler \
x11/gtk+3
CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man" \
-DX11_LIBRARY_DIRS="${X11BASE}/lib"
CONFIGURE_ARGS= -DX11_LIBRARY_DIRS="${X11BASE}/lib"
NO_TEST= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/man/pdfpcrc.in ${WRKSRC}/src/paths.in
post-install:
mv ${PREFIX}/etc ${PREFIX}/share/examples/pdfpc

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-man_pdfpcrc_in,v 1.1 2020/02/13 19:08:01 jasper Exp $
Index: man/pdfpcrc.in
--- man/pdfpcrc.in.orig
+++ man/pdfpcrc.in
@@ -160,7 +160,7 @@ option black-on-end true
.SH FILES
.PP
-.B @SYSCONFDIR@/pdfpcrc
+.B ${SYSCONFDIR}/pdfpcrc
.RS 4
System-wide configuration file
.RE

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_paths_in,v 1.1 2020/02/13 19:08:01 jasper Exp $
Index: src/paths.in
--- src/paths.in.orig
+++ src/paths.in
@@ -1,6 +1,6 @@
namespace pdfpc.Paths {
public const string ICON_PATH = "@CMAKE_INSTALL_PREFIX@/share/pixmaps/pdfpc/";
public const string SOURCE_PATH = "@CMAKE_SOURCE_DIR@";
- public const string CONF_PATH = "@CMAKE_INSTALL_FULL_SYSCONFDIR@";
+ public const string CONF_PATH = "${SYSCONFDIR}";
}

View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.6 2019/01/07 19:03:30 jasper Exp $
@comment $OpenBSD: PLIST,v 1.7 2020/02/13 19:08:01 jasper Exp $
@bin bin/pdfpc
@man man/man1/pdfpc.1
@man man/man5/pdfpcrc.5
share/examples/pdfpc/
share/examples/pdfpc/pdfpcrc
@sample ${SYSCONFDIR}/pdfpcrc
share/pixmaps/
share/pixmaps/pdfpc/
share/pixmaps/pdfpc/blank.svg