Fix build with Clang.

5 files changed, 65 insertions, 1 deletions

diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index 2f1fdbedd87..34aaa6a45e6 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2008/08/27 12:16:42 markd Exp $
+$NetBSD: distinfo,v 1.42 2012/06/25 11:31:20 joerg Exp $
 
 SHA1 (kdeedu-3.5.10.tar.bz2) = c43f7bcd9cb7af7c77a78bc0bd7f51c0e572f589
 RMD160 (kdeedu-3.5.10.tar.bz2) = 312d0384fbf243d580b0d3d90e3e21b46a117d0d
@@ -9,3 +9,7 @@ SHA1 (patch-ac) = 46e3c0ebf7172f937d919087bc06272fb377b4ae
 SHA1 (patch-ad) = f936f907fb1c283a5470498c4c78027804b8d13f
 SHA1 (patch-ae) = 643cc5c94c96d8cc5d0b601e8210998ff7fb3ab1
 SHA1 (patch-af) = 75798ce6bc4edf3563fbdebc21b9a04127732e4b
+SHA1 (patch-kalzium_src_spectrumviewimpl.cpp) = f2ee83534c7ee477e92227d2f3eee9f582ce7722
+SHA1 (patch-kiten_dict.h) = 7b6b27dd9935ef3262eb1defc9d84c0884ae6b94
+SHA1 (patch-kiten_xjdxgen.c) = 6c01e2a7d53833e1f38ea85b6626b8460f729a6e
+SHA1 (patch-kstars_kstars_skyobject.cpp) = e0fbe76e6d485c651b5dddb8ef09bc8069d306b4
diff --git a/misc/kdeedu3/patches/patch-kalzium_src_spectrumviewimpl.cpp b/misc/kdeedu3/patches/patch-kalzium_src_spectrumviewimpl.cpp
new file mode 100644
index 00000000000..b580c50996c
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kalzium_src_spectrumviewimpl.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-kalzium_src_spectrumviewimpl.cpp,v 1.1 2012/06/25 11:31:20 joerg Exp $
+
+--- kalzium/src/spectrumviewimpl.cpp.orig	2012-06-18 20:15:46.000000000 +0000
++++ kalzium/src/spectrumviewimpl.cpp
+@@ -39,7 +39,8 @@ void SpectrumViewImpl::slotExportAsImage
+ 	                        this, i18n( "Save Spectrum" ) );
+ 	if( !fileName.isEmpty() )
+ 	{
+-		if ( !exporter->saveAsImage( &m_spectrumWidget->pixmap(), fileName ) )
++		QPixmap p(m_spectrumWidget->pixmap());
++		if ( !exporter->saveAsImage( &p, fileName ) )
+ 			KMessageBox::error( this, i18n( "The spectrum could not be saved" ), i18n( "Image Could Not Be Saved") );
+ 	}	
+ 	delete exporter;
diff --git a/misc/kdeedu3/patches/patch-kiten_dict.h b/misc/kdeedu3/patches/patch-kiten_dict.h
new file mode 100644
index 00000000000..bc22d90054a
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kiten_dict.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-kiten_dict.h,v 1.1 2012/06/25 11:31:20 joerg Exp $
+
+--- kiten/dict.h.orig	2012-06-18 20:23:20.000000000 +0000
++++ kiten/dict.h
+@@ -65,12 +65,12 @@ template<class T> Array<T>::Array(T *d, 
+ 	, data(d)
+ 	, dataSize(s)
+ {
+-	setRawData(data, dataSize / sizeof(T));
++	this->setRawData(data, dataSize / sizeof(T));
+ }
+ 
+ template<class T> Array<T>::~Array()
+ {
+-	resetRawData(data, dataSize / sizeof(T));
++	this->resetRawData(data, dataSize / sizeof(T));
+ }
+ 
+ // File manages all the files, pointers, and memory management associated
diff --git a/misc/kdeedu3/patches/patch-kiten_xjdxgen.c b/misc/kdeedu3/patches/patch-kiten_xjdxgen.c
new file mode 100644
index 00000000000..cf9e2539fae
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kiten_xjdxgen.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-kiten_xjdxgen.c,v 1.1 2012/06/25 11:31:20 joerg Exp $
+
+--- kiten/xjdxgen.c.orig	2012-06-18 20:27:33.000000000 +0000
++++ kiten/xjdxgen.c
+@@ -86,7 +86,7 @@ extern char *getenv(const char *name);
+ /*====function to Load Dictionary and load/create index table=======*/
+ int  main(argc,argv)
+ int argc;
+-unsigned char **argv;
++char **argv;
+ {
+   FILE *fp,*fopen();
+   uint32_t possav,schi,diclen,indlen;
diff --git a/misc/kdeedu3/patches/patch-kstars_kstars_skyobject.cpp b/misc/kdeedu3/patches/patch-kstars_kstars_skyobject.cpp
new file mode 100644
index 00000000000..5465fbc6dec
--- /dev/null
+++ b/misc/kdeedu3/patches/patch-kstars_kstars_skyobject.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-kstars_kstars_skyobject.cpp,v 1.1 2012/06/25 11:31:20 joerg Exp $
+
+--- kstars/kstars/skyobject.cpp.orig	2012-06-18 20:34:47.000000000 +0000
++++ kstars/kstars/skyobject.cpp
+@@ -101,7 +101,8 @@ QTime SkyObject::riseSetTime( const KSta
+ 	//to bring it above the horizon
+ 	KStarsDateTime dt2 = dt;
+ 	SkyPoint p = recomputeCoords( dt, geo );
+-	p.EquatorialToHorizontal( &(geo->GSTtoLST( dt.gst() )), geo->lat() );
++	dms lst(geo->GSTtoLST( dt.gst() ));
++	p.EquatorialToHorizontal( &lst, geo->lat() );
+ 	if ( p.alt()->Degrees() < 0.0 ) {
+ 		if ( p.az()->Degrees() < 180.0 ) { //object has not risen yet
+ 			dt2 = dt.addSecs( 12.*3600. );