scribusUnstable: fix build failure from poppler bump

Poppler was upgraded in [0] and therefore the build broke, as
poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1].

The patch is intended to be broght upstream and then can be reverted.

[0] 7757e43fcb
[1] ef3ef702bc
wip/yesman
Justin Humm 5 years ago
parent 3f0fbc0e56
commit ac891e9ea6
No known key found for this signature in database
GPG Key ID: 5F24E3BD56617EB2
  1. 12
      pkgs/applications/office/scribus/poppler-0.73.0.patch
  2. 2
      pkgs/applications/office/scribus/unstable.nix

@ -0,0 +1,12 @@
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
--- a/scribus/plugins/import/pdf/slaoutput.h
+++ b/scribus/plugins/import/pdf/slaoutput.h
@@ -28,7 +28,7 @@ for which a new license (GPL+exception) is in place.
#include "selection.h"
#include "vgradient.h"
-#include <poppler/goo/gtypes.h>
+#include <poppler/goo/gfile.h>
#include <poppler/Object.h>
#include <poppler/OutputDev.h>
#include <poppler/Gfx.h>

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1";
};
patches = [ ./poppler-0.73.0.patch ];
enableParallelBuilding = true;
buildInputs = [

Loading…
Cancel
Save