Version bump.

Package-Manager: portage-2.0.54-r2

6 files changed, 185 insertions, 2 deletions

diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index e66637a53d59..87e6a5dc8db7 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.33 2006/04/13 19:18:38 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.34 2006/05/20 15:21:41 carlo Exp $
+
+*kexi-1.5.1 (20 May 2006)
+
+  20 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, +kexi-1.5.1.ebuild:
+  Version bump.
 
   13 Apr 2006; Carsten Lohrke <carlo@gentoo.org> kexi-1.5.0.ebuild:
   Missing ~ppc keyword.
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index b0031c02c17b..2f586842b842 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,14 +1,18 @@
-MD5 8cd47d7dd566f529719d140517dec670 ChangeLog 3732
+MD5 7b1a919e8bead26b9e641bfdf9de14b4 ChangeLog 3938
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2-r1 68
 MD5 b2c444dbd353b179d6f2f5a770240183 files/digest-kexi-1.5.0 68
+MD5 fe78a2b5bbdc967e525fd94c7a55e241 files/digest-kexi-1.5.1 68
 MD5 82af01b67d83c02945f1e26ae9529232 files/digest-kexi-1.5_beta1 253
 MD5 a08e04910037e4b3b9e9cbfb92eda61e files/digest-kexi-1.5_beta2 69
 MD5 f01ddda79b7e0afa602b27c09ae05217 files/digest-kexi-1.5_rc1 72
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
+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 01b797c688b5f719c1aa8172e7fefd1e kexi-1.4.2-r1.ebuild 1130
 MD5 3459c72e14104b6ae964cf21299a23dc kexi-1.4.2.ebuild 1077
 MD5 42b7a14f6ce9adf9b8330fc78aff709f kexi-1.5.0.ebuild 1138
+MD5 7fae8087558d43ed1da7874536d731d7 kexi-1.5.1.ebuild 1247
 MD5 231ba18c6c699034c49b88c89438a10e kexi-1.5_beta1.ebuild 1137
 MD5 600bf21776840b35a9d9c3aa3e9af5ba kexi-1.5_beta2.ebuild 1137
 MD5 ccfc20f562b1be8a0aac8d6e171e0ab2 kexi-1.5_rc1.ebuild 1141
diff --git a/app-office/kexi/files/digest-kexi-1.5.1 b/app-office/kexi/files/digest-kexi-1.5.1
new file mode 100644
index 000000000000..9a1f91a3503c
--- /dev/null
+++ b/app-office/kexi/files/digest-kexi-1.5.1
@@ -0,0 +1 @@
+MD5 50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2 36010120
diff --git a/app-office/kexi/files/kexi-1.5.1-form_plugins.patch b/app-office/kexi/files/kexi-1.5.1-form_plugins.patch
new file mode 100644
index 000000000000..a387fbef2ef1
--- /dev/null
+++ b/app-office/kexi/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/kexi/files/kexi-1.5.1-kexi_checkbox_data_saving.patch b/app-office/kexi/files/kexi-1.5.1-kexi_checkbox_data_saving.patch
new file mode 100644
index 000000000000..798a3a872111
--- /dev/null
+++ b/app-office/kexi/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/kexi/kexi-1.5.1.ebuild b/app-office/kexi/kexi-1.5.1.ebuild
new file mode 100644
index 000000000000..5f7f8d2da962
--- /dev/null
+++ b/app-office/kexi/kexi-1.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.5.1.ebuild,v 1.1 2006/05/20 15:21:41 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="~amd64 ~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"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoproperty lib/koproperty
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkrossmain lib/kross/main/
+	libkrossapi lib/kross/api/"
+
+KMEXTRACTONLY="lib/"
+
+need-kde 3.4
+
+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) --enable-kexi-reports"
+
+	kde-meta_src_compile
+}