[arch-commits] Commit in pdfpc/trunk (PKGBUILD deb888677.patch)

[Jiachen Yang]

    Date: Wednesday, May 30, 2018 @ 06:44:01
  Author: farseerfc
Revision: 333289

upgpkg: pdfpc 4.1.2-2

pdfpc 4.1.2-2 fix video playback FS#58786

Added:
  pdfpc/trunk/deb888677.patch
Modified:
  pdfpc/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   17 ++++++++++-------
 deb888677.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-30 06:43:59 UTC (rev 333288)
+++ PKGBUILD	2018-05-30 06:44:01 UTC (rev 333289)
@@ -5,7 +5,7 @@
 pkgname=pdfpc
 pkgver=4.1.2
 _pkgver=$pkgver
-pkgrel=1
+pkgrel=2
 pkgdesc='A presenter console with multi-monitor support for PDF files'
 arch=('x86_64')
 url='https://pdfpc.github.io/'
@@ -14,18 +14,21 @@
 optdepends=('gst-plugins-good: more codecs for video playback support'
             'gst-libav: more codecs for video playback support')
 makedepends=('cmake' 'vala')
-source=("$pkgname-$_pkgver.tar.gz::https://github.com/pdfpc/pdfpc/archive/v$_pkgver.tar.gz")
+source=("$pkgname-$_pkgver.tar.gz::https://github.com/pdfpc/pdfpc/archive/v$_pkgver.tar.gz"
+"deb888677.patch::https://github.com/pdfpc/pdfpc/commit/21e4efb3afe325fe7e2f800d1c22fd1bc28bc3d7.patch")
 #"pr317.patch::https://github.com/pdfpc/pdfpc/commit/e120f098db8ab3b79f76d33640ac413053a61d71.patch")
 #"pr277.patch::https://github.com/pdfpc/pdfpc/commit/202abb5d2f9095689fbdf295c796ea57bcd0e934.patch")
 
-sha256sums=('0fcacd0deac39d93e21fc152b0cb01279b4ba209934fe385be6811236a03c87d')
+sha256sums=('0fcacd0deac39d93e21fc152b0cb01279b4ba209934fe385be6811236a03c87d'
+            '8546c86cbcbf24491c9f44f7fd294de144b3bee57725cea8827e0006239ebcef')
             #'090f4dbeb1ca8fc3775c243af1173479fd31e40b25b40d63b136b34dc8a86712')
             #'376f33bdd919a15564ebec25e48e97aadd42cf386ade5b5362ddaddc773ac1fa')
 
-#prepare() {
-#    cd "$srcdir/$pkgname-$_pkgver"
-#    patch -p1 <../pr317.patch
-#}
+prepare() {
+    cd "$srcdir/$pkgname-$_pkgver"
+    patch -p1 <../deb888677.patch ## reverse the pr344 to fix video playback
+    ## see https://bugs.archlinux.org/task/58786
+}
 
 build() {
     cd "$srcdir/$pkgname-$_pkgver"

Added: deb888677.patch
===================================================================
--- deb888677.patch	                        (rev 0)
+++ deb888677.patch	2018-05-30 06:44:01 UTC (rev 333289)
@@ -0,0 +1,30 @@
+From 21e4efb3afe325fe7e2f800d1c22fd1bc28bc3d7 Mon Sep 17 00:00:00 2001
+From: Andreas Bilke <andreas at bilke.org>
+Date: Wed, 23 May 2018 19:51:00 +0200
+Subject: [PATCH] Fix regression introduced in
+ 13e3b372711fdc94acdb26be69ef0cf1465911ed
+
+See Debian Bug 888677.
+---
+ src/classes/metadata/pdf.vala | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/classes/metadata/pdf.vala b/src/classes/metadata/pdf.vala
+index 30493e3..0e3c253 100644
+--- a/src/classes/metadata/pdf.vala
++++ b/src/classes/metadata/pdf.vala
+@@ -442,10 +442,12 @@ namespace pdfpc.Metadata {
+                                 note_text += "\n";
+                             }
+                             note_text += a.get_contents();
++
++                            // Remove the annotation to avoid its rendering
++                            page.remove_annot(a);
++
+                             break;
+                     }
+-                    // Remove the annotation to avoid its rendering
+-                    page.remove_annot(a);
+                 }
+                 if (note_text != "") {
+                     this.notes.set_note(note_text, user_slide, true);