public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53686 from dtzWill/update/poppler-0.73.0 

poppler: 0.72.0 -> 0.73.0
This commit is contained in:
Thomas Tuegel 2019-01-12 06:50:44 -06:00 committed by GitHub
parent 9651cc7a93 33b9ddc0a3
commit b07e1563fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/poppler/default.nix
View File

@ -8,7 +8,7 @@
}: }:
let # beware: updates often break cups-filters build let # beware: updates often break cups-filters build
version = "0.72.0"; version = "0.73.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz"; url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "0lfs1b1jfamxl13zbl5n448dqvl9n8frbv8180y7b7kfyaw7wx61"; sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14"; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
cmakeFlags = [ cmakeFlags = [
(mkFlag true "XPDF_HEADERS") (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
(mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "GLIB")
(mkFlag (!minimal) "CPP") (mkFlag (!minimal) "CPP")
(mkFlag (!minimal) "LIBCURL") (mkFlag (!minimal) "LIBCURL")

2
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -56,7 +56,7 @@ let
cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc
cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
# fix build with poppler 0.71 # fix build with poppler 0.71
find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -i find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -e 's|Gulong|unsigned long|g' -e 's|Guint|unsigned int|g' -e 's|Gushort|unsigned short|g' -e 's|Guchar|unsigned char|g' -i
''; '';
# remove when removing synctex-missing-header.patch # remove when removing synctex-missing-header.patch