From 3f0fbc0e5667d2d37bcf71b80aeb1164250baf1f Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Mon, 14 Jan 2019 15:42:06 +0100
Subject: [PATCH 1/2] scribusUnstable: 2018-10-13 -> 2019-01-14

---
 pkgs/applications/office/scribus/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index 4b1595db42a..aef988964be 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -4,16 +4,16 @@ 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";
   };
 
   enableParallelBuilding = true;

From ac891e9ea6ec9362d0ed6920c24504e002d40ebf Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Mon, 14 Jan 2019 16:53:18 +0100
Subject: [PATCH 2/2] 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] https://github.com/NixOS/nixpkgs/commit/7757e43fcb15f3b3e21187787edaad54614ec7e6
[1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4
---
 .../applications/office/scribus/poppler-0.73.0.patch | 12 ++++++++++++
 pkgs/applications/office/scribus/unstable.nix        |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/office/scribus/poppler-0.73.0.patch

diff --git a/pkgs/applications/office/scribus/poppler-0.73.0.patch b/pkgs/applications/office/scribus/poppler-0.73.0.patch
new file mode 100644
index 00000000000..d8cf14b48c2
--- /dev/null
+++ b/pkgs/applications/office/scribus/poppler-0.73.0.patch
@@ -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>
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index aef988964be..f8bd244e039 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1";
   };
 
+  patches = [ ./poppler-0.73.0.patch ];
+
   enableParallelBuilding = true;
 
   buildInputs = [