From 8e7c58dc44e043f8629d5e96848ab594f684cbbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:04:04 +0000 Subject: [PATCH 1/5] =?UTF-8?q?poppler:=2021.06.1=20=E2=86=92=2022.01.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://lists.freedesktop.org/archives/poppler/2021-July/014803.html - https://lists.freedesktop.org/archives/poppler/2021-August/014836.html - https://lists.freedesktop.org/archives/poppler/2021-September/014870.html - https://lists.freedesktop.org/archives/poppler/2021-October/014910.html - https://lists.freedesktop.org/archives/poppler/2021-November/014954.html - https://lists.freedesktop.org/archives/poppler/2021-December/014991.html - https://lists.freedesktop.org/archives/poppler/2022-January/015023.html c++17 is now minimum --- 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 08ca1456ea8f..6fa07bcaf806 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ="; + sha256 = "sha256-fTSTBWtbhkE+XGk8LK4CxcBs2OYY0UwsMeLIS2eyMT4="; }; nativeBuildInputs = [ From 490b9b0fa0e7e90ca5bea9cfe79561a97a641530 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Dec 2021 10:44:31 +0100 Subject: [PATCH 2/5] poppler-data: clean up https://lists.freedesktop.org/archives/poppler/2021-September/014871.html --- pkgs/data/misc/poppler-data/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d1e0434dc286..6d35279b6de2 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,20 +1,30 @@ -{ fetchurl, lib, stdenv, cmake, ninja }: +{ fetchurl +, lib +, stdenv +, cmake +, ninja +, poppler +}: stdenv.mkDerivation rec { - name = "poppler-data-0.4.11"; + pname = "poppler-data"; + version = "0.4.11"; src = fetchurl { - url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; + url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; + sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ ]; + maintainers = poppler.meta.maintainers; }; } From c4b9851332bcef5e4554e306df791b3b4b14409a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Dec 2021 16:57:10 +0100 Subject: [PATCH 3/5] inkscape: fix build with Poppler 21.11.0 --- pkgs/applications/graphics/inkscape/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 24f3a555fd5a..271173a8b027 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + + # Fix build with Poppler 21.11.0. + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch"; + sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg="; + }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 # TODO: Remove in Inkscape 1.1.2 From d8bcc674c4bac48aedc7f421fcc2c3d0487a150a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Jan 2022 17:20:17 +0100 Subject: [PATCH 4/5] gdal: fix build with latest poppler Poppler 22.01.0 requires std=c++17: https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1027 --- pkgs/development/libraries/gdal/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 124c0a48cde6..3e5ae303dd77 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -62,7 +62,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = lib.concatStringsSep " " [ + "-fpermissive" + # poppler uses std::optional + "-std=c++17" + ]; # - Unset CC and CXX as they confuse libtool. # - teach gdal that libdf is the legacy name for libhdf From 46c427535a72a3bcd32c2e9ff0eafc0e9e399996 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Jan 2022 17:23:13 +0100 Subject: [PATCH 5/5] scribusUnstable: fix build with latest poppler Poppler 22.01.0 requires std=c++17: https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1027 It will be enforced in next release: https://github.com/scribusproject/scribus/commit/0b1abeff0891b0907cdccb4ae965541b24b611f8 --- pkgs/applications/office/scribus/unstable.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 6aed41d7f9af..21adb90cab9e 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -83,6 +83,11 @@ mkDerivation rec { qttools ]; + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ erictapen