From 6187d5babc1e8c0b2df2bd16a1d8cf4cb9aed9c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 04:50:40 +0000 Subject: [PATCH 1/5] poppler: 0.85.0 -> 0.86.1 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 20e492969458..bd842e7ecfb4 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.85.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.86.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b"; + sha256 = "0v3z4mk1rr8i0c4cfkab7pnxdbil30j4cm4w6cqlq6cfghkhlqxg"; }; outputs = [ "out" "dev" ]; From af72bf0ae26190dacc21e7ceb3bc7cd985b170ba Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 14 Mar 2020 16:46:55 -0400 Subject: [PATCH 2/5] texlive.bin: fix for poppler 0.84 --- pkgs/tools/typesetting/tex/texlive/bin.nix | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index fc3c5b324804..5800cedf7f14 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -26,10 +26,7 @@ let sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj"; }; - patches = [ - ]; - - postPatch = let + prePatch = let # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year} # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959 popplerVersion = "0.83.0"; @@ -68,11 +65,19 @@ let done cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc - - # poppler 0.84 compat fixups, use 0.83 files otherwise - patch -p1 -i ${./poppler84.patch} ''; + patches = [ + # poppler 0.84 compat fixups, use 0.83 files otherwise + ./poppler84.patch + + (fetchpatch { + name = "texlive-poppler-0.86.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398"; + sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l"; + }) + ]; + # remove when removing synctex-missing-header.patch preAutoreconf = "pushd texk/web2c"; postAutoreconf = "popd"; @@ -108,7 +113,7 @@ core = stdenv.mkDerivation rec { pname = "texlive-bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; outputs = [ "out" "doc" ]; @@ -201,7 +206,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex pname = "texlive-core-big.bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; hardeningDisable = [ "format" ]; From 796f9696f1339acc164ae3d14689c83bce2c10cf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 04:18:09 +0200 Subject: [PATCH 3/5] =?UTF-8?q?poppler:=200.86.1=20=E2=86=92=200.87.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bd842e7ecfb4..c3e9f4d36118 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.86.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0v3z4mk1rr8i0c4cfkab7pnxdbil30j4cm4w6cqlq6cfghkhlqxg"; + sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4="; }; outputs = [ "out" "dev" ]; From 03bfda019602b633f1b640ed8ed2933bca4a1922 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 04:54:58 +0200 Subject: [PATCH 4/5] poppler: add freedesktop team to maintainers --- pkgs/development/libraries/poppler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index c3e9f4d36118..7f7a115f877a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; } From 9a4ee0c6331cc7d865bfc598f8bcf1eb31899ab1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Apr 2020 01:22:16 +0200 Subject: [PATCH 5/5] scribusUnstable: Fix build with Poppler 0.86 --- pkgs/applications/office/scribus/unstable.nix | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index faff45c8884a..d6084c0f37e7 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -44,28 +44,40 @@ mkDerivation rec { }; patches = [ + # Poppler patches from + # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf + # fix build with Poppler 0.82 - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; - sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; + sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; + }) # fix build with Poppler 0.83 - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; - sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; + sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; + }) # fix build with Poppler 0.84 # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; - sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; + sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; + }) + # Formating changes needed for the Poppler 0.86 patch to apply + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch"; + sha256 = "qwmVAZVYCijLNMVGwnOLJE8223vcRwPWfEvNKiDjw5o="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch"; + sha256 = "sha256-OY+EIiGBTg2aIAmZOnkI8DPZVZYqFZAKnD7ychge1Dw="; + includes = [ "scribus/plugins/import/pdf/*" ]; + }) + # fix build with Poppler 0.86 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch"; + sha256 = "51z+BYKhbH8a9dFph8X60NGpiogSb+5tOhW2d+m/X9M="; + }) ]; enableParallelBuilding = true;