Merge pull request #149570 from r-ryantm/auto-update/poppler-glib
poppler: 21.06.1 -> 22.01.0
This commit is contained in:
commit
8152911f61
|
@ -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
|
||||
|
|
|
@ -83,6 +83,11 @@ mkDerivation rec {
|
|||
qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# poppler uses std::optional
|
||||
"-DWANT_CPP17=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [
|
||||
erictapen
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 = [
|
||||
|
|
Loading…
Reference in a new issue