alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #53958 from erictapen/scribusUnstable-poppler-fix

Browse source 
scribusUnstable: fix build failure from poppler bump
This commit is contained in:
Will Dietz 2019-01-15 12:40:33 -06:00 committed by GitHub
parent 57004738b1 ac891e9ea6
commit 11590f4526
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/office/scribus/poppler-0.73.0.patch Normal file
View file

@ -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>

8
pkgs/applications/office/scribus/unstable.nix
View file

@ -4,18 +4,20 @@ podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }:
let
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
revision = "22730";
revision = "22805";
in
stdenv.mkDerivation rec {
name = "scribus-unstable-${version}";
version = "2018-10-13";
version = "2019-01-14";
src = fetchsvn {
url = "svn://scribus.net/trunk/Scribus";
rev = revision;
sha256 = "1nlg4qva0fach8fi07r1pakjjlijishpwzlgpnxyaz7r31yjaw63";
sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1";
};
patches = [ ./poppler-0.73.0.patch ];
enableParallelBuilding = true;
buildInputs = [