-
-
Notifications
You must be signed in to change notification settings - Fork 13.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
poppler: 21.05.0 -> 21.06.01 #127832
Merged
Merged
poppler: 21.05.0 -> 21.06.01 #127832
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -1,5 +1,20 @@ | ||||||||
{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl | ||||||||
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch | ||||||||
{ stdenv | ||||||||
, lib | ||||||||
, fetchurl | ||||||||
, fetchpatch | ||||||||
, cairo | ||||||||
, cmake | ||||||||
, curl | ||||||||
, fontconfig | ||||||||
, freetype | ||||||||
, lcms | ||||||||
, libiconv | ||||||||
, libintl | ||||||||
, libjpeg | ||||||||
, ninja | ||||||||
, openjpeg | ||||||||
, pkg-config | ||||||||
, zlib | ||||||||
, withData ? true, poppler_data | ||||||||
, qt5Support ? false, qtbase ? null | ||||||||
, introspectionSupport ? false, gobject-introspection ? null | ||||||||
|
@@ -12,25 +27,38 @@ let | |||||||
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; | ||||||||
in | ||||||||
stdenv.mkDerivation rec { | ||||||||
name = "poppler-${suffix}-${version}"; | ||||||||
pname = "poppler-${suffix}"; | ||||||||
inherit version; | ||||||||
|
||||||||
src = fetchurl { | ||||||||
url = "${meta.homepage}/poppler-${version}.tar.xz"; | ||||||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; | ||||||||
sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; | ||||||||
}; | ||||||||
|
||||||||
outputs = [ "out" "dev" ]; | ||||||||
|
||||||||
patches = [ | ||||||||
# Fix internal crash: a negative number that should not be | ||||||||
(fetchpatch { | ||||||||
name = "CVE-2018-13988"; | ||||||||
url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; | ||||||||
sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; | ||||||||
}) | ||||||||
# Fix internal crash: a negative number that should not be (not the above!) | ||||||||
./0.61-CVE-2019-9959.patch | ||||||||
]; | ||||||||
|
||||||||
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; | ||||||||
nativeBuildInputs = [ | ||||||||
cmake | ||||||||
ninja | ||||||||
pkg-config | ||||||||
]; | ||||||||
|
||||||||
buildInputs = [ | ||||||||
libiconv | ||||||||
libintl | ||||||||
] | ||||||||
++ lib.optional withData poppler_data; | ||||||||
Comment on lines
+60
to
+61
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
||||||||
# TODO: reduce propagation to necessary libs | ||||||||
propagatedBuildInputs = with lib; | ||||||||
|
@@ -39,8 +67,6 @@ stdenv.mkDerivation rec { | |||||||
++ optional qt5Support qtbase | ||||||||
++ optional introspectionSupport gobject-introspection; | ||||||||
|
||||||||
nativeBuildInputs = [ cmake ninja pkg-config ]; | ||||||||
|
||||||||
# Not sure when and how to pass it. It seems an upstream bug anyway. | ||||||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; | ||||||||
|
||||||||
|
@@ -58,12 +84,10 @@ stdenv.mkDerivation rec { | |||||||
meta = with lib; { | ||||||||
homepage = "https://poppler.freedesktop.org/"; | ||||||||
description = "A PDF rendering library"; | ||||||||
|
||||||||
longDescription = '' | ||||||||
Poppler is a PDF rendering library based on the xpdf-3.0 code base. | ||||||||
''; | ||||||||
|
||||||||
license = licenses.gpl2; | ||||||||
license = licenses.gpl2Plus; | ||||||||
platforms = platforms.all; | ||||||||
maintainers = with maintainers; [ ttuegel ]; | ||||||||
}; | ||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -1,44 +1,46 @@ | ||||||||||||||
{ stdenv | ||||||||||||||
, lib | ||||||||||||||
{ lib | ||||||||||||||
, stdenv | ||||||||||||||
, fetchurl | ||||||||||||||
, fetchpatch | ||||||||||||||
, cairo | ||||||||||||||
, cmake | ||||||||||||||
, ninja | ||||||||||||||
, pkg-config | ||||||||||||||
, libiconv | ||||||||||||||
, libintl | ||||||||||||||
, zlib | ||||||||||||||
, pcre | ||||||||||||||
, boost | ||||||||||||||
, cups-filters | ||||||||||||||
, curl | ||||||||||||||
, cairo | ||||||||||||||
, freetype | ||||||||||||||
, fontconfig | ||||||||||||||
, freetype | ||||||||||||||
, inkscape | ||||||||||||||
, lcms | ||||||||||||||
, libiconv | ||||||||||||||
, libintl | ||||||||||||||
, libjpeg | ||||||||||||||
, ninja | ||||||||||||||
, openjpeg | ||||||||||||||
, pkg-config | ||||||||||||||
, scribusUnstable | ||||||||||||||
, texlive | ||||||||||||||
, zlib | ||||||||||||||
, withData ? true, poppler_data | ||||||||||||||
, qt5Support ? false, qtbase ? null | ||||||||||||||
, introspectionSupport ? false, gobject-introspection ? null | ||||||||||||||
, utils ? false, nss ? null | ||||||||||||||
Comment on lines
25
to
27
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||
, minimal ? false | ||||||||||||||
, suffix ? "glib" | ||||||||||||||
, inkscape | ||||||||||||||
, cups-filters | ||||||||||||||
, texlive | ||||||||||||||
, scribusUnstable | ||||||||||||||
}: | ||||||||||||||
|
||||||||||||||
let | ||||||||||||||
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; | ||||||||||||||
in | ||||||||||||||
stdenv.mkDerivation rec { | ||||||||||||||
name = "poppler-${suffix}-${version}"; | ||||||||||||||
version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! | ||||||||||||||
pname = "poppler-${suffix}"; | ||||||||||||||
version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! | ||||||||||||||
|
||||||||||||||
outputs = [ "out" "dev" ]; | ||||||||||||||
|
||||||||||||||
src = fetchurl { | ||||||||||||||
url = "${meta.homepage}/poppler-${version}.tar.xz"; | ||||||||||||||
sha256 = "sha256-2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw="; | ||||||||||||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; | ||||||||||||||
sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ="; | ||||||||||||||
}; | ||||||||||||||
|
||||||||||||||
nativeBuildInputs = [ | ||||||||||||||
|
@@ -48,6 +50,8 @@ stdenv.mkDerivation rec { | |||||||||||||
]; | ||||||||||||||
|
||||||||||||||
buildInputs = [ | ||||||||||||||
boost | ||||||||||||||
pcre | ||||||||||||||
libiconv | ||||||||||||||
libintl | ||||||||||||||
] ++ lib.optional withData [ | ||||||||||||||
|
@@ -98,13 +102,10 @@ stdenv.mkDerivation rec { | |||||||||||||
meta = with lib; { | ||||||||||||||
homepage = "https://poppler.freedesktop.org/"; | ||||||||||||||
description = "A PDF rendering library"; | ||||||||||||||
|
||||||||||||||
longDescription = '' | ||||||||||||||
Poppler is a PDF rendering library based on the xpdf-3.0 code | ||||||||||||||
base. In addition it provides a number of tools that can be | ||||||||||||||
installed separately. | ||||||||||||||
Poppler is a PDF rendering library based on the xpdf-3.0 code base. In | ||||||||||||||
addition it provides a number of tools that can be installed separately. | ||||||||||||||
''; | ||||||||||||||
|
||||||||||||||
license = licenses.gpl2Plus; | ||||||||||||||
platforms = platforms.all; | ||||||||||||||
maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; | ||||||||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not just move version to here?