Merge branch '3.4' into 3.5

btrfs-progs/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dUD5CfhE/BrHyN1VtFneUMawa9AG/txaPDbZJKr2kBOfv+vyPmzJjrYmqoRNG6jbPApyD+MDpiX0p398O/bSQU=
-SHA256 (Pkgfile) = 957bd30e58fa782344b5e42301ca9adfc565c3797f1ad8f0492915c1c482f61d
+RWSE3ohX2g5d/WO/aMX+GLarODg+TZ1diNVbPfGtMcFGc8QxBADxqoYCU0y2fKiCsn3JnNxIm1rYwGnu6T3be66jkDXWKaTj4Qk=
+SHA256 (Pkgfile) = b37352205e95d62d8b6c0992d74d3a3adf0680a4025da2c6467373867cb9afc4
 SHA256 (.footprint) = 1e8f0a75a7956263ec2553990c0dbf035e9e43736ced7efe9bdfa248cbe11668
-SHA256 (btrfs-progs-v4.19.1.tar.xz) = 04d82af5cf479d139299a8f13ec0921f9578ca444e81ec0202f01a20d2bcefb8
+SHA256 (btrfs-progs-v4.20.tar.xz) = 96a4209ea9b3ea8dacbca04a467babf3422b7aee9532d923957c6af28e5f7d3d

btrfs-progs/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  lzo zstd
 
 name=btrfs-progs
-version=4.19.1
+version=4.20
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz)
 

cups-filters/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fNgTpY5w5vYnZyE8lLJhUIIjao3rBenNZezbCiPmN+TVUQUm/E0orGudiYLaR0vxNKF2evX57XVgZ34NFvx7QI=
-SHA256 (Pkgfile) = e70e5cc464c62dd0d39e6a49b16091b3f9cdb49afc6c531541de576aaddf9048
+RWSE3ohX2g5d/XU/aKBOHPUHQbKHfSxHxFFwfIVMi/E8tLZ53qHIEHlj5gx855RRJlgc9CQjOewXf0oVqb5Mp8ZcoV5pGv50Xw4=
+SHA256 (Pkgfile) = d25765ffde6085690353dc13f4c3e5abae29d15c53f51fdde4bcb6ba98351379
 SHA256 (.footprint) = 32c7827b0a711a571ef4e2b7eb7812ed42a3b8f8e590cdbe949fa60a5b3978d5
-SHA256 (cups-filters-1.21.6.tar.xz) = 630e5dbcfe4fa50a726b193223604831a928a2fac9ef84022118aa05c84d1d4c
+SHA256 (cups-filters-1.22.0.tar.xz) = 443747f24ac5213b720f3fd873730931acb4f5e3ff006bca3931e476de18bb3d
 SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b

cups-filters/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  ghostscript poppler qpdf mupdf
 
 name=cups-filters
-version=1.21.6
+version=1.22.0
 release=1
 source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz
         cups-browsed)

cups-filters/poppler-0.67.0.patch

@@ -1,25 +0,0 @@
-From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 20 Jul 2018 15:20:11 +0200
-Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0
-
-This only fails with >=poppler-0.67.0 but the change to const was done
-in 0.64.0
----
- filter/pdf.cxx | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/filter/pdf.cxx b/filter/pdf.cxx
-index 206ccf88..665eab09 100644
---- a/filter/pdf.cxx
-+++ b/filter/pdf.cxx
-@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt)
-         }
- 
-         FormField *ff = fm_text->getField();
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64
-+        const
-+#endif
-         GooString *field_name;
-         field_name = ff->getFullyQualifiedName();
-         if ( ! field_name )