Unverified Commit b069b7c1 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

poppler: 25.05.0 -> 25.07.0 (#424609)

parents 4235a5d0 a7e801b1

pkgs/applications/graphics/inkscape/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ stdenv.mkDerivation (finalAttrs: { 
      # Fix path to ps2pdf binary

      inherit ghostscript;

    })

    (fetchpatch {

      name = "fix-build-poppler-25.06.0.patch";

      url = "https://gitlab.com/inkscape/inkscape/-/commit/97bd8f29a61e691ceea98ca2444b974cf4256ae0.patch";

      hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";

    })

    (fetchpatch {

      name = "fix-build-poppler-25.07.0.patch";

      url = "https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch";

      hash = "sha256-3Yj+neSRSSQPeeZkHJ0P6v3Sis/lg9xiygktI6Z+zDY=";

    })

  ];



  postPatch = ''

pkgs/by-name/sc/scribus/package.nix

+10 −0
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ stdenv.mkDerivation (finalAttrs: { 
      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable";

      hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg=";

    })

    (fetchpatch {

      name = "fix-build-poppler-25.06.0.patch";

      url = "https://github.com/scribusproject/scribus/commit/8dcf8d777bd85a0741c455961f2de382e3ed47ec.patch";

      hash = "sha256-JBHCgvEJnYrUdtLnFSXTfr1FFin4uUNUnddYwfRbn7k=";

    })

    (fetchpatch {

      name = "fix-build-poppler-25.07.0.patch";

      url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch";

      hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk=";

    })

  ];



  meta = {

pkgs/development/libraries/poppler/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ let 
    domain = "gitlab.freedesktop.org";

    owner = "poppler";

    repo = "test";

    rev = "91ee031c882634c36f2f0f2f14eb6646dd542fb9";

    hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ=";

    rev = "c79c6839e859dbee6b73ac260788fa2de8618ba4";

    hash = "sha256-j66AsBUnFpO5athVgQmf4vcyXxYcJ/plJtHg+3vXG4Y=";

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "poppler-${suffix}";

  version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too!

  version = "25.07.0"; # beware: updates often break cups-filters build, check scribus too!



  outputs = [

    "out"
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";

    hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=";

    hash = "sha256-xQSpBm29/r43etU87GQf2XHulsTh6Mp05snAPUbYF64=";

  };



  nativeBuildInputs = [