Mon Jun 25 11:31:20 2012 UTC ()
Fix build with Clang.


(joerg)
diff -r1.41 -r1.42 pkgsrc/misc/kdeedu3/distinfo
diff -r0 -r1.1 pkgsrc/misc/kdeedu3/patches/patch-kalzium_src_spectrumviewimpl.cpp
diff -r0 -r1.1 pkgsrc/misc/kdeedu3/patches/patch-kiten_dict.h
diff -r0 -r1.1 pkgsrc/misc/kdeedu3/patches/patch-kiten_xjdxgen.c
diff -r0 -r1.1 pkgsrc/misc/kdeedu3/patches/patch-kstars_kstars_skyobject.cpp

cvs diff -r1.41 -r1.42 pkgsrc/misc/kdeedu3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/kdeedu3/Attic/distinfo 2008/08/27 12:16:42 1.41
+++ pkgsrc/misc/kdeedu3/Attic/distinfo 2012/06/25 11:31:20 1.42
@@ -1,11 +1,15 @@ @@ -1,11 +1,15 @@
1$NetBSD: distinfo,v 1.41 2008/08/27 12:16:42 markd Exp $ 1$NetBSD: distinfo,v 1.42 2012/06/25 11:31:20 joerg Exp $
2 2
3SHA1 (kdeedu-3.5.10.tar.bz2) = c43f7bcd9cb7af7c77a78bc0bd7f51c0e572f589 3SHA1 (kdeedu-3.5.10.tar.bz2) = c43f7bcd9cb7af7c77a78bc0bd7f51c0e572f589
4RMD160 (kdeedu-3.5.10.tar.bz2) = 312d0384fbf243d580b0d3d90e3e21b46a117d0d 4RMD160 (kdeedu-3.5.10.tar.bz2) = 312d0384fbf243d580b0d3d90e3e21b46a117d0d
5Size (kdeedu-3.5.10.tar.bz2) = 30181670 bytes 5Size (kdeedu-3.5.10.tar.bz2) = 30181670 bytes
6SHA1 (patch-aa) = 08c298cb546165f5fa4854b7ecb2b60e5da9c195 6SHA1 (patch-aa) = 08c298cb546165f5fa4854b7ecb2b60e5da9c195
7SHA1 (patch-ab) = 6f7122f34d2894489b933d90644022f71192b023 7SHA1 (patch-ab) = 6f7122f34d2894489b933d90644022f71192b023
8SHA1 (patch-ac) = 46e3c0ebf7172f937d919087bc06272fb377b4ae 8SHA1 (patch-ac) = 46e3c0ebf7172f937d919087bc06272fb377b4ae
9SHA1 (patch-ad) = f936f907fb1c283a5470498c4c78027804b8d13f 9SHA1 (patch-ad) = f936f907fb1c283a5470498c4c78027804b8d13f
10SHA1 (patch-ae) = 643cc5c94c96d8cc5d0b601e8210998ff7fb3ab1 10SHA1 (patch-ae) = 643cc5c94c96d8cc5d0b601e8210998ff7fb3ab1
11SHA1 (patch-af) = 75798ce6bc4edf3563fbdebc21b9a04127732e4b 11SHA1 (patch-af) = 75798ce6bc4edf3563fbdebc21b9a04127732e4b
 12SHA1 (patch-kalzium_src_spectrumviewimpl.cpp) = f2ee83534c7ee477e92227d2f3eee9f582ce7722
 13SHA1 (patch-kiten_dict.h) = 7b6b27dd9935ef3262eb1defc9d84c0884ae6b94
 14SHA1 (patch-kiten_xjdxgen.c) = 6c01e2a7d53833e1f38ea85b6626b8460f729a6e
 15SHA1 (patch-kstars_kstars_skyobject.cpp) = e0fbe76e6d485c651b5dddb8ef09bc8069d306b4

File Added: pkgsrc/misc/kdeedu3/patches/Attic/patch-kalzium_src_spectrumviewimpl.cpp
$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;

File Added: pkgsrc/misc/kdeedu3/patches/Attic/patch-kiten_dict.h
$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

File Added: pkgsrc/misc/kdeedu3/patches/Attic/patch-kiten_xjdxgen.c
$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;

File Added: pkgsrc/misc/kdeedu3/patches/Attic/patch-kstars_kstars_skyobject.cpp
$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. );