From d3dc331732929343ce6c3ac7d474e56f4a6d477e Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Wed, 14 Mar 2018 10:53:24 +0100
Subject: libre/okular: updated to 17.12.3

---
 libre/okular/PKGBUILD                              | 24 ++++++++++++----------
 libre/okular/libre.patch                           | 13 ++++++++++++
 .../turn_off_copy-protection_anti-feature.patch    | 13 ------------
 3 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 libre/okular/libre.patch
 delete mode 100644 libre/okular/turn_off_copy-protection_anti-feature.patch

(limited to 'libre')

diff --git a/libre/okular/PKGBUILD b/libre/okular/PKGBUILD
index 42e93ba94..3c20596bc 100644
--- a/libre/okular/PKGBUILD
+++ b/libre/okular/PKGBUILD
@@ -1,15 +1,18 @@
-# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
+# Contributor (Arch): 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>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=okular
-pkgver=17.12.1
-pkgrel=1.parabola1
-pkgdesc='Document Viewer, with copy-protection anti-feature turned off by default'
-arch=(x86_64 i686 armv7h)
+pkgver=17.12.3
+pkgrel=1
+pkgrel+=.parabola1
+pkgdesc='Document Viewer'
+pkgdesc+=', with copy-protection anti-feature turned off by default'
+arch=(x86_64)
+arch+=(i686 armv7h)
 url="https://kde.org/applications/graphics/okular/"
 license=(GPL LGPL FDL)
 groups=(kde-applications kdegraphics)
@@ -20,9 +23,9 @@ optdepends=('ebook-tools: mobi and epub support' 'discount: markdown 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}
-        'turn_off_copy-protection_anti-feature.patch')
-sha256sums=('123b21e101dc5eb222989affd81336ed2b41903ee0712762a6464faa4e2d5165'
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source+=('libre.patch')
+sha256sums=('0a12549c2d90c13b8fa0838707924596eb12981bffc3a5b81410785a4e9e061d'
             'SKIP'
             '83cf760b3ae6e03d49e02369375dae3ecc05a6800d512dd9ffeaac1648c19457')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
@@ -32,13 +35,12 @@ prepare() {
   mkdir -p build
 
   cd $pkgname-$pkgver
-  patch -Np1 -i "$srcdir"/turn_off_copy-protection_anti-feature.patch
+  patch -Np1 -i "$srcdir"/libre.patch
 }
 
 build() {
   cd build
   cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_TESTING=OFF
diff --git a/libre/okular/libre.patch b/libre/okular/libre.patch
new file mode 100644
index 000000000..ebc801a6a
--- /dev/null
+++ b/libre/okular/libre.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/turn_off_copy-protection_anti-feature.patch b/libre/okular/turn_off_copy-protection_anti-feature.patch
deleted file mode 100644
index ebc801a6a..000000000
--- a/libre/okular/turn_off_copy-protection_anti-feature.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.3