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

[Jiachen Yang]

    Date: Sunday, October 14, 2018 @ 09:31:45
  Author: farseerfc
Revision: 393407

upgpkg: pdfpc 4.2-1

pdfpc 4.2

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

-----------------+
 PKGBUILD        |   20 ++++----------------
 deb888677.patch |   30 ------------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-14 09:17:52 UTC (rev 393406)
+++ PKGBUILD	2018-10-14 09:31:45 UTC (rev 393407)
@@ -2,9 +2,9 @@
 # Contributor: Andreas Bilke <andreas at bilke>
 
 pkgname=pdfpc
-pkgver=4.1.2
+pkgver=4.2
 _pkgver=$pkgver
-pkgrel=2
+pkgrel=1
 pkgdesc='A presenter console with multi-monitor support for PDF files'
 arch=('x86_64')
 url='https://pdfpc.github.io/'
@@ -13,22 +13,10 @@
 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"
-"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")
+source=("$pkgname-$_pkgver.tar.gz::https://github.com/pdfpc/pdfpc/archive/v$_pkgver.tar.gz")
 
-sha256sums=('0fcacd0deac39d93e21fc152b0cb01279b4ba209934fe385be6811236a03c87d'
-            '8546c86cbcbf24491c9f44f7fd294de144b3bee57725cea8827e0006239ebcef')
-            #'090f4dbeb1ca8fc3775c243af1173479fd31e40b25b40d63b136b34dc8a86712')
-            #'376f33bdd919a15564ebec25e48e97aadd42cf386ade5b5362ddaddc773ac1fa')
+sha256sums=('6a980415fd914a07e3a0b28c96a4b3e1e2541146869f2c8dd2e12e4ae3b9c2fb')
 
-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"
     cmake  -DCMAKE_INSTALL_PREFIX="/usr/" -DSYSCONFDIR="/etc" .

Deleted: deb888677.patch
===================================================================
--- deb888677.patch	2018-10-14 09:17:52 UTC (rev 393406)
+++ deb888677.patch	2018-10-14 09:31:45 UTC (rev 393407)
@@ -1,30 +0,0 @@
-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);