scribus crash fix

(Portage version: 2.0.51.19)

4 files changed, 75 insertions, 1 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index b878b7bb4915..0fd9e908f7a2 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/scribus
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.56 2005/07/04 18:57:26 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.57 2005/07/04 21:57:39 hanno Exp $
+
+*scribus-1.2.2-r1 (04 Jul 2005)
+
+  04 Jul 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/scribus-1.2.2-crash-fix.diff, +scribus-1.2.2-r1.ebuild:
+  Fix for crash bug.
 
 *scribus-1.2.2 (04 Jul 2005)
 
diff --git a/app-office/scribus/files/digest-scribus-1.2.2-r1 b/app-office/scribus/files/digest-scribus-1.2.2-r1
new file mode 100644
index 000000000000..0e266d622423
--- /dev/null
+++ b/app-office/scribus/files/digest-scribus-1.2.2-r1
@@ -0,0 +1 @@
+MD5 70bd8d307cd0975af498412a82c699c2 scribus-1.2.2.tar.bz2 7761861
diff --git a/app-office/scribus/files/scribus-1.2.2-crash-fix.diff b/app-office/scribus/files/scribus-1.2.2-crash-fix.diff
new file mode 100644
index 000000000000..ac76aa8ccc75
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.2.2-crash-fix.diff
@@ -0,0 +1,22 @@
+Index: scribus/pageitem.cpp
+===================================================================
+RCS file: /cvs/Scribus/scribus/pageitem.cpp,v
+retrieving revision 1.151
+retrieving revision 1.152
+diff -U3 -r1.151 -r1.152
+--- scribus-1.2.2-old/scribus/pageitem.cpp	16 Jun 2005 21:46:44 -0000	1.151
++++ scribus-1.2.2/scribus/pageitem.cpp	4 Jul 2005 19:42:49 -0000	1.152
+@@ -1059,7 +1059,12 @@
+ 								CurX += Doc->Vorlagen[hl->cab].First;
+ 							else
+ 							{
+-								if (BackBox->Ptext.at(BackBox->Ptext.count()-1)->ch == QChar(13))
++								if (BackBox->Ptext.count() != 0)
++								{
++									if (BackBox->Ptext.at(BackBox->Ptext.count()-1)->ch == QChar(13))
++										CurX += Doc->Vorlagen[hl->cab].First;
++								}
++								else
+ 									CurX += Doc->Vorlagen[hl->cab].First;
+ 							}
+ 						}
diff --git a/app-office/scribus/scribus-1.2.2-r1.ebuild b/app-office/scribus/scribus-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..886017786637
--- /dev/null
+++ b/app-office/scribus/scribus-1.2.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.2.2-r1.ebuild,v 1.1 2005/07/04 21:57:39 hanno Exp $
+
+inherit kde-functions eutils
+need-qt 3
+
+DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
+HOMEPAGE="http://www.scribus.net"
+SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+IUSE=""
+
+DEPEND=">=x11-libs/qt-3.3.3
+	>=media-libs/freetype-2.1
+	>=media-libs/lcms-1.09
+	media-libs/tiff
+	>=media-libs/libart_lgpl-2.3.8
+	>=sys-devel/gcc-3.0.0
+	>=dev-libs/libxml2-2.6.0"
+
+RDEPEND="virtual/ghostscript"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/scribus-1.2.2-crash-fix.diff
+}
+
+src_compile() {
+	econf || die
+	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
+}
+
+src_install() {
+	einstall destdir=${D} || die
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	domenu scribus.desktop
+	doicon scribus/icons/scribusicon.png
+
+	dosym /usr/share/scribus/doc /usr/share/doc/${PF}/html
+}