diff --git a/packages/pdf2djvu/build.sh b/packages/pdf2djvu/build.sh
index d3dfd8d8e..bf9ff9541 100644
--- a/packages/pdf2djvu/build.sh
+++ b/packages/pdf2djvu/build.sh
@@ -3,8 +3,12 @@ TERMUX_PKG_DESCRIPTION="PDF to DjVu converter"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.9.18.2
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/jwilk/pdf2djvu/releases/download/${TERMUX_PKG_VERSION}/pdf2djvu-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa
 TERMUX_PKG_DEPENDS="djvulibre, exiv2, libc++, libuuid, poppler"
 TERMUX_PKG_BUILD_IN_SRC=true
+
+termux_step_pre_configure() {
+	CXXFLAGS+=" -std=c++17"
+}
diff --git a/packages/pdf2djvu/pdf2djvu-0.9.18.2-poppler.patch b/packages/pdf2djvu/pdf2djvu-0.9.18.2-poppler.patch
new file mode 100644
index 000000000..b0b1b45d9
--- /dev/null
+++ b/packages/pdf2djvu/pdf2djvu-0.9.18.2-poppler.patch
@@ -0,0 +1,112 @@
+From e170ad557d5f13daeeac047dfaa79347bbe5062f Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Wed, 16 Feb 2022 09:08:11 +0000
+Subject: [PATCH] pdf-backend: fix compat with Poppler > 22.02.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+    pdf-backend.cc: In constructor ‘pdf::Document::Document(const string&)’:
+    pdf-backend.cc:133:64: error: no matching function for call to ‘PDFDoc::PDFDoc(pdf::String*, std::nullptr_t, std::nullptr_t)’
+
+https://cgit.freedesktop.org/poppler/poppler/commit/?id=07889cdfd8a261dc
+---
+ pdf-backend.cc | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/pdf-backend.cc b/pdf-backend.cc
+index 3c871b1..c74053d 100644
+--- a/pdf-backend.cc
++++ b/pdf-backend.cc
+@@ -129,8 +129,27 @@ void pdf::Environment::set_antialias(bool value)
+  * ===================
+  */
+ 
++template <typename T>
++class unique_ptr_adapter
++{
++protected:
++  std::unique_ptr<T> uptr;
++public:
++  unique_ptr_adapter(T *ptr)
++  : uptr(ptr)
++  { }
++  operator std::unique_ptr<T> ()
++  {
++    return std::move(this->uptr);
++  }
++  operator T* ()
++  {
++    return this->uptr.release();
++  }
++};
++
+ pdf::Document::Document(const std::string &file_name)
+-: ::PDFDoc(new pdf::String(file_name.c_str()), nullptr, nullptr)
++: ::PDFDoc(unique_ptr_adapter<pdf::String>(new pdf::String(file_name.c_str())), nullptr, nullptr)
+ {
+   if (!this->isOk())
+     throw LoadError();
+
+From 81b635e014ebd0240a8719cc39b6a1b759cc6a98 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Wed, 16 Feb 2022 09:10:28 +0000
+Subject: [PATCH] main: use pdf::link::Destination copy constructor.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+  main.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
+  main.cc:92:27: error: ‘const Destination’ {aka ‘const class LinkDest’} has no member named ‘copy’
+
+https://cgit.freedesktop.org/poppler/poppler/commit/?id=7a429c3cf9fba67e
+---
+ main.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main.cc b/main.cc
+index 2b42d16..bb5fd57 100644
+--- a/pdf2djvu.cc
++++ b/pdf2djvu.cc
+@@ -89,7 +89,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
+ #endif
+   }
+   else
+-    dest.reset(orig_dest->copy());
++    dest.reset(new pdf::link::Destination(*orig_dest));
+   if (dest.get() != nullptr)
+   {
+     int page;
+
+From 956fedc7e0831126b9006efedad5519c14201c52 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk@jwilk.net>
+Date: Thu, 17 Feb 2022 00:26:41 +0100
+Subject: [PATCH] pdf-backend: fix compat with Poppler > 22.02.
+
+Fixes:
+
+    pdf-backend.cc:152:3: error: no matching constructor for initialization of '::PDFDoc'
+    /usr/include/poppler/PDFDoc.h:132:14: note: candidate constructor not viable: no known conversion from 'nullptr_t' to 'const std::optional<GooString>' for 2nd argument
+
+https://cgit.freedesktop.org/poppler/poppler/commit/?id=4f2abd3efa1ee013
+---
+ pdf-backend.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pdf-backend.cc b/pdf-backend.cc
+index c74053d..ba85da2 100644
+--- a/pdf-backend.cc
++++ b/pdf-backend.cc
+@@ -149,7 +149,7 @@ class unique_ptr_adapter
+ };
+ 
+ pdf::Document::Document(const std::string &file_name)
+-: ::PDFDoc(unique_ptr_adapter<pdf::String>(new pdf::String(file_name.c_str())), nullptr, nullptr)
++: ::PDFDoc(unique_ptr_adapter<pdf::String>(new pdf::String(file_name.c_str())))
+ {
+   if (!this->isOk())
+     throw LoadError();
diff --git a/packages/pdf2svg/build.sh b/packages/pdf2svg/build.sh
index ae5df503d..1b71386f5 100644
--- a/packages/pdf2svg/build.sh
+++ b/packages/pdf2svg/build.sh
@@ -3,8 +3,12 @@ TERMUX_PKG_DESCRIPTION="A PDF to SVG converter"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.2.3
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://github.com/db9052/pdf2svg/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=4fb186070b3e7d33a51821e3307dce57300a062570d028feccd4e628d50dea8a
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="glib, libcairo, poppler"
+
+termux_step_pre_configure() {
+	CXXFLAGS+=" -std=c++17"
+}
diff --git a/packages/pdfgrep/build.sh b/packages/pdfgrep/build.sh
index 946daf92e..30042c42d 100644
--- a/packages/pdfgrep/build.sh
+++ b/packages/pdfgrep/build.sh
@@ -3,7 +3,11 @@ TERMUX_PKG_DESCRIPTION="Command line utility to search text in PDF files"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.1.2
-TERMUX_PKG_REVISION=9
+TERMUX_PKG_REVISION=10
 TERMUX_PKG_SRCURL=https://pdfgrep.org/download/pdfgrep-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba
 TERMUX_PKG_DEPENDS="libc++, libgcrypt, libgpg-error, pcre, poppler"
+
+termux_step_pre_configure() {
+	CXXFLAGS+=" -std=c++17"
+}
diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index 07058f898..e69b39476 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="PDF rendering library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=21.08.0
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_VERSION=22.04.0
 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d
+TERMUX_PKG_SHA256=813fb4b90e7bda63df53205c548602bae728887a60f4048aae4dbd9b1927deff
 TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, libc++, libcairo, libcurl, libiconv, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, openjpeg-tools, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_BREAKS="poppler-dev"
@@ -17,3 +16,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DENABLE_QT5=OFF
 -DFONT_CONFIGURATION=fontconfig
 "
+
+termux_step_pre_configure() {
+	CPPFLAGS+=" -DCMS_NO_REGISTER_KEYWORD"
+}
diff --git a/x11-packages/xournal/build.sh b/x11-packages/xournal/build.sh
index a4c1f7d61..7c1084ef5 100644
--- a/x11-packages/xournal/build.sh
+++ b/x11-packages/xournal/build.sh
@@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Notetaking and sketching application"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.4.8.2016
-TERMUX_PKG_REVISION=30
+TERMUX_PKG_REVISION=31
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/xournal/xournal-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
 TERMUX_PKG_DEPENDS="atk, desktop-file-utils, fontconfig, freetype, glib, gtk2, hicolor-icon-theme, libandroid-shmem, libart-lgpl, libcairo, libgnomecanvas, pango, poppler, libx11, shared-mime-info, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/locale"
 
 termux_step_pre_configure() {
+	CXXFLAGS+=" -std=c++17"
 	export LIBS="-Wl,--no-as-needed -landroid-shmem"
 }