$ git diff --patch-with-stat --summary c8c0dfd1348848ec3fd86e90f2c7c5f0ca38fc70..b14a512fbe13da99fc239e286b49922fadc93558
...ape-1.1.2-fix-build-with-poppler-22.03.patch-r1 | 50 +++++++++
inkscape-1.1.2-fix-build-with-poppler-22.04.patch | 115 +++++++++++++++++++++
inkscape.spec | 5 +-
3 files changed, 169 insertions(+), 1 deletion(-)
create mode 100644 inkscape-1.1.2-fix-build-with-poppler-22.03.patch-r1
create mode 100644 inkscape-1.1.2-fix-build-with-poppler-22.04.patch
diff --git a/inkscape-1.1.2-fix-build-with-poppler-22.03.patch-r1 b/inkscape-1.1.2-fix-build-with-poppler-22.03.patch-r1
new file mode 100644
index 0000000..bf29f75
--- /dev/null
+++ b/inkscape-1.1.2-fix-build-with-poppler-22.03.patch-r1
@@ -0,0 +1,50 @@
+From f7857a4fc2b916e64d9689ccc89914ad19f3ef0a Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 20 Mar 2022 22:41:51 -0300
+Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
+
+This change ensures that Inkscape will build against Poppler 22.03 after
+the changes that were made to the constructor of `PDFDoc`.
+
+See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
+
+Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
+(cherry picked from commit a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75)
+---
+ src/extension/internal/pdfinput/pdf-input.cpp | 3 +--
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index e6204f650c..82b0d97765 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -668,8 +668,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+
+ // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+ // glib gstdio.c
+- GooString *filename_goo = new GooString(uri);
+- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
+
+ if (!pdf_doc->isOk()) {
+ int error = pdf_doc->getErrorCode();
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 87a19d4c42..50b617c25c 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
++#else
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+ #define _POPPLER_CONST_83 const
+ #else
+--
+GitLab
diff --git a/inkscape-1.1.2-fix-build-with-poppler-22.04.patch b/inkscape-1.1.2-fix-build-with-poppler-22.04.patch
new file mode 100644
index 0000000..5e52328
--- /dev/null
+++ b/inkscape-1.1.2-fix-build-with-poppler-22.04.patch
@@ -0,0 +1,115 @@
+From ed4ce8adbd7099a4612932045a7a20117584d8ac Mon Sep 17 00:00:00 2001
+From: Rafael Siejakowski <rs@rs-math.net>
+Date: Mon, 4 Apr 2022 22:09:39 -0300
+Subject: [PATCH] Compatibility with Poppler 22.04
+
+Replace vanilla pointers with std::shared_ptr for pointers to fonts;
+eliminate manual ref-counting.
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 12 +++++++-----
+ .../internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
+ 3 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index feecefa043..789671e848 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -30,6 +30,7 @@
+ #include "Gfx.h"
+ #include "pdf-parser.h"
+ #include "util/units.h"
++#include "poppler-transition-api.h"
+
+ #include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
+ // TODO not good that numArgs is ignored but args[] is used:
+ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ {
+- GfxFont *font = res->lookupFont(args[0].getName());
++ auto font = res->lookupFont(args[0].getName());
+
+ if (!font) {
+ // unsetting the font (drawing no text) is better than using the
+@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ fflush(stdout);
+ }
+
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ font->incRefCnt();
++#endif
+ state->setFont(font, args[1].getNum());
+ fontChanged = gTrue;
+ }
+@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
+ #else
+ void PdfParser::doShowText(GooString *s) {
+ #endif
+- GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+ CharCode code;
+@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
+ #endif
+ int len, n, uLen;
+
+- font = state->getFont();
++ auto font = state->getFont();
+ wMode = font->getWMode();
+
+ builder->beginString(state);
+@@ -2445,8 +2447,8 @@ void PdfParser::doShowText(GooString *s) {
+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
+ if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
+ code, u, uLen)) {*/
+- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
+- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
++ _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)_POPPLER_FONT_RAW_PTR(font))->getCharProc, code);
++ if ((resDict = ((Gfx8BitFont *)_POPPLER_FONT_RAW_PTR(font))->getResources())) {
+ pushResources(resDict);
+ }
+ if (charProc.isStream()) {
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 50b617c25c..6dae2c71c1 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 4, 0)
++#define _POPPLER_FONT_RAW_PTR(font_ptr) font_ptr.get()
++#else
++#define _POPPLER_FONT_RAW_PTR(font_ptr) font_ptr
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 3, 0)
+ #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
+ #else
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index eede668893..904c1505ad 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1068,7 +1068,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ //sp_repr_css_attr_unref(_font_style);
+ }
+ _font_style = sp_repr_css_attr_new();
+- GfxFont *font = state->getFont();
++ auto font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+ _font_specification = font->getName()->getCString();
+@@ -1213,7 +1213,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ sp_repr_css_set_property(_font_style, "writing-mode", "tb");
+ }
+
+- _current_font = font;
++ _current_font = _POPPLER_FONT_RAW_PTR(font);
+ _invalidated_style = true;
+ }
+
+--
+GitLab
diff --git a/inkscape.spec b/inkscape.spec
index be64f17..82cc662 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -9,7 +9,7 @@
Summary: A vector-based drawing program using SVG
Name: inkscape
Version: 1.1.2
-Release: 1
+Release: 2
License: GPLv2+
Group: Graphics
Url: http://inkscape.sourceforge.net/
@@ -17,6 +17,9 @@ Source0: https://inkscape.org/gallery/item/31668/inkscape-%{version}.tar.xz
Source1: %{name}-icons.tar.bz2
Source100: inkscape.rpmlintrc
+Patch0: inkscape-1.1.2-fix-build-with-poppler-22.03.patch-r1
+Patch1: inkscape-1.1.2-fix-build-with-poppler-22.04.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gdk-pixbuf2.0
BuildRequires: intltool