git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #149570 from r-ryantm/auto-update/poppler-glib

poppler: 21.06.1 -> 22.01.0

commit8152911f615ae29021a1da614d4b3d0129bcd012 authorJan Tojnar <jtojnar@gmail.com> dateFri 28 Jan 2022, 11:42 (5 years ago) parent469039446c4275
5 files changed+36−9
compare with master
unifiedsplit
pkgs/applications/graphics/inkscape/default.nix+8 pkgs/applications/office/scribus/unstable.nix+5 pkgs/data/misc/poppler-data/default.nix+16−6 pkgs/development/libraries/gdal/default.nix+5−1 pkgs/development/libraries/poppler/default.nix+2−2
pkgs/applications/graphics/inkscape/default.nix+8
@@ -81,6 +81,14 @@ stdenv.mkDerivation rec {
8181 stripLen = 1;
8282 extraPrefix = "share/extensions/";
8383 })
84+
85+ # Fix build with Poppler 21.11.0.
86+ # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622
87+ (fetchpatch {
88+ url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch";
89+ sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg=";
90+ })
91+
8492 # Remove mandatory break from end of paragraphs, added in Pango 1.49
8593 # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630
8694 # TODO: Remove in Inkscape 1.1.2
pkgs/applications/office/scribus/unstable.nix+5
@@ -83,6 +83,11 @@ mkDerivation rec {
8383 qttools
8484 ];
8585
86+ cmakeFlags = [
87+ # poppler uses std::optional
88+ "-DWANT_CPP17=ON"
89+ ];
90+
8691 meta = with lib; {
8792 maintainers = with maintainers; [
8893 erictapen
pkgs/data/misc/poppler-data/default.nix+16−6
@@ -1,20 +1,30 @@
1−{ fetchurl, lib, stdenv, cmake, ninja }:
1+{ fetchurl
2+, lib
3+, stdenv
4+, cmake
5+, ninja
6+, poppler
7+}:
28
39stdenv.mkDerivation rec {
4− name = "poppler-data-0.4.11";
10+ pname = "poppler-data";
11+ version = "0.4.11";
512
613 src = fetchurl {
7− url = "https://poppler.freedesktop.org/${name}.tar.gz";
8− sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw=";
14+ url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz";
15+ sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw=";
916 };
1017
11− nativeBuildInputs = [ cmake ninja ];
18+ nativeBuildInputs = [
19+ cmake
20+ ninja
21+ ];
1222
1323 meta = with lib; {
1424 homepage = "https://poppler.freedesktop.org/";
1525 description = "Encoding files for Poppler, a PDF rendering library";
1626 platforms = platforms.all;
1727 license = licenses.free; # more free licenses combined
18− maintainers = with maintainers; [ ];
28+ maintainers = poppler.meta.maintainers;
1929 };
2030}
pkgs/development/libraries/gdal/default.nix+5−1
@@ -62,7 +62,11 @@ stdenv.mkDerivation rec {
6262
6363 hardeningDisable = [ "format" ];
6464
65− CXXFLAGS = "-fpermissive";
65+ CXXFLAGS = lib.concatStringsSep " " [
66+ "-fpermissive"
67+ # poppler uses std::optional
68+ "-std=c++17"
69+ ];
6670
6771 # - Unset CC and CXX as they confuse libtool.
6872 # - teach gdal that libdf is the legacy name for libhdf
pkgs/development/libraries/poppler/default.nix+2−2
@@ -34,13 +34,13 @@ let
3434in
3535stdenv.mkDerivation rec {
3636 pname = "poppler-${suffix}";
37− version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
37+ version = "22.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
3838
3939 outputs = [ "out" "dev" ];
4040
4141 src = fetchurl {
4242 url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
43− sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ=";
43+ sha256 = "sha256-fTSTBWtbhkE+XGk8LK4CxcBs2OYY0UwsMeLIS2eyMT4=";
4444 };
4545
4646 nativeBuildInputs = [