From a542105dc9770718d9d1c3c66688ad86bf819cc3 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 16 Jan 2019 14:51:08 +0100
Subject: scribusUnstable: 2019-01-14 -> 2019-01-16

Upstream fixed a bug, so the poppler patch is not necessary anymore.
---
 pkgs/applications/office/scribus/poppler-0.73.0.patch | 12 ------------
 pkgs/applications/office/scribus/unstable.nix         |  8 +++-----
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete 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
deleted file mode 100644
index d8cf14b48c2..00000000000
--- a/pkgs/applications/office/scribus/poppler-0.73.0.patch
+++ /dev/null
@@ -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>
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index f8bd244e039..32758b462f7 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -4,20 +4,18 @@ podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }:
 
 let
   pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
-  revision = "22805";
+  revision = "22806";
 in 
 stdenv.mkDerivation rec {
   name = "scribus-unstable-${version}";
-  version = "2019-01-14";
+  version = "2019-01-16";
 
   src = fetchsvn {
     url = "svn://scribus.net/trunk/Scribus";
     rev = revision;
-    sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1";
+    sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0";
   };
 
-  patches = [ ./poppler-0.73.0.patch ];
-
   enableParallelBuilding = true;
 
   buildInputs = [
-- 
cgit 1.4.1