Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pdfpc: update to 4.6.0, fix build on powerpc #27119

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions graphics/pdfpc/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PortGroup github 1.0
PortGroup active_variants 1.1
PortGroup cmake 1.1

github.setup pdfpc pdfpc 4.5.0 v
github.setup pdfpc pdfpc 4.6.0 v

maintainers {gmx.de:Torsten.Maehne @maehne} openmaintainer

Expand All @@ -21,29 +21,37 @@ long_description ${description}\
the presentation. The input files processed by pdfpc are PDF documents, \
which can be created using nearly any of today's presentation software.

platforms darwin
license GPL-2+

homepage https://${github.author}.github.io/

checksums rmd160 2aa443ba7f47fbc4aaf9e23ce81534d72026affc \
sha256 3b1a393f36a1b0ddc29a3d5111d8707f25fb2dd2d93b0401ff1c66fa95f50294 \
size 7766521
github.tarball_from archive

depends_build-append path:bin/vala:vala \
port:pkgconfig
path:bin/pkg-config:pkgconfig
depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
path:lib/pkgconfig/poppler.pc:poppler \
port:libgee \
path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
port:discount \
path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk

cmake.out_of_source yes
port:qrencode

checksums rmd160 2c55ae8fad8e1ec208ae2e25d0187dbc3e7d1739 \
sha256 034aa0ffbaeacb87611792c4d02ad8cb8927b9edfcf5f2c542ac94dbddf8ce10 \
size 7754721
# https://github.com/pdfpc/pdfpc/pull/687
patchfiles-append 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768.patch

configure.args -DCMAKE_INSTALL_SYSCONFDIR=${prefix}/etc \
-DMDVIEW=off \
-DMOVIES=off

if {${configure.build_arch} ni [list ppc ppc64]} {
depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk

configure.args-delete -DMDVIEW=off
}

pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
error "Either +x11 or +quartz is required"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768 Mon Sep 17 00:00:00 2001
From: Evgeny Stambulchik <[email protected]>
Date: Tue, 25 Apr 2023 16:11:25 +0300
Subject: [PATCH] Create Lists of nullable types

---
src/classes/drawings/drawing_commands.vala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/classes/drawings/drawing_commands.vala b/src/classes/drawings/drawing_commands.vala
index 77e56e6d..c305a8c5 100644
--- src/classes/drawings/drawing_commands.vala
+++ src/classes/drawings/drawing_commands.vala
@@ -54,8 +54,8 @@ namespace pdfpc {
}

public void clear() {
- this.drawing_commands = new List<DrawingCommand>();
- this.redo_commands = new List<DrawingCommand>();
+ this.drawing_commands = new List<DrawingCommand?>();
+ this.redo_commands = new List<DrawingCommand?>();
}

public void add_line(bool is_eraser,
@@ -70,7 +70,7 @@ namespace pdfpc {

// After adding a new line you can no longer redo the old
// path.
- this.redo_commands = new List<DrawingCommand>(); // clear
+ this.redo_commands = new List<DrawingCommand?>(); // clear

bool new_path = true;
double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img
Loading