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

Merge pull request #54055 from erictapen/scribusUnstable-2019-01-16

Browse Source 
scribusUnstable: 2019-01-14 -> 2019-01-16
This commit is contained in:
worldofpeace 2019-01-16 18:50:50 +00:00 committed by GitHub
commit 872502aa56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 17 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
View File

@ -1,12 +0,0 @@
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,20 +4,18 @@ podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }:
let let
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
revision = "22805"; revision = "22806";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "scribus-unstable-${version}"; name = "scribus-unstable-${version}";
version = "2019-01-14"; version = "2019-01-16";
src = fetchsvn { src = fetchsvn {
url = "svn://scribus.net/trunk/Scribus"; url = "svn://scribus.net/trunk/Scribus";
rev = revision; rev = revision;
sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1"; sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0";
}; };
patches = [ ./poppler-0.73.0.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [