Update to version 3.2.3

4 files changed, 13 insertions, 49 deletions

diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index 33cd17607b0f..abd99763d92f 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeedu-3.2.2.tar.bz2) = 97174178360396ea50e69097979b8319
-SIZE (KDE/kdeedu-3.2.2.tar.bz2) = 22380094
+MD5 (KDE/kdeedu-3.2.3.tar.bz2) = 1c41b731f26269fdb39f2c097a95dd9a
+SIZE (KDE/kdeedu-3.2.3.tar.bz2) = 22367583
diff --git a/misc/kdeedu4/files/patch-kbruch_src_mainqtwidget.cpp b/misc/kdeedu4/files/patch-kbruch_src_mainqtwidget.cpp
new file mode 100644
index 000000000000..b429bbb1ae47
--- /dev/null
+++ b/misc/kdeedu4/files/patch-kbruch_src_mainqtwidget.cpp
@@ -0,0 +1,11 @@
+--- kbruch/src/mainqtwidget.cpp.orig	Sat Jun  5 03:34:59 2004
++++ kbruch/src/mainqtwidget.cpp	Sat Jun  5 03:40:39 2004
+@@ -92,7 +92,7 @@
+ 	m_maxMainDenominator = m_config->readNumEntry("max_main_denominator", 10);
+ 
+    /* make sure that we can load config files with corrupted values */
+-   if (m_mulDiv == true and pow(2, m_nrRatios) > m_maxMainDenominator)
++   if (m_mulDiv == true && pow(2, m_nrRatios) > m_maxMainDenominator)
+    {
+       m_nrRatios = 2;
+       m_maxMainDenominator = 10;
diff --git a/misc/kdeedu4/files/patch-kstars_kstars_indi_indidevapi.h b/misc/kdeedu4/files/patch-kstars_kstars_indi_indidevapi.h
deleted file mode 100644
index b538397ce58c..000000000000
--- a/misc/kdeedu4/files/patch-kstars_kstars_indi_indidevapi.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- kstars/kstars/indi/indidevapi.h	2004/03/29 17:55:49	1.1.2.2
-+++ kstars/kstars/indi/indidevapi.h	2004/04/10 12:38:18	1.1.2.3
-@@ -155,9 +155,9 @@ extern ISwitch *IUFindOnSwitch (const IS
- /* function to set all property switches off */
- extern void IUResetSwitches(const ISwitchVectorProperty *svp);
- 
--extern int IUUpdateSwitches(const ISwitchVectorProperty *svp, ISState *states, char *names[], int n);
-+extern int IUUpdateSwitches(ISwitchVectorProperty *svp, ISState *states, char *names[], int n);
- 
--extern int IUUpdateNumbers(const INumberVectorProperty *nvp, double values[], char *names[], int n);
-+extern int IUUpdateNumbers(INumberVectorProperty *nvp, double values[], char *names[], int n);
- 
- /* function to reliably save new text in a IText */
- extern void IUSaveText (IText *tp, const char *newtext);
-@@ -202,5 +202,5 @@ extern void ISNewSwitch (const char *dev
- #endif
- 
- /* For RCS Only -- Do Not Edit
-- * @(#) $RCSfile: indidevapi.h,v $ $Date: 2004/03/29 17:55:49 $ $Revision: 1.1.2.2 $ $Name:  $
-+ * @(#) $RCSfile: indidevapi.h,v $ $Date: 2004/04/10 12:38:18 $ $Revision: 1.1.2.3 $ $Name:  $
-  */
diff --git a/misc/kdeedu4/files/patch-kstars_kstars_indi_indidrivermain.c b/misc/kdeedu4/files/patch-kstars_kstars_indi_indidrivermain.c
deleted file mode 100644
index 3d918e777432..000000000000
--- a/misc/kdeedu4/files/patch-kstars_kstars_indi_indidrivermain.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- kstars/kstars/indi/indidrivermain.c	2004/03/29 17:55:49	1.2.2.3
-+++ kstars/kstars/indi/indidrivermain.c	2004/04/10 12:38:18	1.2.2.4
-@@ -546,7 +546,7 @@ IUResetSwitches(const ISwitchVectorPrope
- 
- /* Update property switches in accord with states and names. */
- int 
--IUUpdateSwitches(const ISwitchVectorProperty *svp, ISState *states, char *names[], int n)
-+IUUpdateSwitches(ISwitchVectorProperty *svp, ISState *states, char *names[], int n)
- {
-  int i=0;
-  
-@@ -571,7 +571,7 @@ IUUpdateSwitches(const ISwitchVectorProp
- }
- 
- /* Update property numbers in accord with values and names */
--int IUUpdateNumbers(const INumberVectorProperty *nvp, double values[], char *names[], int n)
-+int IUUpdateNumbers(INumberVectorProperty *nvp, double values[], char *names[], int n)
- {
-   int i=0;
-   
-@@ -926,4 +926,4 @@ timestamp()
- }
- 
- /* For RCS Only -- Do Not Edit */
--static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: indidrivermain.c,v $ $Date: 2004/03/29 17:55:49 $ $Revision: 1.2.2.3 $ $Name:  $"};
-+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: indidrivermain.c,v $ $Date: 2004/04/10 12:38:18 $ $Revision: 1.2.2.4 $ $Name:  $"};