libre/okular: Sync with Arch Linux package version 19.12.3-3, update pkgdesc

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

1 files changed, 18 insertions, 15 deletions

diff --git a/libre/okular/PKGBUILD b/libre/okular/PKGBUILD
index 3c20596bc..a6b468476 100644
--- a/libre/okular/PKGBUILD
+++ b/libre/okular/PKGBUILD
@@ -6,34 +6,38 @@
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=okular
-pkgver=17.12.3
-pkgrel=1
+pkgver=19.12.3
+pkgrel=3
 pkgrel+=.parabola1
 pkgdesc='Document Viewer'
-pkgdesc+=', with copy-protection anti-feature turned off by default'
+pkgdesc+=', with copy-protection anti-feature turned off by default and without nonfree unrar recommendation'
 arch=(x86_64)
 arch+=(i686 armv7h)
 url="https://kde.org/applications/graphics/okular/"
 license=(GPL LGPL FDL)
 groups=(kde-applications kdegraphics)
-depends=(djvulibre libspectre libkexiv2 poppler-qt5 qca-qt5 kpty kactivities threadweaver kjs kparts purpose)
-makedepends=(extra-cmake-modules ebook-tools kdegraphics-mobipocket kdoctools khtml python chmlib discount)
-optdepends=('ebook-tools: mobi and epub support' 'discount: markdown support'
-            'kdegraphics-mobipocket: mobi support' 'kirigami2: mobile UI' 'libzip: CHM support'
-            'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support')
-conflicts=(kdegraphics-okular)
-replaces=(kdegraphics-okular)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+depends=(djvulibre libspectre libkexiv2 poppler-qt5 qca kpty kactivities threadweaver kjs kparts purpose discount phonon-qt5)
+makedepends=(extra-cmake-modules ebook-tools kdegraphics-mobipocket kdoctools khtml chmlib)
+optdepends=('ebook-tools: mobi and epub support'
+            'kdegraphics-mobipocket: mobi support' 'libzip: CHM support'
+            'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support'
+            'unarchiver: Comic Book Archive support')
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+         CVE-2020-9359.patch::"https://invent.kde.org/kde/okular/-/commit/6a93a033.patch")
 source+=('libre.patch')
-sha256sums=('0a12549c2d90c13b8fa0838707924596eb12981bffc3a5b81410785a4e9e061d'
+sha256sums=('c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0'
             'SKIP'
+            '58ab539871a68e36de81c80bcd0258a755b64e1cc210430ba60a0e8d5fb51a44'
             '83cf760b3ae6e03d49e02369375dae3ecc05a6800d512dd9ffeaac1648c19457')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
+options=(!zipman)
 
 prepare() {
   mkdir -p build
 
+  patch -d $pkgname-$pkgver -p1 -i "$srcdir"/CVE-2020-9359.patch
+
   cd $pkgname-$pkgver
   patch -Np1 -i "$srcdir"/libre.patch
 }
@@ -41,9 +45,8 @@ prepare() {
 build() {
   cd build
   cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
+    -DBUILD_TESTING=OFF \
+    -DBUILD_OKULARKIRIGAMI=OFF
   make
 }