4 files changed, 147 insertions, 2 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 891cef658172..c1d396c5600e 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.151 2012/02/13 09:25:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.152 2012/02/13 10:55:47 jlec Exp $
+
+*scribus-1.4.9999 (13 Feb 2012)
+*scribus-1.4.0-r1 (13 Feb 2012)
+
+  13 Feb 2012; Justin Lecher <jlec@gentoo.org> -scribus-1.4.0.ebuild,
+  +scribus-1.4.0-r1.ebuild, +files/scribus-1.4.0-export.patch,
+  +scribus-1.4.9999.ebuild:
+  Fix for crash when exporting pixmaps,
+  http://bugs.scribus.net/view.php?id=10509 ; added live 1.4
 
 *scribus-9999 (13 Feb 2012)
 
diff --git a/app-office/scribus/files/scribus-1.4.0-export.patch b/app-office/scribus/files/scribus-1.4.0-export.patch
new file mode 100644
index 000000000000..4ae87b34ea45
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.4.0-export.patch
@@ -0,0 +1,16 @@
+ scribus/plugins/pixmapexport/export.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scribus/plugins/pixmapexport/export.cpp b/scribus/plugins/pixmapexport/export.cpp
+index 6ff5e0a..d9e273a 100644
+--- a/scribus/plugins/pixmapexport/export.cpp
++++ b/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/app-office/scribus/scribus-1.4.0.ebuild b/app-office/scribus/scribus-1.4.0-r1.ebuild
index 18c23bf630d8..2729c97f6c6b 100644
--- a/app-office/scribus/scribus-1.4.0.ebuild
+++ b/app-office/scribus/scribus-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0.ebuild,v 1.3 2012/02/13 09:25:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0-r1.ebuild,v 1.1 2012/02/13 10:55:47 jlec Exp $
 
 EAPI=4
 
@@ -44,6 +44,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+	"${FILESDIR}"/${P}-export.patch
 	)
 
 pkg_setup() {
diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild
new file mode 100644
index 000000000000..1e12dde6cc88
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.1 2012/02/13 10:55:47 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit cmake-utils fdo-mime multilib python subversion
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI=""
+ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="cairo debug examples +minimal +pdf spell templates"
+
+# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
+IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+
+COMMON_DEPEND="
+	dev-libs/hyphen
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	virtual/jpeg
+	spell? ( app-text/aspell )
+	pdf? ( app-text/podofo )
+	cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+	)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	if use templates; then
+		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
+	fi
+	if use examples; then
+		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
+	fi
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
+
+	base_src_prepare
+	subversion_src_prepare
+}
+
+src_configure() {
+	local lang langs
+	for lang in ${IUSE_LINGUAS}; do
+		use linguas_${lang} && langs+=",${lang}"
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
+		-DPYTHON_LIBRARY=$(python_get_library)
+		-DWANT_NORPATH=ON
+		-DWANT_QTARTHUR=ON
+		-DWANT_QT3SUPPORT=OFF
+		-DGENTOOVERSION=${PVR}
+		-DWANT_GUI_LANG=${langs#,}
+		$(cmake-utils_use_has spell ASPELL)
+		$(cmake-utils_use_has pdf PODOFO)
+		$(cmake-utils_use_want cairo)
+		$(cmake-utils_use_want minimal NOHEADERINSTALL)
+		$(cmake-utils_use_want debug DEBUG)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+	docompress -x /usr/share/doc/${PF}/en
+	doicon resources/icons/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_preinst() {
+	# 399595
+	rm -vf "${ED}"/usr/share/doc/${PF}/en* || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en
+	subversion_pkg_preinst
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}