Update to pdfpc-4.3.4 and unbreak with new vala.

This commit is contained in:
ajacoutot 2019-11-03 15:40:15 +00:00
parent 4c38ff9324
commit 7abcffe305
7 changed files with 107 additions and 10 deletions

View File

@ -1,37 +1,39 @@
# $OpenBSD: Makefile,v 1.20 2019/07/12 20:50:10 sthen Exp $
# $OpenBSD: Makefile,v 1.21 2019/11/03 15:40:15 ajacoutot Exp $
COMMENT= presenter console with multi-monitor support
GH_ACCOUNT= pdfpc
GH_PROJECT= pdfpc
GH_TAGNAME= v4.3.2
GH_TAGNAME= v4.3.4
PKGNAME= pdfpc-${GH_TAGNAME:S/v//:S/-/./:S/_/./}
REVISION= 0
CATEGORIES= textproc
HOMEPAGE= https://pdfpc.github.io/
# GPLv2+
PERMIT_PACKAGE= Yes
MODULES= devel/cmake
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
MODULES= devel/cmake
BUILD_DEPENDS= lang/vala
LIB_DEPENDS= devel/libgee \
multimedia/gstreamer1/plugins-base \
print/poppler \
x11/gtk+3
CONFIGURE_ARGS+= -DMANDIR="${PREFIX}/man" \
-DSYSCONFDIR="${PREFIX}/share/examples/pdfpc" \
CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man" \
-DX11_LIBRARY_DIRS="${X11BASE}/lib"
NO_TEST= Yes
post-install:
mv ${PREFIX}/etc ${PREFIX}/share/examples/pdfpc
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pdfpc-4.3.2.tar.gz) = RLSH6iB7rIg2ThNlcNTUuq7AjP0TiONHf7UqNrbFfyk=
SIZE (pdfpc-4.3.2.tar.gz) = 107504
SHA256 (pdfpc-4.3.4.tar.gz) = zDzNeiOZC3bdYIPndNKPY9cmqG2zp/GAsckFlrc11e0=
SIZE (pdfpc-4.3.4.tar.gz) = 107458

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_classes_action_action_mapping_vala,v 1.1 2019/11/03 15:40:15 ajacoutot Exp $
From bbc16b97ecbdcdd22c2dc827a5c0e8b569073312 Mon Sep 17 00:00:00 2001
From: Evgeny Stambulchik <fnevgeny@gmail.com>
Date: Sun, 4 Aug 2019 13:13:48 +0300
Subject: [PATCH] Make constructors of abstract classes protected
Index: src/classes/action/action_mapping.vala
--- src/classes/action/action_mapping.vala.orig
+++ src/classes/action/action_mapping.vala
@@ -48,7 +48,7 @@ namespace pdfpc {
* methods, and we need blank objects to call them. Thus, this blank
* constructor.
*/
- public ActionMapping() {
+ protected ActionMapping() {
base();
}

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_classes_drawings_storage_vala,v 1.1 2019/11/03 15:40:15 ajacoutot Exp $
From bbc16b97ecbdcdd22c2dc827a5c0e8b569073312 Mon Sep 17 00:00:00 2001
From: Evgeny Stambulchik <fnevgeny@gmail.com>
Date: Sun, 4 Aug 2019 13:13:48 +0300
Subject: [PATCH] Make constructors of abstract classes protected
Index: src/classes/drawings/storage.vala
--- src/classes/drawings/storage.vala.orig
+++ src/classes/drawings/storage.vala
@@ -35,7 +35,7 @@ namespace pdfpc.Drawings.Storage {
*/
protected Metadata.Pdf metadata;
- public Base(Metadata.Pdf metadata) {
+ protected Base(Metadata.Pdf metadata) {
this.metadata = metadata;
}

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_classes_renderer_cache_base_vala,v 1.1 2019/11/03 15:40:15 ajacoutot Exp $
From bbc16b97ecbdcdd22c2dc827a5c0e8b569073312 Mon Sep 17 00:00:00 2001
From: Evgeny Stambulchik <fnevgeny@gmail.com>
Date: Sun, 4 Aug 2019 13:13:48 +0300
Subject: [PATCH] Make constructors of abstract classes protected
Index: src/classes/renderer/cache/base.vala
--- src/classes/renderer/cache/base.vala.orig
+++ src/classes/renderer/cache/base.vala
@@ -37,7 +37,7 @@ namespace pdfpc.Renderer.Cache {
/**
* Initialize the cache store
*/
- public Base(Metadata.Pdf metadata) {
+ protected Base(Metadata.Pdf metadata) {
this.metadata = metadata;
}

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_classes_timer_label_vala,v 1.1 2019/11/03 15:40:15 ajacoutot Exp $
From bbc16b97ecbdcdd22c2dc827a5c0e8b569073312 Mon Sep 17 00:00:00 2001
From: Evgeny Stambulchik <fnevgeny@gmail.com>
Date: Sun, 4 Aug 2019 13:13:48 +0300
Subject: [PATCH] Make constructors of abstract classes protected
Index: src/classes/timer_label.vala
--- src/classes/timer_label.vala.orig
+++ src/classes/timer_label.vala
@@ -95,7 +95,7 @@ namespace pdfpc {
* Default constructor taking the initial time as argument, as well as
* the time to countdown until the talk actually starts.
*/
- public TimerLabel(PresentationController controller, time_t start_time = 0) {
+ protected TimerLabel(PresentationController controller, time_t start_time = 0) {
this.controller = controller;
this.start_time = start_time;
}

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_classes_view_behaviour_base_vala,v 1.1 2019/11/03 15:40:15 ajacoutot Exp $
From bbc16b97ecbdcdd22c2dc827a5c0e8b569073312 Mon Sep 17 00:00:00 2001
From: Evgeny Stambulchik <fnevgeny@gmail.com>
Date: Sun, 4 Aug 2019 13:13:48 +0300
Subject: [PATCH] Make constructors of abstract classes protected
Index: src/classes/view/behaviour/base.vala
--- src/classes/view/behaviour/base.vala.orig
+++ src/classes/view/behaviour/base.vala
@@ -41,7 +41,7 @@ namespace pdfpc.View {
/**
* Base constructor not taking any arguments
*/
- public Base() {
+ protected Base() {
// Nothing to do here
}