From ca9eb8eee37736e4ae2d493136597e1edb3f813d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Sun, 30 Oct 2022 14:04:45 +0100 Subject: [PATCH 1/5] poppler: 22.08.0 -> 22.09.0 https://lists.freedesktop.org/archives/poppler/2022-August/015313.html https://gitlab.freedesktop.org/poppler/poppler/-/compare/poppler-22.08.0...poppler-22.09.0 CVE-2022-38784 --- pkgs/development/libraries/poppler/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 8ff218b79316..a4311e7fcd05 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , fetchFromGitLab , cairo , cmake @@ -43,28 +42,20 @@ let owner = "poppler"; repo = "test"; rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435"; - sha256 = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; + hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; }; in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "22.09.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs="; + hash = "sha256-16j3SCETWcrbd0uj4Y7NpkZLNAJwRcBkjrMNWFKkHi4="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-38784.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch"; - sha256 = "sha256-M12zaHxcgQB/37tHffllqzd+Juq9BH5gpKVGaRY00vI="; - }) - ]; - nativeBuildInputs = [ cmake ninja From 085e1f9e3f1c8c3ba9d6e627d2359299fd7f421c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Sun, 30 Oct 2022 14:05:32 +0100 Subject: [PATCH 2/5] inkscape: fix for Poppler 22.09 --- pkgs/applications/graphics/inkscape/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 83fd78c63134..8a40bac446e8 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cairo , cmake , fetchurl +, fetchpatch , gettext , ghostscript , glib @@ -78,6 +79,12 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with Poppler 22.09 + (fetchpatch { + url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch"; + sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc="; + }) ]; postPatch = '' From 969a4732ff033ea83440faef766661c64e47cb43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Sun, 30 Oct 2022 14:05:27 +0100 Subject: [PATCH 3/5] scribus: fix for Poppler 22.09 --- pkgs/applications/office/scribus/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d40c96ef486a..16e65d283645 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -63,6 +63,11 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; }) + # For Poppler 22.09 + (fetchpatch { + url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch"; + sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM="; + }) ]; nativeBuildInputs = [ From 30a7d57f6a6a3d3a7775cba2f24a6e98d6022635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Sun, 30 Oct 2022 14:05:42 +0100 Subject: [PATCH 4/5] rnote: 0.5.4 -> 0.5.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Robert Schütz --- pkgs/applications/graphics/rnote/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index b5964adbbca9..eb0eaaeda95d 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , alsa-lib , appstream-glib +, clang +, cmake , desktop-file-utils , gio-sharp , glib @@ -22,24 +24,26 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4="; + hash = "sha256-w4y+t8idcaNwvC2Wp9SRjcd4m23Zt+yHG2fjOA2rBU8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA="; + hash = "sha256-Hybbbokru4vz5ly3oZuNGdBa+lYbhdYjESUpRxIUqJc="; }; nativeBuildInputs = [ appstream-glib # For appstream-util + clang + cmake desktop-file-utils # For update-desktop-database meson ninja @@ -52,6 +56,8 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; + dontUseCmakeConfigure = true; + buildInputs = [ alsa-lib gio-sharp @@ -63,6 +69,8 @@ stdenv.mkDerivation rec { poppler ]; + LIBCLANG_PATH = "${clang.cc.lib}/lib"; + postPatch = '' pushd build-aux chmod +x meson_post_install.py From a06429504b67debf3f50f55d1a6d6d3721031be1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Nov 2022 12:56:43 +0100 Subject: [PATCH 5/5] =?UTF-8?q?poppler:=2022.09.0=20=E2=86=92=2022.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/poppler/2022-October/015332.html https://gitlab.freedesktop.org/poppler/poppler/-/compare/poppler-22.09.0...poppler-22.10.0 https://lists.freedesktop.org/archives/poppler/2022-November/015346.html https://gitlab.freedesktop.org/poppler/poppler/-/compare/poppler-22.10.0...poppler-22.11.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index a4311e7fcd05..ccae3037e092 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "22.09.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-16j3SCETWcrbd0uj4Y7NpkZLNAJwRcBkjrMNWFKkHi4="; + hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg="; }; nativeBuildInputs = [