From e1ac49b55ecb0fcb9126ae7b7b0cada20a6be0bf Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sat, 20 Mar 2021 22:33:39 -0400
Subject: [okular]: upgrade to v20.12.3

---
 libre/okular/PKGBUILD          | 44 ++++++++++++++++++++++++------------------
 libre/okular/disable-drm.patch | 13 +++++++++++++
 libre/okular/libre.patch       | 13 -------------
 3 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 libre/okular/disable-drm.patch
 delete mode 100644 libre/okular/libre.patch

diff --git a/libre/okular/PKGBUILD b/libre/okular/PKGBUILD
index e5652e177..c4e0138e3 100644
--- a/libre/okular/PKGBUILD
+++ b/libre/okular/PKGBUILD
@@ -1,51 +1,57 @@
-# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Maintainer (arch): Felix Yan <felixonmars@archlinux.org>
+# Maintainer (arch): Antonio Rojas <arojas@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
+
+# parabola changes and rationale:
+# - disable DRM
+# - replace non-free optdepends
+
+
 pkgname=okular
-pkgver=20.04.0
+pkgver=20.12.3
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Document Viewer'
-pkgdesc+=', with copy-protection anti-feature turned off by default and without nonfree unrar recommendation'
+pkgdesc+=', with copy-protection anti-feature disabled, without nonfree recommendations'
 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 kpty kactivities threadweaver kjs kparts purpose discount phonon-qt5)
+groups=(kde-applications kde-graphics)
+depends=(djvulibre libspectre libkexiv2 poppler-qt5 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})
-source+=('libre.patch')
-sha256sums=('1b6521b4eaa0a0eb41a39c3f84252d9833f6d26fa410afaef815ec661737dfe7'
-            'SKIP'
-            '83cf760b3ae6e03d49e02369375dae3ecc05a6800d512dd9ffeaac1648c19457')
+source+=(disable-drm.patch)
+sha256sums=('ae570fcd2b35cc9c061c1c55b6f8de256358f0f5dd8d0a8283f13eae006b73dc'
+            'SKIP')
+sha256sums+=('83cf760b3ae6e03d49e02369375dae3ecc05a6800d512dd9ffeaac1648c19457')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
+              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 options=(!zipman)
 
 prepare() {
   mkdir -p build
-
   cd $pkgname-$pkgver
-  patch -Np1 -i "$srcdir"/libre.patch
+
+  echo "applying disable-drm.patch"
+  patch -Np1 -i "$srcdir"/disable-drm.patch
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/libre/okular/disable-drm.patch b/libre/okular/disable-drm.patch
new file mode 100644
index 000000000..ebc801a6a
--- /dev/null
+++ b/libre/okular/disable-drm.patch
@@ -0,0 +1,13 @@
+diff --git a/conf/okular_core.kcfg b/conf/okular_core.kcfg
+index 35aaa9d..7593409 100644
+--- a/conf/okular_core.kcfg
++++ b/conf/okular_core.kcfg
+@@ -59,7 +59,7 @@
+  </group>
+  <group name="Core General" >
+   <entry key="ObeyDRM" type="Bool" >
+-   <default>true</default>
++   <default>false</default>
+   </entry>
+   <entry key="ChooseGenerators" type="Bool" >
+    <default>false</default>
diff --git a/libre/okular/libre.patch b/libre/okular/libre.patch
deleted file mode 100644
index ebc801a6a..000000000
--- a/libre/okular/libre.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/conf/okular_core.kcfg b/conf/okular_core.kcfg
-index 35aaa9d..7593409 100644
---- a/conf/okular_core.kcfg
-+++ b/conf/okular_core.kcfg
-@@ -59,7 +59,7 @@
-  </group>
-  <group name="Core General" >
-   <entry key="ObeyDRM" type="Bool" >
--   <default>true</default>
-+   <default>false</default>
-   </entry>
-   <entry key="ChooseGenerators" type="Bool" >
-    <default>false</default>
-- 
cgit v1.2.2