From 1febbc71850f8e0a1e09c76a23a9e2ea80ff2070 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Fri, 12 Dec 2025 18:50:50 +0100
Subject: [PATCH 1/2] xournalpp: 1.2.10 -> 1.3.0

---
 pkgs/by-name/xo/xournalpp/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix
index 11f21e9c1004..ef0a067b4f4f 100644
--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -7,6 +7,7 @@
   gettext,
   wrapGAppsHook3,
   pkg-config,
+  help2man,
 
   adwaita-icon-theme,
   alsa-lib,
@@ -22,6 +23,7 @@
   pcre,
   poppler,
   portaudio,
+  qpdf,
   zlib,
   # plugins
   withLua ? true,
@@ -31,25 +33,21 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.2.10";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     rev = "v${version}";
-    hash = "sha256-3M7ycbwKSmu8WUqC3anAi6GLPOex7gEndw/tDv0Ri7Q=";
+    hash = "sha256-ds86+Tw3fSAUVs83g5z/7grv8HEzVKYDWUwvY6nGaug=";
   };
 
-  postPatch = ''
-    substituteInPlace src/util/Stacktrace.cpp \
-      --replace-fail "addr2line" "${binutils}/bin/addr2line"
-  '';
-
   nativeBuildInputs = [
     cmake
     gettext
     pkg-config
     wrapGAppsHook3
+    help2man
   ];
 
   buildInputs =
@@ -68,6 +66,7 @@ stdenv.mkDerivation rec {
       pcre
       poppler
       portaudio
+      qpdf
       zlib
     ]
     ++ lib.optional withLua lua5_3;

From b53f87473650f652801266902765f60d74a8cd73 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Mon, 22 Dec 2025 14:24:19 +0100
Subject: [PATCH 2/2] xournalpp: 1.3.0 -> 1.3.1

---
 pkgs/by-name/xo/xournalpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix
index ef0a067b4f4f..07dbc6019dce 100644
--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     rev = "v${version}";
-    hash = "sha256-ds86+Tw3fSAUVs83g5z/7grv8HEzVKYDWUwvY6nGaug=";
+    hash = "sha256-yPuApAmhopMWKROUUsok9rULDVtqXC6WIfm2GEevQkw=";
   };
 
   nativeBuildInputs = [