gcc 4.1 patch thanks to Hanno

(Portage version: 2.0.53)

10 files changed, 158 insertions, 24 deletions

diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index ad556007aa32..baa325af8ec9 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.18 2005/11/30 06:36:36 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.19 2005/12/03 19:47:38 carlo Exp $
+
+*kexi-1.4.2-r1 (03 Dec 2005)
+
+  03 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kexi-1.4.2-gcc41.patch, +kexi-1.4.2-r1.ebuild:
+  gcc 4.1 patch thanks to Hanno
 
   30 Nov 2005; Mark Loeser <halcy0n@gentoo.org> kexi-1.4.2.ebuild:
   Stable on x86; bug #112840
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 1f9313f14a25..1fdf8732ebf3 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6de56b2ad966708f1a1d8327c55594b9 ChangeLog 2087
+MD5 c934421646261dcdb5e860c1c38e1815 ChangeLog 2255
 MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kexi-1.4.1 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2-r1 68
+MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
 MD5 90a8b21bfe0797419089980639fd6eb3 kexi-1.4.1.ebuild 1074
+MD5 139c5f87bbd884086a87731e8862a311 kexi-1.4.2-r1.ebuild 1033
 MD5 006de98d6fdb780f9f8259b50b55248f kexi-1.4.2.ebuild 1079
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjUh/CRZPokWLroQRAtrLAKCyLKqE3kFqWEP7OTSJU2VA1t3NJgCffiN0
-ao/mpvaGtAA30EpzQcXaymM=
-=7l4l
------END PGP SIGNATURE-----
diff --git a/app-office/kexi/files/digest-kexi-1.4.2-r1 b/app-office/kexi/files/digest-kexi-1.4.2-r1
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/kexi/files/digest-kexi-1.4.2-r1
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kexi/files/kexi-1.4.2-gcc41.patch b/app-office/kexi/files/kexi-1.4.2-gcc41.patch
new file mode 100644
index 000000000000..879010273e19
--- /dev/null
+++ b/app-office/kexi/files/kexi-1.4.2-gcc41.patch
@@ -0,0 +1,22 @@
+--- koffice-1.4.2/kexi/migration/mysql/mysqlmigrate.h	2005-10-05 12:25:13.000000000 +0200
++++ kexi-1.4.2-gcc41/kexi/migration/mysql/mysqlmigrate.h	2005-12-02 18:28:10.059616750 +0100
+@@ -60,7 +60,7 @@
+ 			~MySQLMigrate();
+ 			//Constructor
+ 			MySQLMigrate();
+-			MySQLMigrate::MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
++			MySQLMigrate(QObject *parent, const char *name, const QStringList& args = QStringList());
+ 			
+ 			KexiDB::Field::Type type(const QString& table, const MYSQL_FIELD* t);
+ 			
+@@ -69,8 +69,8 @@
+ 			
+ 			QStringList examineEnumField(const QString& table,
+ 			                             const MYSQL_FIELD* fld);
+-			void MySQLMigrate::getConstraints(int mysqlConstraints, KexiDB::Field* fld);
+-			void MySQLMigrate::getOptions(int flags, KexiDB::Field* fld);
++			void getConstraints(int mysqlConstraints, KexiDB::Field* fld);
++			void getOptions(int flags, KexiDB::Field* fld);
+ 
+ 		/*! driver's static version information, it is automatically implemented
+ 		 in implementation using KEXIDB_DRIVER macro (see driver_p.h) */
diff --git a/app-office/kexi/kexi-1.4.2-r1.ebuild b/app-office/kexi/kexi-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..82f5f85dd955
--- /dev/null
+++ b/app-office/kexi/kexi-1.4.2-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/kexi/kexi-1.4.2-r1.ebuild,v 1.1 2005/12/03 19:47:38 carlo Exp $
+
+MAXKOFFICEVER=${PV}
+KMNAME=koffice
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice integrated environment for database management."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mysql postgres"
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	sys-libs/readline
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-libs/libpqxx )
+	dev-lang/python
+	!dev-db/kexi"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoscript lib/koscript
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store"
+
+KMEXTRACTONLY="lib/"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/kexi-1.4.2-gcc41.patch"
+
+src_compile() {
+	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
+
+	kde-meta_src_compile
+}
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 0fcec9b1f6a6..0707ad1b911f 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kspread
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.23 2005/11/30 06:40:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.24 2005/12/03 19:49:39 carlo Exp $
+
+*kspread-1.4.2-r1 (03 Dec 2005)
+
+  03 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kspread-1.4.2-gcc41.patch, +kspread-1.4.2-r1.ebuild:
+  gcc 4.1 patch thanks to Hanno
 
   30 Nov 2005; Mark Loeser <halcy0n@gentoo.org> kspread-1.4.2.ebuild:
   Stable on x86; bug #112840
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index 70b225b8d516..1a2a53a904c2 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c07c8a0d99f2d59be708fda51f498cf9 ChangeLog 2709
+MD5 547236f35130825ce75bb1b1de0c4311 ChangeLog 2886
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kspread-1.3.5 211
 MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kspread-1.4.1 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kspread-1.4.2 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kspread-1.4.2-r1 68
+MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
 MD5 ef06322f8a12885dd5dfeea8d2d244ee kspread-1.3.5.ebuild 1275
 MD5 b321e3aa2a3ef585f20372811611557e kspread-1.4.1.ebuild 1158
+MD5 d9376ecd7b814b76d225639856cda104 kspread-1.4.2-r1.ebuild 1117
 MD5 fea7159befc14b7c81cd4eb11d7ead29 kspread-1.4.2.ebuild 1166
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjUlRCRZPokWLroQRAoEvAJ0QlAtUSDrsJAce4X9cOZXlBEKCpACeOSOG
-dB8XzhD1CXkYFJDZKmeoktc=
-=UB1q
------END PGP SIGNATURE-----
diff --git a/app-office/kspread/files/digest-kspread-1.4.2-r1 b/app-office/kspread/files/digest-kspread-1.4.2-r1
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/kspread/files/digest-kspread-1.4.2-r1
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kspread/files/kspread-1.4.2-gcc41.patch b/app-office/kspread/files/kspread-1.4.2-gcc41.patch
new file mode 100644
index 000000000000..0477c74d1e1f
--- /dev/null
+++ b/app-office/kspread/files/kspread-1.4.2-gcc41.patch
@@ -0,0 +1,11 @@
+--- kspread-1.4.2/kspread/kspread_cell.h	2005-10-05 12:31:33.000000000 +0200
++++ kspread-1.4.2-gcc41/kspread/kspread_cell.h	2005-12-02 15:05:50.336931500 +0100
+@@ -596,7 +596,7 @@
+      *
+      * @return the cell that decides the format for the cell in question.
+      */
+-    KSpreadCell *KSpreadCell::ultimateObscuringCell() const;
++    KSpreadCell *ultimateObscuringCell() const;
+ 
+     /**
+      * @return the obscuring cell list (might be empty)
diff --git a/app-office/kspread/kspread-1.4.2-r1.ebuild b/app-office/kspread/kspread-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..5ee9a174749d
--- /dev/null
+++ b/app-office/kspread/kspread-1.4.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.4.2-r1.ebuild,v 1.1 2005/12/03 19:49:39 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice spreadsheet application."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kchart)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoscript lib/koscript
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkochart interfaces"
+
+KMEXTRACTONLY="lib/
+	interfaces/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kspread"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch"
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter kspread" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}