git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127832 from AndersonTorres/quick-patch

poppler: 21.05.0 -> 21.06.01

commiteb147bf64c877e343be5108446b4827a6e973831 authorAnderson Torres <torres.anderson.85@protonmail.com> dateWed 23 Jun 2021, 09:13 (5 years ago) parent4611371004970b
3 files changed+61−33
pkgs/development/libraries/poppler/0.61.nix+34−10 pkgs/development/libraries/poppler/default.nix+23−22 pkgs/top-level/all-packages.nix+4−1
pkgs/development/libraries/poppler/0.61.nix+34−10
@@ -1,5 +1,20 @@
1−{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl
2−, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
1+{ stdenv
2+, lib
3+, fetchurl
4+, fetchpatch
5+, cairo
6+, cmake
7+, curl
8+, fontconfig
9+, freetype
10+, lcms
11+, libiconv
12+, libintl
13+, libjpeg
14+, ninja
15+, openjpeg
16+, pkg-config
17+, zlib
318, withData ? true, poppler_data
419, qt5Support ? false, qtbase ? null
520, introspectionSupport ? false, gobject-introspection ? null
@@ -12,25 +27,38 @@ let
1227 mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
1328in
1429stdenv.mkDerivation rec {
15− name = "poppler-${suffix}-${version}";
30+ pname = "poppler-${suffix}";
31+ inherit version;
1632
1733 src = fetchurl {
18− url = "${meta.homepage}/poppler-${version}.tar.xz";
34+ url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
1935 sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";
2036 };
2137
2238 outputs = [ "out" "dev" ];
2339
2440 patches = [
41+ # Fix internal crash: a negative number that should not be
2542 (fetchpatch {
2643 name = "CVE-2018-13988";
2744 url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee";
2845 sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2";
2946 })
47+ # Fix internal crash: a negative number that should not be (not the above!)
3048 ./0.61-CVE-2019-9959.patch
3149 ];
3250
33− buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
51+ nativeBuildInputs = [
52+ cmake
53+ ninja
54+ pkg-config
55+ ];
56+
57+ buildInputs = [
58+ libiconv
59+ libintl
60+ ]
61+ ++ lib.optional withData poppler_data;
3462
3563 # TODO: reduce propagation to necessary libs
3664 propagatedBuildInputs = with lib;
@@ -39,8 +67,6 @@ stdenv.mkDerivation rec {
3967 ++ optional qt5Support qtbase
4068 ++ optional introspectionSupport gobject-introspection;
4169
42− nativeBuildInputs = [ cmake ninja pkg-config ];
43−
4470 # Not sure when and how to pass it. It seems an upstream bug anyway.
4571 CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
4672
@@ -58,12 +84,10 @@ stdenv.mkDerivation rec {
5884 meta = with lib; {
5985 homepage = "https://poppler.freedesktop.org/";
6086 description = "A PDF rendering library";
61−
6287 longDescription = ''
6388 Poppler is a PDF rendering library based on the xpdf-3.0 code base.
6489 '';
65−
66− license = licenses.gpl2;
90+ license = licenses.gpl2Plus;
6791 platforms = platforms.all;
6892 maintainers = with maintainers; [ ttuegel ];
6993 };
pkgs/development/libraries/poppler/default.nix+23−22
@@ -1,44 +1,46 @@
1−{ stdenv
2−, lib
1+{ lib
2+, stdenv
33, fetchurl
44, fetchpatch
5+, cairo
56, cmake
6−, ninja
7−, pkg-config
8−, libiconv
9−, libintl
10−, zlib
7+, pcre
8+, boost
9+, cups-filters
1110, curl
12−, cairo
13−, freetype
1411, fontconfig
12+, freetype
13+, inkscape
1514, lcms
15+, libiconv
16+, libintl
1617, libjpeg
18+, ninja
1719, openjpeg
20+, pkg-config
21+, scribusUnstable
22+, texlive
23+, zlib
1824, withData ? true, poppler_data
1925, qt5Support ? false, qtbase ? null
2026, introspectionSupport ? false, gobject-introspection ? null
2127, utils ? false, nss ? null
2228, minimal ? false
2329, suffix ? "glib"
24−, inkscape
25−, cups-filters
26−, texlive
27−, scribusUnstable
2830}:
2931
3032let
3133 mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
3234in
3335stdenv.mkDerivation rec {
34− name = "poppler-${suffix}-${version}";
35− version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
36+ pname = "poppler-${suffix}";
37+ version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
3638
3739 outputs = [ "out" "dev" ];
3840
3941 src = fetchurl {
40− url = "${meta.homepage}/poppler-${version}.tar.xz";
41− sha256 = "sha256-2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=";
42+ url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
43+ sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ=";
4244 };
4345
4446 nativeBuildInputs = [
@@ -48,6 +50,8 @@ stdenv.mkDerivation rec {
4850 ];
4951
5052 buildInputs = [
53+ boost
54+ pcre
5155 libiconv
5256 libintl
5357 ] ++ lib.optional withData [
@@ -98,13 +102,10 @@ stdenv.mkDerivation rec {
98102 meta = with lib; {
99103 homepage = "https://poppler.freedesktop.org/";
100104 description = "A PDF rendering library";
101−
102105 longDescription = ''
103− Poppler is a PDF rendering library based on the xpdf-3.0 code
104− base. In addition it provides a number of tools that can be
105− installed separately.
106+ Poppler is a PDF rendering library based on the xpdf-3.0 code base. In
107+ addition it provides a number of tools that can be installed separately.
106108 '';
107−
108109 license = licenses.gpl2Plus;
109110 platforms = platforms.all;
110111 maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
pkgs/top-level/all-packages.nix+4−1
@@ -17703,7 +17703,10 @@ in
1770317703 suffix = "min";
1770417704 };
1770517705
17706− poppler_utils = poppler.override { suffix = "utils"; utils = true; };
17706+ poppler_utils = poppler.override {
17707+ suffix = "utils";
17708+ utils = true;
17709+ };
1770717710
1770817711 popt = callPackage ../development/libraries/popt { };
1770917712