From 59f6083281e0e481adf9ff1fbbd30165d4e1e897 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 19 Jan 2019 23:18:58 -0500 Subject: [PATCH] apvlv: fix build with poppler 0.73.0 Poppler was upgraded in [0] and therefore the build broke, as poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1]. Upstream issue is [2]. [0] https://github.com/NixOS/nixpkgs/commit/7757e43fcb15f3b3e21187787edaad54614ec7e6 [1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4 [2] https://github.com/naihe2010/apvlv/issues/28 --- pkgs/applications/misc/apvlv/default.nix | 1 + .../misc/apvlv/fix-build-with-poppler-0.73.0.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 2d9ea5e3574b..2da0de9ead8c 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; }) + ./fix-build-with-poppler-0.73.0.patch ]; installPhase = '' diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch new file mode 100644 index 000000000000..d2a7831dca63 --- /dev/null +++ b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc +index 765b112..83d133f 100644 +--- a/src/ApvlvPdf.cc ++++ b/src/ApvlvPdf.cc +@@ -29,7 +29,7 @@ + #include "ApvlvPdf.h" + + #ifndef POPPLER_WITH_GDK +-#include ++#include + + static void + copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,