Here are some patches to allow kdesupport, kdelibs, and kdebase to compile
properly on my machine. There's still a newly introduced problem in kdeedu
which I haven't had time to fix yet. The diff is relative to Build/Patches.
Index: kdelibs-kdeui.diff
===================================================================
--- kdelibs-kdeui.diff (revision 2359)
+++ kdelibs-kdeui.diff (working copy)
@@ -15,3 +15,19 @@
#define KPIXMAPCACHE_VERSION 0x000208
namespace {
+Index: kdeui/icons/kiconloader.cpp
+===================================================================
+--- kdeui/icons/kiconloader.cpp (revision 836933)
++++ kdeui/icons/kiconloader.cpp (working copy)
+@@ -59,11 +59,7 @@
+
+ // The following define exists because the Qt SVG renderer needs
+ // to be improved. This will be removed soon. (ereslibre)
+-#ifdef QT_VERSION >= 0x040400
+ #define KDE_QT_SVG_RENDERER_FIXED
+-#else
+-#undef KDE_QT_SVG_RENDERER_FIXED
+-#endif
+
+ //#define NO_LAZYLOAD_ICONTHEME
+
Index: kdegraphics-exiv2.diff
===================================================================
--- kdegraphics-exiv2.diff (revision 2359)
+++ kdegraphics-exiv2.diff (working copy)
@@ -2,12 +2,12 @@
===================================================================
--- libs/libkexiv2/libkexiv2/CMakeLists.txt (revision 820730)
+++ libs/libkexiv2/libkexiv2/CMakeLists.txt (working copy)
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@
KDE4_ADD_LIBRARY(kexiv2 SHARED ${kexiv2_LIB_SRCS})
--TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} exiv2)
-+TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} exiv2 m)
+-TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
${EXIV2_LIBRARIES})
++TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
${EXIV2_LIBRARIES} m)
IF( WIN32 )
TARGET_LINK_LIBRARIES( kexiv2 ${EXPAT_LIBRARIES} )
Index: kdeedu.diff
===================================================================
--- kdeedu.diff (revision 2359)
+++ kdeedu.diff (working copy)
@@ -22,3 +22,81 @@
+target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY}
${KDE4_KDECORE_LIBS} m)
install(TARGETS analitza ${INSTALL_TARGETS_DEFAULT_ARGS})
+Index: kstars/kstars/ksasteroid.cpp
+===================================================================
+--- kstars/kstars/ksasteroid.cpp (revision 836933)
++++ kstars/kstars/ksasteroid.cpp (working copy)
+@@ -51,15 +51,15 @@
+ }
+
+ bool KSAsteroid::getOrbitalElements( long double *_JD, double *_a, double
*_e, dms *_i,
+- dms *_w, dms *_N, dms *_M ) {
+- if( !_JD || !_a || !_e || !_i || !_w || !_N || !_M )
++ dms *_w, dms *_bN, dms *_M ) {
++ if( !_JD || !_a || !_e || !_i || !_w || !_bN || !_M )
+ return false;
+ *_JD = JD;
+ *_a = a;
+ *_e = e;
+ *_i = i;
+ *_w = w;
+- *_N = N;
++ *_bN = N;
+ *_M = M;
+ return true;
+ }
+Index: kstars/kstars/kscomet.cpp
+===================================================================
+--- kstars/kstars/kscomet.cpp (revision 836933)
++++ kstars/kstars/kscomet.cpp (working copy)
+@@ -67,15 +67,15 @@
+ }
+
+ bool KSComet::getOrbitalElements( long double *_JD, double *_q, double *_e,
dms *_i,
+- dms *_w, dms *_N ) {
+- if( !_JD || !_q || !_e || !_i || !_w || !_N )
++ dms *_w, dms *_bN ) {
++ if( !_JD || !_q || !_e || !_i || !_w || !_bN )
+ return false;
+ *_JD = JD;
+ *_q = q;
+ *_e = e;
+ *_i = i;
+ *_w = w;
+- *_N = N;
++ *_bN = N;
+ return true;
+ }
+
+Index: kstars/kstars/kscomet.h
+===================================================================
+--- kstars/kstars/kscomet.h (revision 836933)
++++ kstars/kstars/kscomet.h (working copy)
+@@ -84,12 +84,12 @@
+ *...@param _e the eccentricity of the comet's orbit
+ *...@param _i the inclination angle of the comet's orbit
+ *...@param _w the argument of the orbit's perihelion
+- *...@param _N the longitude of the orbit's ascending node
++ *...@param _bN the longitude of the orbit's ascending node
+ *
+ *...@return true on success, false if one or more pointers were NULL
+ */
+ bool getOrbitalElements( long double *_JD, double *_q, double *_e, dms
*_i,
+- dms *_w, dms *_N );
++ dms *_w, dms *_bN );
+
+ /**
+ *...@short Returns the Julian Day of Perihelion passage
+Index: kstars/kstars/ksasteroid.h
+===================================================================
+--- kstars/kstars/ksasteroid.h (revision 836933)
++++ kstars/kstars/ksasteroid.h (working copy)
+@@ -108,7 +108,7 @@
+ *...@p M the mean anomaly for the Julian Day
+ */
+ bool getOrbitalElements( long double *_JD, double *_a, double *_e,
+- dms *_i, dms *_w, dms *_N, dms *_M );
++ dms *_i, dms *_w, dms *_bN, dms *_M );
+
+
+ /**This lets other classes like KSPlanetBase access H and G values
Brett Albertson
bretta at consonus.com
919-379-8449
