Merge branch 'poppler' into 'master'

Bump poppler and rebuild rdeps

* `poppler` was bumped from `0.74.0` to `0.77.0`. Due to a soname bump the reverse dependencies were rebuilt:

    ```
    atril
    calligra
    cups-filters
    evince
    tumbler
    ```
    Notably absent is `libreoffice` which is being upgraded separately.

* Likewise with `poppler-qt5`. There was not a soname bump here, but [one of the intermediate versions still appears to have had some ABI changes](https://abi-laboratory.pro/index.php?view=objects_report&l=poppler&v1=0.76.0&v2=0.76.1), so these packages were rebuilt as well:

    ```
    kfilemetadata
    krita
    okular
    qpdfview
    tellico
    ```
* `exiv2` was bumped from `0.26` to `0.27.1`, which entailed a soname bump. These packages were rebuilt (there is some overlap here with the above, thus inclusion in this MR):

    ```
    gwenview
    kfilemetadata
    kphotoalbum
    krita
    libkexiv2
    ```

See merge request !255

20 files changed, 143 insertions, 368 deletions

diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD
index ac04541d5..5fd885123 100644
--- a/user/atril/APKBUILD
+++ b/user/atril/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=atril
 pkgver=1.22.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Document viewer for the MATE desktop environment"
 url="https://mate-desktop.org"
 arch="all"
@@ -12,7 +12,7 @@ depends=""
 makedepends="caja-dev djvulibre-dev gobject-introspection-dev gtk+3.0-dev
 	intltool itstool libgxps-dev libsecret-dev libsm-dev libspectre-dev
 	libxml2-dev libxml2-utils poppler-dev python3 tiff-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/1.22/atril-$pkgver.tar.xz"
 
 build() {
diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD
index a17bf9711..306299ae0 100644
--- a/user/calligra/APKBUILD
+++ b/user/calligra/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=calligra
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Office suite"
 url="https://www.calligra.org/"
 arch="all"
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index 7ebfd4e0d..db56726fe 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=cups-filters
 pkgver=1.22.5
-pkgrel=0
+pkgrel=1
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 arch="all"
diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD
index 9f8ba5d66..a98bf2cf9 100644
--- a/user/evince/APKBUILD
+++ b/user/evince/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=evince
 pkgver=3.32.0
-pkgrel=0
+pkgrel=1
 pkgdesc="GNOME document viewer"
 url="https://wiki.gnome.org/Apps/Evince"
 arch="all"
diff --git a/user/exiv2/0000-pthread-init-fix.patch b/user/exiv2/0000-pthread-init-fix.patch
deleted file mode 100644
index ac69b14c1..000000000
--- a/user/exiv2/0000-pthread-init-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 620ef04e96f4c0d0894d976fc361588b6526a116 Mon Sep 17 00:00:00 2001
-From: clanmills <robin@clanmills.com>
-Date: Tue, 20 Jun 2017 20:41:30 +0100
-Subject: [PATCH] https://github.com/Exiv2/exiv2/issues/9 Fix submitted.
-
----
- src/actions.cpp       | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/actions.cpp b/src/actions.cpp
-index 0ebe8505..17444c5b 100644
---- a/src/actions.cpp
-+++ b/src/actions.cpp
-@@ -2045,9 +2045,13 @@ namespace {
- #else
-  /* Unix/Linux/Cygwin/MacOSX */
-  #include <pthread.h>
-+ /* This is the critical section object (statically allocated). */
-  #if defined(__APPLE__)
--  /* This is the critical section object (statically allocated). */
--  static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
-+  #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-+    static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
-+   #else
-+    static pthread_mutex_t cs =  PTHREAD_MUTEX_INITIALIZER;
-+  #endif
-  #else
-   static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-  #endif
diff --git a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch b/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
deleted file mode 100644
index 86412532d..000000000
--- a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d775683f579543c35463ab2a8d9425da10d2f016 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Wed, 4 Oct 2017 00:15:30 -0500
-Subject: [PATCH] Amend fix for #9 to apply to other Unix systems
-
-At least the musl libc on Linux has the same issue as Mac OS X: the
-PTHREAD_RECURSIVE_* static initialiser does not exist.  This is a
-documented and purposeful omission:
-
-http://www.openwall.com/lists/musl/2017/02/20/3
-
-This commit uses similar logic to the Apple test on other Unixes.
----
- src/actions.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/actions.cpp b/src/actions.cpp
-index fe14de4..aa15ec7 100644
---- a/src/actions.cpp
-+++ b/src/actions.cpp
-@@ -2051,7 +2051,11 @@ namespace {
-     static pthread_mutex_t cs =  PTHREAD_MUTEX_INITIALIZER;
-   #endif
-  #else
--  static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+  #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-+    static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+   #else
-+    static pthread_mutex_t cs =  PTHREAD_MUTEX_INITIALIZER;
-+  #endif
-  #endif
- #endif
- 
--- 
-2.10.0
-
diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD
index 7cf8693fe..963fe871c 100644
--- a/user/exiv2/APKBUILD
+++ b/user/exiv2/APKBUILD
@@ -1,47 +1,101 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=exiv2
-pkgver=0.26
-pkgrel=2
+pkgver=0.27.1
+pkgrel=0
 pkgdesc="Exif, IPTC and XMP metadata library and tools"
 url="https://www.exiv2.org/"
 arch="all"
-options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
 depends_dev="expat-dev zlib-dev"
-makedepends="$depends_dev bash"
+makedepends="$depends_dev bash cmake"
+checkdepends="python3 libxml2 cmd:which"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.exiv2.org/builds/exiv2-$pkgver-trunk.tar.gz
-	0000-pthread-init-fix.patch
-	0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
-	CVE-2018-19535.patch
-	"
-builddir="$srcdir"/exiv2-trunk
+source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver-Source"
 
 # secfixes:
 #   0.26-r2:
 #     - CVE-2018-19535
+#   0.27.1-r0:
+#     - CVE-2017-9239
+#     - CVE-2017-9953
+#     - CVE-2017-11336
+#     - CVE-2017-11337
+#     - CVE-2017-11338
+#     - CVE-2017-11339
+#     - CVE-2017-11340
+#     - CVE-2017-11553
+#     - CVE-2017-11591
+#     - CVE-2017-11592
+#     - CVE-2017-11683
+#     - CVE-2017-12955
+#     - CVE-2017-12956
+#     - CVE-2017-12957
+#     - CVE-2017-14857
+#     - CVE-2017-14858
+#     - CVE-2017-14859
+#     - CVE-2017-14860
+#     - CVE-2017-14861
+#     - CVE-2017-14862
+#     - CVE-2017-14863
+#     - CVE-2017-14864
+#     - CVE-2017-14865
+#     - CVE-2017-14866
+#     - CVE-2017-17669
+#     - CVE-2017-17722
+#     - CVE-2017-17723
+#     - CVE-2017-17724
+#     - CVE-2017-17725
+#     - CVE-2017-18005
+#     - CVE-2017-1000126
+#     - CVE-2017-1000127
+#     - CVE-2017-1000128
+#     - CVE-2018-4868
+#     - CVE-2018-5772
+#     - CVE-2018-8976
+#     - CVE-2018-8977
+#     - CVE-2018-9145
+#     - CVE-2018-10772
+#     - CVE-2018-10780
+#     - CVE-2018-10958
+#     - CVE-2018-10998
+#     - CVE-2018-10999
+#     - CVE-2018-11037
+#     - CVE-2018-11531
+#     - CVE-2018-12264
+#     - CVE-2018-12265
+#     - CVE-2018-14046
+#     - CVE-2018-14338
+#     - CVE-2018-16336
+#     - CVE-2018-17229
+#     - CVE-2018-17230
+#     - CVE-2018-17282
+#     - CVE-2018-17581
+#     - CVE-2018-19107
+#     - CVE-2018-19108
 
 prepare() {
-	cd "$builddir"
 	default_prepare
-	update_config_sub
+	mkdir build
 }
+
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
+	cd "$builddir/build"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 	make
 }
 
+check() {
+	cd "$builddir/build"
+	make tests
+}
+
 package() {
-	cd "$builddir"
+	cd "$builddir/build"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86  exiv2-0.26-trunk.tar.gz
-9721d359708c385be7c86a8f8a63de43b05b2578a29b4339861e82873aa81a98a7ee7252847b6c55529341187d40f552c488589b416fd9d1e27418925929c018  0000-pthread-init-fix.patch
-485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce  0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
-ac145a9b4df21e7f5fdd3099e6ae4c1e12ae2cdccc455d0262c5d38b8e07ce6437036a19264bd04b1cb1fffd01d89672044ca82fddd5e71dcd0d84d48356ab12  CVE-2018-19535.patch"
+sha512sums="038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529  exiv2-0.27.1-Source.tar.gz"
diff --git a/user/exiv2/CVE-2018-19535.patch b/user/exiv2/CVE-2018-19535.patch
deleted file mode 100644
index ba9355012..000000000
--- a/user/exiv2/CVE-2018-19535.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 03173751b4d7053d6ddf52a15904e8f751f78f56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
-Date: Sun, 2 Sep 2018 14:39:52 +0200
-Subject: [PATCH 2/5] Fix bug in PngChunk::readRawProfile
-
-- Now it takes into account text.size_ when searching for a newline
-char.
----
- src/pngchunk.cpp | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
-index 58281b3ff..755872c94 100644
---- a/src/pngchunk.cpp
-+++ b/src/pngchunk.cpp
-@@ -629,11 +629,19 @@ namespace Exiv2 {
- 
- 
-         sp = (char*)text.pData_+1;
-+        int pointerPos = 1;
- 
-         // Look for newline
--
--        while (*sp != '\n')
-+        while (*sp != '\n' && pointerPos < (text.size_ - 1))
-+        {
-             sp++;
-+            pointerPos++;
-+        }
-+
-+        if (pointerPos == (text.size_ - 1))
-+        {
-+            return DataBuf();
-+        }
- 
-         // Look for length
- 
-
-From cf3ba049a2792ec2a4a877e343f5dd9654da53dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
-Date: Mon, 3 Sep 2018 08:51:08 +0200
-Subject: [PATCH 3/5] Fix more issues in PngChunk::readRawProfile
-
----
- src/pngchunk.cpp | 36 +++++++++++++-----------
- 1 file changed, 20 insertions(+), 16 deletions(-)
-
-diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
-index 755872c94..9b3faf1aa 100644
---- a/src/pngchunk.cpp
-+++ b/src/pngchunk.cpp
-@@ -606,11 +606,6 @@ namespace Exiv2 {
-     DataBuf PngChunk::readRawProfile(const DataBuf& text,bool iTXt)
-     {
-         DataBuf                 info;
--        register long           i;
--        register unsigned char *dp;
--        const char             *sp;
--        unsigned int            nibbles;
--        long                    length;
-         unsigned char           unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-                                             0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-                                             0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0,
-@@ -627,8 +622,7 @@ namespace Exiv2 {
-             return  info;
-         }
- 
--
--        sp = (char*)text.pData_+1;
-+        const char *sp = (char*)text.pData_+1;
-         int pointerPos = 1;
- 
-         // Look for newline
-@@ -638,20 +632,30 @@ namespace Exiv2 {
-             pointerPos++;
-         }
- 
-+        // Look for length
-+        while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1))
-+        {
-+            sp++;
-+            pointerPos++;
-+        }
-+
-         if (pointerPos == (text.size_ - 1))
-         {
-             return DataBuf();
-         }
- 
--        // Look for length
-+        long length = (long) atol(sp);
- 
--        while (*sp == '\0' || *sp == ' ' || *sp == '\n')
-+        while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1))
-+        {
-             sp++;
-+            pointerPos++;
-+        }
- 
--        length = (long) atol(sp);
--
--        while (*sp != ' ' && *sp != '\n')
--            sp++;
-+        if (pointerPos == (text.size_ - 1))
-+        {
-+            return DataBuf();
-+        }
- 
-         // Allocate space
- 
-@@ -674,10 +678,10 @@ namespace Exiv2 {
- 
-         // Copy profile, skipping white space and column 1 "=" signs
- 
--        dp      = (unsigned char*)info.pData_;
--        nibbles = length * 2;
-+        unsigned char *dp = (unsigned char*)info.pData_;
-+        unsigned int nibbles = length * 2;
- 
--        for (i = 0; i < (long) nibbles; i++)
-+        for (long i = 0; i < (long) nibbles; i++)
-         {
-             while (*sp < '0' || (*sp > '9' && *sp < 'a') || *sp > 'f')
-             {
-
-From 8b480bc5b2cc2abb8cf6fe4e16c24e58916464d2 Mon Sep 17 00:00:00 2001
-From: Robin Mills <robin@clanmills.com>
-Date: Mon, 10 Sep 2018 20:54:53 +0200
-Subject: [PATCH 4/5] Fixes in PngChunk::readRawProfile
-
----
- src/pngchunk.cpp | 55 ++++++++++++++++++++++----------------------
- 1 file changed, 27 insertions(+), 28 deletions(-)
-
-diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
-index 9b3faf1aa..f81b560aa 100644
---- a/src/pngchunk.cpp
-+++ b/src/pngchunk.cpp
-@@ -607,11 +607,11 @@ namespace Exiv2 {
-     {
-         DataBuf                 info;
-         unsigned char           unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
--                                            0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
--                                            0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0,
--                                            0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
--                                            0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12,
--                                            13,14,15};
-+            0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-+            0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0,
-+            0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
-+            0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12,
-+            13,14,15};
-         if (text.size_ == 0) {
-             return DataBuf();
-         }
-@@ -622,52 +622,51 @@ namespace Exiv2 {
-             return  info;
-         }
- 
--        const char *sp = (char*)text.pData_+1;
--        int pointerPos = 1;
-+        const char *sp  = (char*) text.pData_+1;          // current byte (space pointer)
-+        const char *eot = (char*) text.pData_+text.size_; // end of text
- 
-         // Look for newline
--        while (*sp != '\n' && pointerPos < (text.size_ - 1))
-+        while (*sp != '\n' && sp < eot )
-         {
-             sp++;
--            pointerPos++;
-+            if ( sp == eot )
-+            {
-+                return DataBuf();
-+            }
-         }
-+        sp++ ; // step over '\n'
- 
-         // Look for length
--        while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1))
-+        while ( (*sp == '\0' || *sp == ' ' || *sp == '\n') && sp < eot )
-         {
-             sp++;
--            pointerPos++;
--        }
--
--        if (pointerPos == (text.size_ - 1))
--        {
--            return DataBuf();
-+            if (sp == eot )
-+            {
-+                return DataBuf();
-+            }
-         }
- 
--        long length = (long) atol(sp);
--
--        while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1))
-+        const char* startOfLength = sp;
-+        while ( ('0' <= *sp && *sp <= '9') && sp < eot)
-         {
-             sp++;
--            pointerPos++;
-+            if (sp == eot )
-+            {
-+                return DataBuf();
-+            }
-         }
-+        sp++ ; // step over '\n'
- 
--        if (pointerPos == (text.size_ - 1))
--        {
--            return DataBuf();
--        }
-+        long length = (long) atol(startOfLength);
- 
-         // Allocate space
--
-         if (length == 0)
-         {
- #ifdef DEBUG
-             std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: invalid profile length\n";
- #endif
-         }
--
-         info.alloc(length);
--
-         if (info.size_ != length)
-         {
- #ifdef DEBUG
-@@ -678,7 +677,7 @@ namespace Exiv2 {
- 
-         // Copy profile, skipping white space and column 1 "=" signs
- 
--        unsigned char *dp = (unsigned char*)info.pData_;
-+        unsigned char *dp = (unsigned char*)info.pData_; // decode pointer
-         unsigned int nibbles = length * 2;
- 
-         for (long i = 0; i < (long) nibbles; i++)
-
diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD
index 5038f3ae6..479d9ed1a 100644
--- a/user/gwenview/APKBUILD
+++ b/user/gwenview/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gwenview
 pkgver=19.04.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast and easy image viewer by KDE"
 url="https://www.kde.org/applications/graphics/gwenview/"
 arch="all"
diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD
index 2dea1fd5f..c772977b2 100644
--- a/user/kfilemetadata/APKBUILD
+++ b/user/kfilemetadata/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kfilemetadata
 pkgver=5.54.0
-pkgrel=1
+pkgrel=2
 pkgdesc="File metadata extraction framework"
 url="https://www.kde.org/"
 arch="all"
diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD
index c8c83d7f4..e47058f3d 100644
--- a/user/kphotoalbum/APKBUILD
+++ b/user/kphotoalbum/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kphotoalbum
 pkgver=5.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Versatile photo album software by KDE"
 url="https://www.kphotoalbum.org/"
 arch="all"
diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD
index 5023c7619..bbe0c9797 100644
--- a/user/krita/APKBUILD
+++ b/user/krita/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krita
 pkgver=4.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Digital painting program by KDE"
 url="https://krita.org/"
 arch="all"
diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD
index 36ef18b69..d49285c0f 100644
--- a/user/libkexiv2/APKBUILD
+++ b/user/libkexiv2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libkexiv2
 pkgver=19.04.2
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE integration with Exiv2 EXIF data library"
 url="https://www.KDE.org/"
 arch="all"
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index 5f44334bb..5f204c6b1 100644
--- a/user/okular/APKBUILD
+++ b/user/okular/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=okular
 pkgver=19.04.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Universal document reader developed by KDE"
 url="https://okular.kde.org/"
 arch="all"
diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD
index 6e2993bd6..c549987d8 100644
--- a/user/openjpeg/APKBUILD
+++ b/user/openjpeg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=openjpeg
 pkgver=2.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Open-source implementation of JPEG 2000 image codec"
 url="http://www.openjpeg.org/"
 arch="all"
@@ -18,7 +18,7 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DOPENJPEG_INSTALL_LIB_DIR=lib \
-		-DOPENJPEG_INSTALL_PACKAGE_DIR=/usr/lib/cmake/$pkgname-${pkgver%.*}
+		-DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*}
 	make
 }
 
diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD
index 8e62189f4..5c0bbf4c8 100644
--- a/user/poppler-qt5/APKBUILD
+++ b/user/poppler-qt5/APKBUILD
@@ -1,40 +1,62 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=poppler-qt5
 _realname=poppler
-pkgver=0.74.0
+pkgver=0.77.0
 pkgrel=0
+_testver=01c92874
 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)"
 url="https://poppler.freedesktop.org/"
 arch="all"
-options="!check"  # Test data not included in tarball
 license="GPL-2.0+"
 makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev
 	qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev"
 depends=""
 depends_dev="$makedepends"
 subpackages="$pkgname-dev"
-source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
-builddir="$srcdir"/$_realname-$pkgver
+source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz
+	https://dev.sick.bike/dist/poppler-test-$_testver.tar.gz"
+builddir="$srcdir"/$_realname-$pkgver/build
+
+# secfixes: poppler
+#   0.77.0-r0:
+#     - CVE-2019-9200
+#     - CVE-2019-9631
+#     - CVE-2019-9903
+#     - CVE-2019-10872
+#     - CVE-2019-10873
+#     - CVE-2019-11026
+#     - CVE-2019-12293
 
 prepare() {
-	mkdir -p build
+	default_prepare
+	mkdir "$builddir"
 }
 
 build() {
-	cd "$builddir"/build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DTESTDATADIR="$srcdir/poppler-test-$_testver" \
 		..
 	make
 }
 
+check() {
+	# check_qt5_annotations: fails on ppc64 and x86_64 as of 0.77.0-r0
+	# FAIL!  : TestAnnotations::checkFontSizeAndColor() Compared values are not the same
+	#   Actual   (textAnnot->contents()): "\u00C3\u00BE\u00C3\u00BF\u0000f\u0000o\u0000o\u0000b\u0000a\u0000r"
+	#   Expected (contents)             : "foobar"
+	#   Loc: [src/poppler-0.77.0/qt5/tests/check_annotations.cpp(100)]
+	ctest --output-on-failure \
+		-E check_qt5_annotations
+}
+
 package() {
-	cd "$builddir"/build
 	install -D -m644 poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc
 	cd qt5
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66  poppler-0.74.0.tar.xz"
+sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040  poppler-0.77.0.tar.xz
+5275541ffa0fef9c55a0c02411947c610b2e7eb621f0a0fa9529810f8b09e2b0194c1da4b64eb9641b2c3af7b099e6bb7d1212b9087a21cf3af893090a10506b  poppler-test-01c92874.tar.gz"
diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD
index b1a6bf526..9c3385c8d 100644
--- a/user/poppler/APKBUILD
+++ b/user/poppler/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: 
 pkgname=poppler
-pkgver=0.74.0
+pkgver=0.77.0
 pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="https://poppler.freedesktop.org/"
 arch="all"
-options="!check"  # Test data is available in Git only.
+options="!check"  # Tests only cover Qt5 component.
 license="GPL-2.0+"
 depends=""
 depends_dev="cairo-dev glib-dev"
@@ -16,6 +16,16 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-glib"
 source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
 builddir="$srcdir"/$pkgname-$pkgver/build
 
+# secfixes:
+#   0.77.0-r0:
+#     - CVE-2019-9200
+#     - CVE-2019-9631
+#     - CVE-2019-9903
+#     - CVE-2019-10872
+#     - CVE-2019-10873
+#     - CVE-2019-11026
+#     - CVE-2019-12293
+
 prepare() {
 	default_prepare
 	mkdir "$builddir"
@@ -50,11 +60,4 @@ glib() {
 		"$subpkgdir"/usr/lib/
 }
 
-_cpp() {
-	pkgdesc="Pure C++ wrapper for poppler"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpoppler-cpp.so.* \
-		"$subpkgdir"/usr/lib/
-}
-
-sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66  poppler-0.74.0.tar.xz"
+sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040  poppler-0.77.0.tar.xz"
diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD
index 612cb251e..3f7876f4b 100644
--- a/user/qpdfview/APKBUILD
+++ b/user/qpdfview/APKBUILD
@@ -1,29 +1,29 @@
 # Contributor: Max Rees <maxcrees@me.com>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=qpdfview
-pkgver=0.4.16
-pkgrel=1
+pkgver=0.4.18_beta1
+_pkgver=0.4.18beta1
+pkgrel=0
 pkgdesc="A tabbed document viewer"
 url="https://launchpad.net/qpdfview"
 arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
-makedepends="cups-dev gnutls-dev poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev
-	qt5-qtsvg-dev"
+makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev
+	poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev qt5-qtsvg-dev"
 subpackages="$pkgname-doc"
-source="$url/trunk/$pkgver/+download/qpdfview-$pkgver.tar.gz"
+source="$url/trunk/$_pkgver/+download/qpdfview-$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 build() {
-	cd "$builddir"
 	lrelease qpdfview.pro
-	qmake CONFIG+="without_ps without_djvu" qpdfview.pro
+	qmake qpdfview.pro
 	make
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL_ROOT="$pkgdir" install
 }
 
-sha512sums="d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584  qpdfview-0.4.16.tar.gz"
+sha512sums="88c8f1a4a9f8d62ef4c073c50a7dfe57397a3c64621d3916578194c0aa6db3fc47c537652213c7851e70c2a655165fa4343f15ac615ba977c921648d7cfd834c  qpdfview-0.4.18beta1.tar.gz"
diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD
index f50676e5a..5af50c850 100644
--- a/user/tellico/APKBUILD
+++ b/user/tellico/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=tellico
 pkgver=3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Collection manager"
 url="http://tellico-project.org/"
 arch="all"
diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD
index 5c400ece4..2f5685df1 100644
--- a/user/tumbler/APKBUILD
+++ b/user/tumbler/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=tumbler
 pkgver=0.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Thumbnail generation service for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"