Update to 0.7

PR:		ports/69101
Submitted by:	Andrej Zverev <az@inec.ru>
Approved by:	krion (mentor)

6 files changed, 45 insertions, 4 deletions

diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index 298870c14f02..fa01262acb7c 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		knoda
-PORTVERSION=		0.6.3
+PORTVERSION=		0.7
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MAINTAINER=		sem@FreeBSD.org
 COMMENT=		Database frontend for KDE
 
 BUILD_DEPENDS=		${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
-LIB_DEPENDS=		hk_classes.5:${PORTSDIR}/databases/hk_classes
+LIB_DEPENDS=		hk_classes.6:${PORTSDIR}/databases/hk_classes
 
 USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
diff --git a/databases/knoda/distinfo b/databases/knoda/distinfo
index e7dc951a59a0..a9182e248e77 100644
--- a/databases/knoda/distinfo
+++ b/databases/knoda/distinfo
@@ -1,2 +1,2 @@
-MD5 (knoda-0.6.3.tar.bz2) = afa3e8739e6629fbaf0ae63fae2fa08a
-SIZE (knoda-0.6.3.tar.bz2) = 658238
+MD5 (knoda-0.7.tar.bz2) = 40bec8b2b27cfcc486731951971fd288
+SIZE (knoda-0.7.tar.bz2) = 696659
diff --git a/databases/knoda/files/patch-hk_kdeclasses::hk_kdedbdesigner.cpp b/databases/knoda/files/patch-hk_kdeclasses::hk_kdedbdesigner.cpp
new file mode 100644
index 000000000000..9d268630d6a1
--- /dev/null
+++ b/databases/knoda/files/patch-hk_kdeclasses::hk_kdedbdesigner.cpp
@@ -0,0 +1,11 @@
+--- hk_kdeclasses/hk_kdedbdesigner.cpp.orig	Thu Jul 15 22:18:12 2004
++++ hk_kdeclasses/hk_kdedbdesigner.cpp	Thu Jul 15 22:21:24 2004
+@@ -238,7 +238,7 @@
+ 	QString n;
+ 	//cerr <<"drag wert="<<index(itemAt(event->pos()))<<endl;
+ 	n.setNum(p_datasourceframe->datasource()->presentationnumber());
+-	n="<VUPN>"+n+"</VUPN>\n<VALUE>"+( itemAt(event->pos())?itemAt(event->pos())->text():"") +"</VALUE>\n";
++	n="<VUPN>"+n+"</VUPN>\n<VALUE>"+( itemAt(event->pos())?itemAt(event->pos())->text():static_cast<QString>("")) +"</VALUE>\n";
+ 	//cerr<<"dragwert"<<n<<endl;
+         QCString cstr =n.utf8();
+ 	//cerr<"cstr"<<cstr<<endl;
diff --git a/databases/knoda/files/patch-hk_kdeclasses::hk_kdedblistview.cpp b/databases/knoda/files/patch-hk_kdeclasses::hk_kdedblistview.cpp
new file mode 100644
index 000000000000..452982e84792
--- /dev/null
+++ b/databases/knoda/files/patch-hk_kdeclasses::hk_kdedblistview.cpp
@@ -0,0 +1,11 @@
+--- hk_kdeclasses/hk_kdedblistview.cpp.orig	Thu Jul 15 23:11:07 2004
++++ hk_kdeclasses/hk_kdedblistview.cpp	Thu Jul 15 23:19:51 2004
+@@ -634,7 +634,7 @@
+     if (xtype=="DATABASE"
+         && !(database()->connection()&&database()->connection()->server_supports(hk_connection::SUPPORTS_NEW_DATABASE)))
+         cancreate=false;
+-   return (event->provides("application/x-hk_filecopy")&&event->source()!=this && cancreate);
++   return (event->provides("application/x-hk_filecopy")&&event->source()!=(QWidget*)this && cancreate);
+ }
+ 
+ 
diff --git a/databases/knoda/files/patch-hk_kdeclasses::hk_kdeqbe.cpp b/databases/knoda/files/patch-hk_kdeclasses::hk_kdeqbe.cpp
new file mode 100644
index 000000000000..178736d5a51d
--- /dev/null
+++ b/databases/knoda/files/patch-hk_kdeclasses::hk_kdeqbe.cpp
@@ -0,0 +1,11 @@
+--- hk_kdeclasses/hk_kdeqbe.cpp.orig	Thu Jul 15 22:28:21 2004
++++ hk_kdeclasses/hk_kdeqbe.cpp	Thu Jul 15 23:08:55 2004
+@@ -388,7 +388,7 @@
+   for (int i=0;i<p_private->p_table->numCols();++i)
+   {
+     if ( ((QComboTableItem*)(p_private->p_table->item(1,i)))->currentItem()>0 // field
+-          || !(((QComboTableItem*)(p_private->p_table->item(1,i)))->text().isEmpty())
++          || !(((QComboTableItem*)(p_private->p_table->item(1,i)))->currentText().isEmpty())
+        )
+      { 
+ 
diff --git a/databases/knoda/pkg-plist b/databases/knoda/pkg-plist
index 58654cdcf1ff..c9143b5edc54 100644
--- a/databases/knoda/pkg-plist
+++ b/databases/knoda/pkg-plist
@@ -1,14 +1,19 @@
 bin/knoda
 share/applnk/Office/knoda.desktop
+share/apps/hk_kdeclasses/hk_kdedbdesigner.rc
+share/apps/hk_kdeclasses/hk_kdedbdesignerpart.rc
 share/apps/hk_kdeclasses/hk_kdeform.rc
 share/apps/hk_kdeclasses/hk_kdegridpart.rc
 share/apps/hk_kdeclasses/hk_kdeinterpreterdialog.rc
+share/apps/hk_kdeclasses/hk_kdeqbepart.rc
 share/apps/hk_kdeclasses/hk_kdequery.rc
 share/apps/hk_kdeclasses/hk_kdereport.rc
 share/apps/hk_kdeclasses/hk_kdetable.rc
+share/apps/hk_kdeclasses/knodamaindockwindowbase.rc
 share/apps/hk_kdeclasses/pics/boolean22x22.png
 share/apps/hk_kdeclasses/pics/button.png
 share/apps/hk_kdeclasses/pics/combobox22x22.png
+share/apps/hk_kdeclasses/pics/dbdesigner.png
 share/apps/hk_kdeclasses/pics/designmode.png
 share/apps/hk_kdeclasses/pics/edit.png
 share/apps/hk_kdeclasses/pics/exit.png
@@ -16,6 +21,7 @@ share/apps/hk_kdeclasses/pics/filter.png
 share/apps/hk_kdeclasses/pics/filterexec.png
 share/apps/hk_kdeclasses/pics/find.png
 share/apps/hk_kdeclasses/pics/grid22x22.png
+share/apps/hk_kdeclasses/pics/gridadd22x22.png
 share/apps/hk_kdeclasses/pics/gridcursor.png
 share/apps/hk_kdeclasses/pics/gridfilter.png
 share/apps/hk_kdeclasses/pics/label.png
@@ -40,7 +46,9 @@ share/icons/locolor/32x32/apps/knoda.png
 share/locale/de/LC_MESSAGES/knoda.mo
 share/locale/es/LC_MESSAGES/knoda.mo
 share/locale/hu/LC_MESSAGES/knoda.mo
+share/services/hk_kdedbdesignerpart.desktop
 share/services/hk_kdegridpart.desktop
+share/services/hk_kdeqbepart.desktop
 @dirrm share/apps/hk_kdeclasses/pics/
 @dirrm share/apps/hk_kdeclasses
 @dirrm share/apps/knoda/pics