scribus 1.3.2 bump with some fixes

Package-Manager: portage-2.1_pre3-r1

5 files changed, 195 insertions, 5 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 9f6699bc59b4..cbdc8b81fbc0 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/scribus
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.70 2006/01/23 15:10:22 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.71 2006/01/24 01:51:18 hanno Exp $
+
+*scribus-1.3.2-r1 (24 Jan 2006)
+
+  24 Jan 2006; Hanno Boeck <hanno@gentoo.org>
+  +files/scribus-1.3.2-fixes.diff, +scribus-1.3.2-r1.ebuild:
+  Fix for cairo memleak and crash, re-added cairo flag.
 
 *scribus-1.3.2 (23 Jan 2006)
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index cf005ae36f7f..f170f2d1ed71 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2a9651820c8509182ccdc420a88361cd ChangeLog 8044
+MD5 b75e9a73378f89a8d80b8026cb39f225 ChangeLog 8241
 MD5 ad6a8f28302ba5f2cd6602f15dcf8f0b files/digest-scribus-1.2.2.1 69
 MD5 5bb23dbcb9bbf3ed3c858a67aeb084f9 files/digest-scribus-1.2.3 67
 MD5 fc93f11e3086e449d9f0aae22dd57ea6 files/digest-scribus-1.2.4.1 69
 MD5 ccc6537c02e7409e9a57042e16571e0c files/digest-scribus-1.3.1 67
 MD5 ccc6537c02e7409e9a57042e16571e0c files/digest-scribus-1.3.1-r1 67
 MD5 e80c793c1fcf10d28d462fb8a6493c1f files/digest-scribus-1.3.2 67
+MD5 e80c793c1fcf10d28d462fb8a6493c1f files/digest-scribus-1.3.2-r1 67
 MD5 3565120be42bbd9f2058048693556306 files/scribus-1.3.1-gcc41.patch 1908
 MD5 b1dfef871a289717c0e84876f5225a3a files/scribus-1.3.1-memleak.patch 1186
+MD5 52a4d4aea5809ba13ef7798f8270d1b1 files/scribus-1.3.2-fixes.diff 7168
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 MD5 22b9b515efb9df74f82a0d388b40ea32 scribus-1.2.2.1.ebuild 1043
 MD5 543928f3e03bb416a4cfa620e392411e scribus-1.2.3.ebuild 1044
 MD5 e9b060aa7d3a24dcbe3422508c7e92e2 scribus-1.2.4.1.ebuild 1046
 MD5 13abbc9787cdb8e512bb496b2ff96f83 scribus-1.3.1-r1.ebuild 1229
 MD5 d6c11de9419f09836510b84720f65c43 scribus-1.3.1.ebuild 1101
+MD5 f65b8acbe6f92af6bba25a10b1e78c12 scribus-1.3.2-r1.ebuild 1171
 MD5 61058da19a29faa80ca1a8e143d9772f scribus-1.3.2.ebuild 1060
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD1PH/r2QksT29OyARApQSAJ0bbDDP45VOa9GRHA+STT2U2eHwuwCgnO/8
-NGH9Gaa4jcNXSJ6sWtrF4Ng=
-=8JYc
+iD8DBQFD1Yg0r2QksT29OyARAtjZAJ9saA+73jFZeDJSMfDtgZDyeOyL2ACgn53w
+xpfYXs/hzPtwc2ZV+1/Mwn8=
+=wLa5
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/digest-scribus-1.3.2-r1 b/app-office/scribus/files/digest-scribus-1.3.2-r1
new file mode 100644
index 000000000000..de162c18de27
--- /dev/null
+++ b/app-office/scribus/files/digest-scribus-1.3.2-r1
@@ -0,0 +1 @@
+MD5 700b8ce377084e317aa9d34a2157428d scribus-1.3.2.tar.bz2 9910738
diff --git a/app-office/scribus/files/scribus-1.3.2-fixes.diff b/app-office/scribus/files/scribus-1.3.2-fixes.diff
new file mode 100644
index 000000000000..606f39b7ce83
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.3.2-fixes.diff
@@ -0,0 +1,133 @@
+Index: scribus/scpainter.cpp
+===================================================================
+RCS file: /cvs/Scribus/scribus/scpainter.cpp,v
+retrieving revision 1.19.2.22
+retrieving revision 1.19.2.23
+diff -U3 -r1.19.2.22 -r1.19.2.23
+--- scribus-1.3.2/scribus/scpainter.cpp	22 Jan 2006 22:42:01 -0000	1.19.2.22
++++ scribus-1.3.2/scribus/scpainter.cpp	23 Jan 2006 15:12:58 -0000	1.19.2.23
+@@ -190,6 +190,7 @@
+ #endif
+ #if defined(Q_WS_X11) && defined(SC_USE_PIXBUF)
+ #ifdef HAVE_CAIRO
++	cairo_surface_destroy(cairo_get_target(m_cr));
+ 	cairo_destroy( m_cr );
+ #else
+ 	if (imageMode)
+Index: scribus/scribusview.cpp
+===================================================================
+RCS file: /cvs/Scribus/scribus/scribusview.cpp,v
+retrieving revision 1.76.2.452
+retrieving revision 1.76.2.454
+diff -U3 -r1.76.2.452 -r1.76.2.454
+--- scribus-1.3.2/scribus/scribusview.cpp	22 Jan 2006 22:42:02 -0000	1.76.2.452
++++ scribus-1.3.2/scribus/scribusview.cpp	24 Jan 2006 00:07:35 -0000	1.76.2.454
+@@ -2984,20 +2984,23 @@
+ 	if ((Doc->appMode == modeDrawBezierLine) && (m->button() == RightButton))
+ 	{
+ 		currItem = Doc->selection->itemAt(0);
+-		currItem->PoLine.resize(currItem->PoLine.size()-2);
+-		if (currItem->PoLine.size() < 4)
++		if (currItem!=0)
+ 		{
+-//			emit DelObj(Doc->currentPage->pageNr(), currItem->ItemNr);
+-			Doc->Items->remove(currItem->ItemNr);
+-			Doc->selection->removeFirst();
+-			emit HaveSel(-1);
+-		}
+-		else
+-		{
+-			SizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem->ItemNr, false, false);
+-			currItem->SetPolyClip(qRound(QMAX(currItem->Pwidth / 2, 1)));
+-			AdjustItemSize(currItem);
+-			currItem->ContourLine = currItem->PoLine.copy();
++			currItem->PoLine.resize(currItem->PoLine.size()-2);
++			if (currItem->PoLine.size() < 4)
++			{
++	//			emit DelObj(Doc->currentPage->pageNr(), currItem->ItemNr);
++				Doc->Items->remove(currItem->ItemNr);
++				Doc->selection->removeFirst();
++				emit HaveSel(-1);
++			}
++			else
++			{
++				SizeItem(currItem->PoLine.WidthHeight().x(), currItem->PoLine.WidthHeight().y(), currItem->ItemNr, false, false);
++				currItem->SetPolyClip(qRound(QMAX(currItem->Pwidth / 2, 1)));
++				AdjustItemSize(currItem);
++				currItem->ContourLine = currItem->PoLine.copy();
++			}
+ 		}
+ 		Doc->appMode = modeNormal;
+ 		qApp->setOverrideCursor(QCursor(ArrowCursor), true);
+@@ -6944,37 +6947,41 @@
+ 			else 
+ 				currItem->CPos = 0;
+ 			p.end();
+-			if (currItem->itemText.count() != 0)
++			
++			if (currItem->itemText.count() > 0)
+ 			{
+-				Doc->CurrFont = currItem->itemText.at(currItem->CPos-1)->cfont->scName();
+-				Doc->CurrFontSize = currItem->itemText.at(currItem->CPos-1)->csize;
+-				Doc->CurrTextFill = currItem->itemText.at(currItem->CPos-1)->ccolor;
+-				Doc->CurrTextFillSh = currItem->itemText.at(currItem->CPos-1)->cshade;
+-				Doc->CurrTextStroke = currItem->itemText.at(currItem->CPos-1)->cstroke;
+-				Doc->CurrTextStrokeSh = currItem->itemText.at(currItem->CPos-1)->cshade2;
+-				Doc->CurrTextScale = currItem->itemText.at(currItem->CPos-1)->cscale;
+-				Doc->CurrTextScaleV = currItem->itemText.at(currItem->CPos-1)->cscalev;
+-				Doc->CurrTextBase = currItem->itemText.at(currItem->CPos-1)->cbase;
+-				Doc->CurrTextShadowX = currItem->itemText.at(currItem->CPos-1)->cshadowx;
+-				Doc->CurrTextShadowY = currItem->itemText.at(currItem->CPos-1)->cshadowy;
+-				Doc->CurrTextOutline = currItem->itemText.at(currItem->CPos-1)->coutline;
+-				Doc->CurrTextUnderPos = currItem->itemText.at(currItem->CPos-1)->cunderpos;
+-				Doc->CurrTextUnderWidth = currItem->itemText.at(currItem->CPos-1)->cunderwidth;
+-				Doc->CurrTextStrikePos = currItem->itemText.at(currItem->CPos-1)->cstrikepos;
+-				Doc->CurrTextStrikeWidth = currItem->itemText.at(currItem->CPos-1)->cstrikewidth;
+-				emit ItemTextStrike(currItem->itemText.at(currItem->CPos-1)->cstrikepos, currItem->itemText.at(currItem->CPos-1)->cstrikewidth);
+-				emit ItemTextUnderline(currItem->itemText.at(currItem->CPos-1)->cunderpos, currItem->itemText.at(currItem->CPos-1)->cunderwidth);
+-				emit ItemTextOutline(currItem->itemText.at(currItem->CPos-1)->coutline);
+-				emit ItemTextShadow(currItem->itemText.at(currItem->CPos-1)->cshadowx, currItem->itemText.at(currItem->CPos-1)->cshadowy);
+-				emit ItemTextSca(currItem->itemText.at(currItem->CPos-1)->cscale);
+-				emit ItemTextScaV(currItem->itemText.at(currItem->CPos-1)->cscalev);
+-				emit ItemTextFarben(currItem->itemText.at(currItem->CPos-1)->cstroke, currItem->itemText.at(currItem->CPos-1)->ccolor, currItem->itemText.at(currItem->CPos-1)->cshade2, currItem->itemText.at(currItem->CPos-1)->cshade);
+-				emit ItemTextFont(currItem->itemText.at(currItem->CPos-1)->cfont->scName());
+-				emit ItemTextSize(currItem->itemText.at(currItem->CPos-1)->csize);
+-				emit ItemTextUSval(currItem->itemText.at(currItem->CPos-1)->cextra);
+-				emit ItemTextStil(currItem->itemText.at(currItem->CPos-1)->cstyle);
+-				emit ItemTextAbs(currItem->itemText.at(currItem->CPos-1)->cab);
+-				emit ItemTextBase(currItem->itemText.at(currItem->CPos-1)->cbase);
++				int b=currItem->CPos-1;
++				if (b<0)
++					b=0;
++				Doc->CurrFont = currItem->itemText.at(b)->cfont->scName();
++				Doc->CurrFontSize = currItem->itemText.at(b)->csize;
++				Doc->CurrTextFill = currItem->itemText.at(b)->ccolor;
++				Doc->CurrTextFillSh = currItem->itemText.at(b)->cshade;
++				Doc->CurrTextStroke = currItem->itemText.at(b)->cstroke;
++				Doc->CurrTextStrokeSh = currItem->itemText.at(b)->cshade2;
++				Doc->CurrTextScale = currItem->itemText.at(b)->cscale;
++				Doc->CurrTextScaleV = currItem->itemText.at(b)->cscalev;
++				Doc->CurrTextBase = currItem->itemText.at(b)->cbase;
++				Doc->CurrTextShadowX = currItem->itemText.at(b)->cshadowx;
++				Doc->CurrTextShadowY = currItem->itemText.at(b)->cshadowy;
++				Doc->CurrTextOutline = currItem->itemText.at(b)->coutline;
++				Doc->CurrTextUnderPos = currItem->itemText.at(b)->cunderpos;
++				Doc->CurrTextUnderWidth = currItem->itemText.at(b)->cunderwidth;
++				Doc->CurrTextStrikePos = currItem->itemText.at(b)->cstrikepos;
++				Doc->CurrTextStrikeWidth = currItem->itemText.at(b)->cstrikewidth;
++				emit ItemTextStrike(currItem->itemText.at(b)->cstrikepos, currItem->itemText.at(b)->cstrikewidth);
++				emit ItemTextUnderline(currItem->itemText.at(b)->cunderpos, currItem->itemText.at(b)->cunderwidth);
++				emit ItemTextOutline(currItem->itemText.at(b)->coutline);
++				emit ItemTextShadow(currItem->itemText.at(b)->cshadowx, currItem->itemText.at(b)->cshadowy);
++				emit ItemTextSca(currItem->itemText.at(b)->cscale);
++				emit ItemTextScaV(currItem->itemText.at(b)->cscalev);
++				emit ItemTextFarben(currItem->itemText.at(b)->cstroke, currItem->itemText.at(b)->ccolor, currItem->itemText.at(b)->cshade2, currItem->itemText.at(b)->cshade);
++				emit ItemTextFont(currItem->itemText.at(b)->cfont->scName());
++				emit ItemTextSize(currItem->itemText.at(b)->csize);
++				emit ItemTextUSval(currItem->itemText.at(b)->cextra);
++				emit ItemTextStil(currItem->itemText.at(b)->cstyle);
++				emit ItemTextAbs(currItem->itemText.at(b)->cab);
++				emit ItemTextBase(currItem->itemText.at(b)->cbase);
+ 				return true;
+ 			}
+ 			else
diff --git a/app-office/scribus/scribus-1.3.2-r1.ebuild b/app-office/scribus/scribus-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..b8f10bc62908
--- /dev/null
+++ b/app-office/scribus/scribus-1.3.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.2-r1.ebuild,v 1.1 2006/01/24 01:51:18 hanno Exp $
+
+inherit qt3 eutils
+
+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="cairo"
+
+DEPEND="$(qt_min_version 3.3.4)
+	>=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
+	cairo? ( >=x11-libs/cairo-1.0 )"
+
+RDEPEND="${DEPEND}
+	virtual/ghostscript"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-fixes.diff
+}
+
+src_compile() {
+	econf `use_enable cairo` || 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
+
+	mkdir -p ${D}/usr/share/doc/${P}
+	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
+}