diff options
author | Hanno Boeck <hanno@gentoo.org> | 2005-12-20 23:40:04 +0000 |
---|---|---|
committer | Hanno Boeck <hanno@gentoo.org> | 2005-12-20 23:40:04 +0000 |
commit | 889a26cb076d1120eab2a41b91751cd51e5249f6 (patch) | |
tree | 79e19579afe5f4cde01bf3d41c5f7c53ec71a331 /app-office | |
parent | Fix digitemp-3.3.2 so that digitemp binary gets properly installed. Fixes bug... (diff) | |
download | historical-889a26cb076d1120eab2a41b91751cd51e5249f6.tar.gz historical-889a26cb076d1120eab2a41b91751cd51e5249f6.tar.bz2 historical-889a26cb076d1120eab2a41b91751cd51e5249f6.zip |
scribus memleak and gcc41 fix
Package-Manager: portage-2.1_pre1
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/scribus/ChangeLog | 9 | ||||
-rw-r--r-- | app-office/scribus/Manifest | 12 | ||||
-rw-r--r-- | app-office/scribus/files/digest-scribus-1.3.1-r1 | 1 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.3.1-gcc41.patch | 40 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.3.1-memleak.patch | 57 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.3.1-r1.ebuild | 48 |
6 files changed, 162 insertions, 5 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index bbd17f626843..623da52394dc 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,13 @@ # 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.67 2005/10/09 20:36:52 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.68 2005/12/20 23:40:04 hanno Exp $ + +*scribus-1.3.1-r1 (20 Dec 2005) + + 20 Dec 2005; Hanno Boeck <hanno@gentoo.org> + +files/scribus-1.3.1-gcc41.patch, +files/scribus-1.3.1-memleak.patch, + +scribus-1.3.1-r1.ebuild: + Fix memleak and compilation with gcc 4.1. *scribus-1.3.1 (09 Oct 2005) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 4c4d1d1a09fa..ff00d33d0816 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,18 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 29760ad55ec9722e31f912c3bc1dfdb2 ChangeLog 7584 +MD5 5fb5eb69c5cc53caca482b846a87643f ChangeLog 7808 MD5 ad6a8f28302ba5f2cd6602f15dcf8f0b files/digest-scribus-1.2.2.1 69 MD5 5bb23dbcb9bbf3ed3c858a67aeb084f9 files/digest-scribus-1.2.3 67 MD5 ccc6537c02e7409e9a57042e16571e0c files/digest-scribus-1.3.1 67 +MD5 ccc6537c02e7409e9a57042e16571e0c files/digest-scribus-1.3.1-r1 67 +MD5 3565120be42bbd9f2058048693556306 files/scribus-1.3.1-gcc41.patch 1908 +MD5 b1dfef871a289717c0e84876f5225a3a files/scribus-1.3.1-memleak.patch 1186 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217 MD5 22b9b515efb9df74f82a0d388b40ea32 scribus-1.2.2.1.ebuild 1043 MD5 543928f3e03bb416a4cfa620e392411e scribus-1.2.3.ebuild 1044 +MD5 13abbc9787cdb8e512bb496b2ff96f83 scribus-1.3.1-r1.ebuild 1229 MD5 d6c11de9419f09836510b84720f65c43 scribus-1.3.1.ebuild 1101 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDSX/8r2QksT29OyARAmA1AJ0RMih3GTtk7tiDcW+vB5vva4GcaACeK8T4 -SB2f8v6o7ZR5oACC8DdZzJg= -=wgOF +iD8DBQFDqJbUr2QksT29OyARArZMAJ9D1vijvV5NtiUb5V0HaeYUIKyAawCghTS8 +zhfkO6N5rz/QaJ/XXfbi8gw= +=W7so -----END PGP SIGNATURE----- diff --git a/app-office/scribus/files/digest-scribus-1.3.1-r1 b/app-office/scribus/files/digest-scribus-1.3.1-r1 new file mode 100644 index 000000000000..131bc6ae9f7c --- /dev/null +++ b/app-office/scribus/files/digest-scribus-1.3.1-r1 @@ -0,0 +1 @@ +MD5 ad36f7de1bba1229d143b93d2b6cd8e9 scribus-1.3.1.tar.bz2 8838483 diff --git a/app-office/scribus/files/scribus-1.3.1-gcc41.patch b/app-office/scribus/files/scribus-1.3.1-gcc41.patch new file mode 100644 index 000000000000..c71219449ffe --- /dev/null +++ b/app-office/scribus/files/scribus-1.3.1-gcc41.patch @@ -0,0 +1,40 @@ +diff -Naur scribus-1.3.1/scribus/inspage.h scribus-1.3.1-gcc41/scribus/inspage.h +--- scribus-1.3.1/scribus/inspage.h 2005-08-17 01:17:16.000000000 +0200 ++++ scribus-1.3.1-gcc41/scribus/inspage.h 2005-12-20 23:53:55.383767250 +0100 +@@ -45,7 +45,7 @@ + QString prefsPageSizeName; + QPtrList<QComboBox> masterPageCombos; + +- const QStringList InsPage::getMasterPages(); ++ const QStringList getMasterPages(); + const QString getMasterPageN(uint n); + const int getWhere(); + const int getWherePage(); +diff -Naur scribus-1.3.1/scribus/pdfoptionsio.h scribus-1.3.1-gcc41/scribus/pdfoptionsio.h +--- scribus-1.3.1/scribus/pdfoptionsio.h 2005-08-10 09:14:56.000000000 +0200 ++++ scribus-1.3.1-gcc41/scribus/pdfoptionsio.h 2005-12-20 23:56:51.582779000 +0100 +@@ -80,7 +80,7 @@ + // Build and return an XML representation of the settings. + // QString::null is returned on failure, in which case + // the error string is set. +- QString PDFOptionsIO::buildXMLString(); ++ QString buildXMLString(); + + // Populate the current DOM tree with the settings from the + // current PDFOptions instance. +diff -Naur scribus-1.3.1/scribus/picstatus.h scribus-1.3.1-gcc41/scribus/picstatus.h +--- scribus-1.3.1/scribus/picstatus.h 2005-09-22 13:17:30.000000000 +0200 ++++ scribus-1.3.1-gcc41/scribus/picstatus.h 2005-12-20 23:57:32.409330500 +0100 +@@ -55,10 +55,10 @@ + + // Toggle a searc button in the table between "Search" and "Cancel Search", + // fixing signal connections as well. +- void PicStatus::setSearchButton(int row, bool toCancel, const FileSearch* searcher); ++ void setSearchButton(int row, bool toCancel, const FileSearch* searcher); + + // Load the image specified into the PageItem shown on row `row' +- bool PicStatus::loadPictByRow(const QString & newFilePath, unsigned int row); ++ bool loadPictByRow(const QString & newFilePath, unsigned int row); + + // Column indexes + static const unsigned short COL_FILENAME; diff --git a/app-office/scribus/files/scribus-1.3.1-memleak.patch b/app-office/scribus/files/scribus-1.3.1-memleak.patch new file mode 100644 index 000000000000..5e2528f6037a --- /dev/null +++ b/app-office/scribus/files/scribus-1.3.1-memleak.patch @@ -0,0 +1,57 @@ +--- scribus-1.3.1-orig/scribus/util.cpp 2005-09-17 05:55:05.000000000 +0200 ++++ scribus-1.3.1/scribus/util.cpp 2005-11-03 00:22:32.000000000 +0100 +@@ -1201,20 +1201,20 @@ + { + static QMap<QRgb, QPixmap*> pxCache; + +- QPixmap * pm = pxCache[rgb.rgb()]; +- if (!pm) +- { +- pm = new QPixmap(15, 15); +- pm->fill(rgb); +- QPainter p; +- p.begin(pm); +- p.setBrush(Qt::NoBrush); +- QPen b(Qt::black, 1); +- p.setPen(b); +- p.drawRect(0, 0, 15, 15); +- p.end(); +- pxCache[rgb.rgb()] = pm; +- } ++ QRgb index=rgb.rgb(); ++ if (pxCache.contains(index)) ++ return pxCache[index]; ++ ++ QPixmap *pm = new QPixmap(15, 15); ++ pm->fill(rgb); ++ QPainter p; ++ p.begin(pm); ++ p.setBrush(Qt::NoBrush); ++ QPen b(Qt::black, 1); ++ p.setPen(b); ++ p.drawRect(0, 0, 15, 15); ++ p.end(); ++ pxCache.insert(index, pm); + return pm; + } + +@@ -1222,12 +1222,13 @@ + { + static QMap<QRgb, QPixmap*> pxCache; + +- QPixmap * pm = pxCache[rgb.rgb()]; +- if (!pm) { +- pm = new QPixmap(30, 15); +- pm->fill(rgb); +- pxCache[rgb.rgb()] = pm; +- } ++ QRgb index=rgb.rgb(); ++ if (pxCache.contains(index)) ++ return pxCache[index]; ++ ++ QPixmap *pm = new QPixmap(30, 15); ++ pm->fill(rgb); ++ pxCache.insert(index, pm); + return pm; + } + diff --git a/app-office/scribus/scribus-1.3.1-r1.ebuild b/app-office/scribus/scribus-1.3.1-r1.ebuild new file mode 100644 index 000000000000..aae4cc10c00c --- /dev/null +++ b/app-office/scribus/scribus-1.3.1-r1.ebuild @@ -0,0 +1,48 @@ +# 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.3.1-r1.ebuild,v 1.1 2005/12/20 23:40:04 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}/scribus-1.3.1-memleak.patch + epatch ${FILESDIR}/scribus-1.3.1-gcc41.patch +} + +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 +} |