[gentoo-commits] repo/gentoo:master commit in: app-misc/pdfpc/, app-misc/pdfpc/files/

[gentoo-commits] repo/gentoo:master commit in: app-misc/pdfpc/, app-misc/pdfpc/files/

[Ulrich Müller]

commit:     02089febeadb875ef39ba0cc66609f9c8679e258
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 07:45:44 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 07:50:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02089feb

app-misc/pdfpc: Fix compile failure with USE=-gstreamer

Closes: https://bugs.gentoo.org/904241
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-misc/pdfpc/files/pdfpc-4.6.0-no-movies.patch | 59 ++++++++++++++++++++++++
 app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild             |  2 +
 2 files changed, 61 insertions(+)

diff --git a/app-misc/pdfpc/files/pdfpc-4.6.0-no-movies.patch b/app-misc/pdfpc/files/pdfpc-4.6.0-no-movies.patch
new file mode 100644
index 000000000000..9767dc2a8093
--- /dev/null
+++ b/app-misc/pdfpc/files/pdfpc-4.6.0-no-movies.patch
@@ -0,0 +1,59 @@
+https://github.com/pdfpc/pdfpc/issues/672
+https://bugs.gentoo.org/904241
+
+commit a6501085b3e94eb4a01db18fe9dc15d51fcde3a3
+Author: Evgeny Stambulchik <fnevgeny@gmail.com>
+Date:   Sat, 11 Feb 2023 23:04:19 +0200
+
+    Skip MOVIE actions when configured with -DMOVIES
+
+--- a/src/classes/action/link_action.vala
++++ b/src/classes/action/link_action.vala
+@@ -47,6 +47,7 @@
+             this.action = mapping.action.copy();
+         }
+ 
++#if MOVIES
+         /**
+          * Find movie on the current slide by its filename; there seems to be
+          * no better way with the current Glib Poppler bindings.
+@@ -71,6 +72,7 @@
+ 
+             return null;
+         }
++#endif
+ 
+         /**
+          * Create from the LinkMapping if the link is an internal link to a named
+@@ -91,6 +93,7 @@
+                     return new_obj as ActionMapping;
+                 }
+                 break;
++#if MOVIES
+             case Poppler.ActionType.MOVIE:
+                 unowned var movie_action = (Poppler.ActionMovie*) mapping.action;
+                 var movie = movie_action.movie;
+@@ -100,6 +103,7 @@
+                     return new_obj as ActionMapping;
+                 }
+                 break;
++#endif
+             default:
+                 break;
+             }
+@@ -167,6 +171,7 @@
+                 this.controller.switch_to_slide_number(slide_number);
+ 
+                 break;
++#if MOVIES
+             case Poppler.ActionType.MOVIE:
+                 unowned var action = (Poppler.ActionMovie*) this.action;
+                 var movie = action.movie;
+@@ -192,6 +197,7 @@
+                     }
+                 }
+                 break;
++#endif
+             default:
+                 return false;
+             }

diff --git a/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild b/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild
index 884855a57e36..c5e511d5a6f4 100644
--- a/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild
@@ -55,6 +55,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="$(vala_depend)"
 
+PATCHES=("${FILESDIR}/${P}-no-movies.patch")
+
 DOCS=(
 	CHANGELOG.rst
 	FAQ.rst

[gentoo-commits] repo/gentoo:master commit in: app-misc/pdfpc/, app-misc/pdfpc/files/

[Ulrich Müller]

commit:     b7cfd017933a1a2d9eb86fec0ab79625e0abb016
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 19:00:25 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 19:02:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7cfd017

app-misc/pdfpc: Fix build failure with vala-0.56.7

Closes: https://bugs.gentoo.org/904970
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-misc/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch | 31 ++++++++++++++++++++++
 app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild               |  5 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app-misc/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch b/app-misc/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
new file mode 100644
index 000000000000..9aff761b471f
--- /dev/null
+++ b/app-misc/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
@@ -0,0 +1,31 @@
+https://github.com/pdfpc/pdfpc/issues/686
+https://bugs.gentoo.org/904970
+
+commit 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768
+Author: Evgeny Stambulchik <fnevgeny@gmail.com>
+Date:   Tue, 25 Apr 2023 16:11:25 +0300
+
+    Create Lists of nullable types
+
+--- a/src/classes/drawings/drawing_commands.vala
++++ b/src/classes/drawings/drawing_commands.vala
+@@ -54,8 +54,8 @@
+         }
+ 
+         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 @@
+ 
+             // 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

diff --git a/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild b/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild
index c5e511d5a6f4..0b9adbde79e7 100644
--- a/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.6.0-r1.ebuild
@@ -55,7 +55,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="$(vala_depend)"
 
-PATCHES=("${FILESDIR}/${P}-no-movies.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-no-movies.patch"
+	"${FILESDIR}/${P}-vala-0.56.7.patch"
+)
 
 DOCS=(
 	CHANGELOG.rst