Missed to add Kexi patches to the monolithic KOffice ebuild.

Package-Manager: portage-2.0.54-r2

7 files changed, 143 insertions, 56 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 5f71cf67c04c..494c685d7e14 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.166 2006/05/28 18:07:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.167 2006/05/28 21:12:37 carlo Exp $
+
+*koffice-1.5.1-r1 (28 May 2006)
+
+  28 May 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kexi-1.5.1-form_plugins.patch,
+  +files/kexi-1.5.1-kexi_checkbox_data_saving.patch, -koffice-1.5.1.ebuild,
+  +koffice-1.5.1-r1.ebuild:
+  Missed to add Kexi patches to the monolithic KOffice ebuild.
 
   28 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/CAN-2005-0064.patch, -koffice-1.4.2-r4.ebuild,
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 6231e4e4d6b8..788c52cad717 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,57 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kexi-1.4.2-gcc41.patch 1094 RMD160 ffc028b187ec7437aab156f3e575b945b390845c SHA1 2c5944a2e705d05abcb65674639b1b85ec22f6c9 SHA256 7c0790dacdc090b8cb176a8289facc471d6ef4ea2c93bb6ac985e6497fac1eef
+MD5 000dc036561b6840db5b2def32c3f59f ChangeLog 23256
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r6 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r7 68
+MD5 fe78a2b5bbdc967e525fd94c7a55e241 files/digest-koffice-1.5.1-r1 68
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
-RMD160 ffc028b187ec7437aab156f3e575b945b390845c files/kexi-1.4.2-gcc41.patch 1094
-SHA256 7c0790dacdc090b8cb176a8289facc471d6ef4ea2c93bb6ac985e6497fac1eef files/kexi-1.4.2-gcc41.patch 1094
-AUX krita-1.4.2-gcc41.patch 656 RMD160 38a6dddfb244c2b65525edd8bd219854397eff8a SHA1 1fbccf29a08de0524590d408577ea1999b7bc53e SHA256 4f7fdc791cc6f811ed375741d1e1cc97eec7fbc72f0b23a22e0520afdf37f108
+MD5 bccc9dee6dd7b318b1bb77c31ed74404 files/kexi-1.5.1-form_plugins.patch 3021
+MD5 4a60d6e8b86c1b332def656aff1542dc files/kexi-1.5.1-kexi_checkbox_data_saving.patch 2488
 MD5 7d57f921f9a3827f925a3457413914b8 files/krita-1.4.2-gcc41.patch 656
-RMD160 38a6dddfb244c2b65525edd8bd219854397eff8a files/krita-1.4.2-gcc41.patch 656
-SHA256 4f7fdc791cc6f811ed375741d1e1cc97eec7fbc72f0b23a22e0520afdf37f108 files/krita-1.4.2-gcc41.patch 656
-AUX kspread-1.4.2-gcc41.patch 451 RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 SHA1 4864b69746b56c2b8e75a7e3d06097a133804b5f SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
-RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
-SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a files/kspread-1.4.2-gcc41.patch 451
-AUX post-1.3-koffice-CAN-2005-3193.diff 6760 RMD160 756f949cfcbf9fd2ce9237504d9c596970308f88 SHA1 398fe151fc78e06f70789f8c98b880721447fd1a SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a
 MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-RMD160 756f949cfcbf9fd2ce9237504d9c596970308f88 files/post-1.3-koffice-CAN-2005-3193.diff 6760
-SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a files/post-1.3-koffice-CAN-2005-3193.diff 6760
-DIST koffice-1.4.2.tar.bz2 19486852
-DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
-EBUILD koffice-1.4.2-r6.ebuild 1605 RMD160 b94567f9333ef8ff8857839a57e112cc912c06a3 SHA1 d14359139b0f5dd01ff97680bde90d3aaf2090ec SHA256 deed07bcb9cd35d1b76bc6418853043cdc70faaad50454acdee83fc28b7129fd
 MD5 b3d9b72fb4595e51d7b48af3c1f1cf9c koffice-1.4.2-r6.ebuild 1605
-RMD160 b94567f9333ef8ff8857839a57e112cc912c06a3 koffice-1.4.2-r6.ebuild 1605
-SHA256 deed07bcb9cd35d1b76bc6418853043cdc70faaad50454acdee83fc28b7129fd koffice-1.4.2-r6.ebuild 1605
-EBUILD koffice-1.4.2-r7.ebuild 1732 RMD160 b20211d3779bc019cbb6623db1cabf77c534ce55 SHA1 fdd7c3b2d0b234801493a4576ad9fc169ad30473 SHA256 db4b667d4c4abf14ae06932614aea18e7af2119dbb651b7f298b33f5e2437a3f
 MD5 6a1d2ec12afd0fcb1117d7f8e22d7152 koffice-1.4.2-r7.ebuild 1732
-RMD160 b20211d3779bc019cbb6623db1cabf77c534ce55 koffice-1.4.2-r7.ebuild 1732
-SHA256 db4b667d4c4abf14ae06932614aea18e7af2119dbb651b7f298b33f5e2437a3f koffice-1.4.2-r7.ebuild 1732
-EBUILD koffice-1.5.1.ebuild 1714 RMD160 b9422b4f6bf85eb619b5de7bc0ed9658c925838f SHA1 2cb7aa80601fbb2cefe446f558a44672623e42d1 SHA256 0bf865cd086cc4432d71498b5a658d6ddcddd02bc8c4bf11cfcd732730d6f75d
-MD5 ffc4c5ce71c390b2f2ad75bb00169129 koffice-1.5.1.ebuild 1714
-RMD160 b9422b4f6bf85eb619b5de7bc0ed9658c925838f koffice-1.5.1.ebuild 1714
-SHA256 0bf865cd086cc4432d71498b5a658d6ddcddd02bc8c4bf11cfcd732730d6f75d koffice-1.5.1.ebuild 1714
-MISC ChangeLog 22970 RMD160 a8fce44ee9ef67dfe35042c7572be21241ad665e SHA1 fd5b0efa60758e08d7c94cea1e0ad6bf53661d42 SHA256 c6b117803bfd32aa8dee783c9e4d104b8d1de177b60fda7c13e6e2a0d60ecc44
-MD5 5a7870bebfdaa1c9e0d466da3403555e ChangeLog 22970
-RMD160 a8fce44ee9ef67dfe35042c7572be21241ad665e ChangeLog 22970
-SHA256 c6b117803bfd32aa8dee783c9e4d104b8d1de177b60fda7c13e6e2a0d60ecc44 ChangeLog 22970
-MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
+MD5 117579f31ae3ea84361ceafa9d19f985 koffice-1.5.1-r1.ebuild 1826
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r6 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-koffice-1.4.2-r6 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-koffice-1.4.2-r6 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r7 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-koffice-1.4.2-r7 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-koffice-1.4.2-r7 68
-MD5 c1278e570720330905fa70415bf059cc files/digest-koffice-1.5.1 250
-RMD160 5b7151313000b75d298f72d749ae33a6754596ac files/digest-koffice-1.5.1 250
-SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/digest-koffice-1.5.1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEeebOAiZjviIA2XgRAowdAKDdfCP8U8m1wzYks/C4Y3o8ysBRJQCgjzSa
-v81uMFwk8LhsIXGDAQ/A868=
-=29nX
------END PGP SIGNATURE-----
diff --git a/app-office/koffice/files/digest-koffice-1.5.1 b/app-office/koffice/files/digest-koffice-1.5.1
deleted file mode 100644
index e41801980c7a..000000000000
--- a/app-office/koffice/files/digest-koffice-1.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 36010120
-RMD160 3fb67d50554c081104080d3230ba10f022f4a990 koffice-1.5.1.tar.bz2 36010120
-SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 koffice-1.5.1.tar.bz2 36010120
diff --git a/app-office/koffice/files/digest-koffice-1.5.1-r1 b/app-office/koffice/files/digest-koffice-1.5.1-r1
new file mode 100644
index 000000000000..9a1f91a3503c
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.5.1-r1
@@ -0,0 +1 @@
+MD5 50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 36010120
diff --git a/app-office/koffice/files/kexi-1.5.1-form_plugins.patch b/app-office/koffice/files/kexi-1.5.1-form_plugins.patch
new file mode 100644
index 000000000000..a387fbef2ef1
--- /dev/null
+++ b/app-office/koffice/files/kexi-1.5.1-form_plugins.patch
@@ -0,0 +1,56 @@
+Index: kexi/plugins/forms/Makefile.am
+===================================================================
+--- kexi/plugins/forms/Makefile.am	(wersja 541836)
++++ kexi/plugins/forms/Makefile.am	(kopia robocza)
+@@ -23,9 +23,10 @@
+ 	kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
+ 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
+ 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
+-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ 
+ kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
+Index: kexi/plugins/reports/Makefile.am
+===================================================================
+--- kexi/plugins/reports/Makefile.am	(wersja 541836)
++++ kexi/plugins/reports/Makefile.am	(kopia robocza)
+@@ -5,24 +5,29 @@
+ kexihandler_report_la_SOURCES = kexireports.cpp
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+-  ../../widget/utils/libkexiguiutils.la \
+-  ../../widget/libkexiextendedwidgets.la \
+-  ../../formeditor/libkformdesigner.la \
+-  ../forms/libkexiformutils.la \
++  $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
++  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++  $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
+   ./libkexireportutils.la
+ 
+ kexireportwidgets_la_LDFLAGS =  $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+ kexireportwidgets_la_SOURCES =   reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ 	./libkexireportutils.la
+ 
+ lib_LTLIBRARIES = libkexireportutils.la
+ libkexireportutils_la_SOURCES = \
+ 	kexireportpart.cpp kexireportview.cpp kexireportform.cpp
+-libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+-	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
+ 
+ kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
+ kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop
diff --git a/app-office/koffice/files/kexi-1.5.1-kexi_checkbox_data_saving.patch b/app-office/koffice/files/kexi-1.5.1-kexi_checkbox_data_saving.patch
new file mode 100644
index 000000000000..798a3a872111
--- /dev/null
+++ b/app-office/koffice/files/kexi-1.5.1-kexi_checkbox_data_saving.patch
@@ -0,0 +1,65 @@
+Index: kexi/plugins/forms/kexidataprovider.cpp
+===================================================================
+--- kexi/plugins/forms/kexidataprovider.cpp	(revision 542130)
++++ kexi/plugins/forms/kexidataprovider.cpp	(revision 542131)
+@@ -92,7 +92,8 @@
+  	for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); 
+ 		it!=m_fieldNumbersForDataItems.constEnd(); ++it)
+ 	{
+-		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() << endl;
++		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() 
++			<< " data=" << row.at(it.data()) << endl;
+ 		it.key()->setValue( row.at(it.data()) );
+ 	}
+ }
+Index: kexi/plugins/forms/widgets/kexidbautofield.cpp
+===================================================================
+--- kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542130)
++++ kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542131)
+@@ -446,8 +446,11 @@
+ 		@todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool]
+ 		(see doc/dev/settings.txt) */
+ 			if (!text.isEmpty()) {
+-				realText = text[0].upper();
+-				realText += (text.mid(1) + ": ");
++				realText = text[0].upper() + text.mid(1);
++				if (m_widgetType!=Boolean) {
++//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
++					realText += ": ";
++				}
+ 			}
+ 		}
+ 		else
+Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+===================================================================
+--- kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542130)
++++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542131)
+@@ -27,7 +27,9 @@
+  : QCheckBox(text, parent, name), KexiFormDataItemInterface()
+ {
+ 	m_invalidState = false;
++//! todo: tristate 
+ 	setTristate(true);
++	setFocusPolicy(QWidget::StrongFocus);
+ 	connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
+ }
+ 
+@@ -56,13 +58,16 @@
+ 
+ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool )
+ {
+-	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
++//	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
++	setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) );
+ }
+ 
+ QVariant
+ KexiDBCheckBox::value()
+ {
+-	return QVariant( isChecked(), 3 );
++	if (state()==NoChange)
++		return QVariant();
++	return QVariant(state()==On, 1);
+ }
+ 
+ void KexiDBCheckBox::slotStateChanged(int )
diff --git a/app-office/koffice/koffice-1.5.1.ebuild b/app-office/koffice/koffice-1.5.1-r1.ebuild
index afe4335fb5da..388232ed51b4 100644
--- a/app-office/koffice/koffice-1.5.1.ebuild
+++ b/app-office/koffice/koffice-1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.5.1.ebuild,v 1.1 2006/05/20 15:31:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.5.1-r1.ebuild,v 1.1 2006/05/28 21:12:37 carlo Exp $
 
 inherit kde
 
@@ -44,12 +44,15 @@ for x in $(get-child-packages ${CATEGORY}/${PN}); do
 	RDEPEND="${RDEPEND} !${x}"
 done
 
-need-kde 3.3
+need-kde 3.4
 
 # TODO: kword sql plugin needs Qt compiled with sql support
 # the dependency on python is needed for scripting support in kexi
 # and for kivio/kiviopart/kiviosdk.
 
+PATCHES="${FILESDIR}/kexi-1.5.1-form_plugins.patch
+	${FILESDIR}/kexi-1.5.1-kexi_checkbox_data_saving.patch"
+
 src_compile() {
 	local myconf="$(use_enable mysql) $(use_enable postgres pgsql) $(use_enable opengl gl)"