From 432ed2f8b4ddab94ebdeb716b24ae8711230f5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 7 Mar 2012 11:33:52 +0100
Subject: [PATCH] fix crash at export as image (rhbz#800765)

---
 scribus-1.4.0-export-as-image.patch | 21 +++++++++++++++++++++
 scribus.spec                        |  8 +++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 scribus-1.4.0-export-as-image.patch

diff --git a/scribus-1.4.0-export-as-image.patch b/scribus-1.4.0-export-as-image.patch
new file mode 100644
index 0000000..4dd399a
--- /dev/null
+++ b/scribus-1.4.0-export-as-image.patch
@@ -0,0 +1,21 @@
+commit 4617fdc649b10a32206fd974cd9b7a8c824f997c
+Author: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
+Date:   Thu Jan 12 23:03:46 2012 +0000
+
+    #10509 : crash on attempt to export as image
+    
+    git-svn-id: svn://scribus.net/branches/Version14x@17196 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/Scribus/scribus/plugins/pixmapexport/export.cpp b/Scribus/scribus/plugins/pixmapexport/export.cpp
+index 6ff5e0a..d9e273a 100644
+--- a/Scribus/scribus/plugins/pixmapexport/export.cpp
++++ b/Scribus/scribus/plugins/pixmapexport/export.cpp
+@@ -96,7 +96,7 @@ bool PixmapExportPlugin::run(ScribusDoc* doc, QString target)
+ 	Q_ASSERT(target.isEmpty());
+ 	Q_ASSERT(!doc->masterPageMode());
+ 	QSharedPointer<ExportBitmap> ex( new ExportBitmap() );
+-	QSharedPointer<ExportForm>  dia( new ExportForm(doc->scMW(), doc, ex->pageDPI, ex->quality, ex->bitmapType) );
++	QSharedPointer<ExportForm>  dia( new ExportForm(0, doc, ex->pageDPI, ex->quality, ex->bitmapType) );
+ 
+ 	// interval widgets handling
+ 	QString tmp;
diff --git a/scribus.spec b/scribus.spec
index c7809fd..52eb7c5 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -14,6 +14,8 @@ Patch0:         %{name}-1.4.0-swatches.patch
 Patch1:         %{name}-1.4.0-profiles.patch
 # use versioned documentation directory
 Patch2:         %{name}-1.4.0-docdir.patch
+# rhbz#800765 and http://bugs.scribus.net/view.php?id=10509
+Patch3:         %{name}-1.4.0-export-as-image.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -87,6 +89,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %patch0 -p2 -b .swatches
 %patch1 -p2 -b .profiles
 %patch2 -p1 -b .docdir
+%patch3 -p2 -b .export-as-image
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -187,6 +190,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Mar 07 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-3
+- fix crash at export as image (rhbz#800765)
+
 * Tue Jan 03 2012 Dan Horák <dan[at]danny.cz> - 1.4.0-2
 - the swatches/profiles patches were submitted to upstream bugtracker