Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19595
Modified Files:
kdebase4-workspace.info kdebase4-workspace.patch
Log Message:
patch fail; going back for now
Index: kdebase4-workspace.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4-workspace.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdebase4-workspace.info 24 Jun 2009 13:53:40 -0000 1.2
+++ kdebase4-workspace.info 25 Jun 2009 00:51:16 -0000 1.3
@@ -59,7 +59,7 @@
SourceDirectory: kdebase-workspace-%v
PatchScript: sed -e 's,@FINKPREFIX@,%p,g; s,@FINKTYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
PatchFile: kdebase4-workspace.patch
-PatchFile-MD5: 17b6038863fcc6267cf46d4040cab0ed
+PatchFile-MD5: 33290ed686cefd8af9e99218ad9b556b
CompileScript: <<
#!/bin/sh -ev
Index: kdebase4-workspace.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4-workspace.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdebase4-workspace.patch 24 Jun 2009 13:53:40 -0000 1.2
+++ kdebase4-workspace.patch 25 Jun 2009 00:51:16 -0000 1.3
@@ -1,6 +1,6 @@
diff -Nurd kdebase-workspace-4.2.4/ConfigureChecks.cmake
kdebase-workspace-4.2.4-new/ConfigureChecks.cmake
--- kdebase-workspace-4.2.4/ConfigureChecks.cmake 2009-03-26
10:42:29.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/ConfigureChecks.cmake 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ConfigureChecks.cmake 2009-06-09
08:47:52.000000000 -0400
@@ -1,8 +1,10 @@
include(UnixAuth)
include(CheckTypeSize)
@@ -14,7 +14,7 @@
set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use
unless overridden for a particular app.")
diff -Nurd kdebase-workspace-4.2.4/kcontrol/CMakeLists.txt
kdebase-workspace-4.2.4-new/kcontrol/CMakeLists.txt
--- kdebase-workspace-4.2.4/kcontrol/CMakeLists.txt 2008-12-04
03:34:47.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/kcontrol/CMakeLists.txt 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/kcontrol/CMakeLists.txt 2009-06-09
08:47:52.000000000 -0400
@@ -3,8 +3,6 @@
@@ -26,7 +26,7 @@
endif(X11_Xrandr_FOUND )
diff -Nurd kdebase-workspace-4.2.4/kcontrol/input/xcursor/thememodel.cpp
kdebase-workspace-4.2.4-new/kcontrol/input/xcursor/thememodel.cpp
--- kdebase-workspace-4.2.4/kcontrol/input/xcursor/thememodel.cpp
2008-08-07 11:21:08.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/kcontrol/input/xcursor/thememodel.cpp
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/kcontrol/input/xcursor/thememodel.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -165,7 +165,7 @@
QString
path("~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons");
@@ -38,55 +38,21 @@
#else
diff -Nurd kdebase-workspace-4.2.4/kcontrol/kxkb/CMakeLists.txt
kdebase-workspace-4.2.4-new/kcontrol/kxkb/CMakeLists.txt
--- kdebase-workspace-4.2.4/kcontrol/kxkb/CMakeLists.txt 2008-12-21
15:19:16.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/kcontrol/kxkb/CMakeLists.txt 2009-06-11
10:58:17.000000000 -0400
-@@ -51,8 +51,19 @@
++++ kdebase-workspace-4.2.4-new/kcontrol/kxkb/CMakeLists.txt 2009-06-09
08:47:52.000000000 -0400
+@@ -51,8 +51,10 @@
endif(USE_XKLAVIER STREQUAL ON)
macro_log_feature(X11_Xkbfile_FOUND "xkbfile" "X11 KXB library for keyboard
handling software" "http://www.x.org"; FALSE "" "xkbfile is required to build
kxkb.")
--macro_bool_to_01(X11_Xinput_FOUND HAVE_XINPUT)
+if(Q_WS_X11)
-+SET(CMAKE_REQUIRED_LIBRARIES -lXi)
-+CHECK_FUNCTION_EXISTS(_XiGetDevicePresenceNotifyEvent
XiGetDevicePresenceNotifyEvent_EXISTS)
-+
-+if( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
-+ set(XiGetDevicePresence_FOUND 1)
-+else( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
-+ MESSAGE(STATUS "_XiGetDevicePresenceNotifyEvent is not found, libXi
version 1.2.0 or later is required to keep layouts with keyboard hotplugging")
-+endif( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
-+
-+macro_bool_to_01(XiGetDevicePresence_FOUND HAVE_XINPUT)
+ macro_bool_to_01(X11_Xinput_FOUND HAVE_XINPUT)
ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT})
+endif(Q_WS_X11)
if(X11_Xkbfile_FOUND AND HAVE_XKLAVIER)
-@@ -89,9 +100,9 @@
- target_link_libraries(kcm_keyboard_layout ${X11_XTest_LIB})
- endif(X11_XTest_FOUND)
-
--if(X11_Xinput_FOUND)
-+if(XiGetDevicePresence_FOUND)
- target_link_libraries(kcm_keyboard_layout ${X11_Xinput_LIB})
--endif(X11_Xinput_FOUND)
-+endif(XiGetDevicePresence_FOUND)
-
- install(TARGETS kcm_keyboard_layout DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES keyboard_layout.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-@@ -113,9 +124,9 @@
- target_link_libraries(kdeinit_kxkb ${X11_X11_LIB} ${X11_Xext_LIB}
${KDE4_KDEUI_LIBS}
- ${XKB_SUPPORT_LIB})
-
--if(X11_Xinput_FOUND)
-+if(XiGetDevicePresence_FOUND)
- target_link_libraries(kdeinit_kxkb ${X11_Xinput_LIB})
--endif(X11_Xinput_FOUND)
-+endif(XiGetDevicePresence_FOUND)
-
- install(TARGETS kdeinit_kxkb ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(TARGETS kxkb ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd kdebase-workspace-4.2.4/kcontrol/kxkb/x11helper.cpp
kdebase-workspace-4.2.4-new/kcontrol/kxkb/x11helper.cpp
--- kdebase-workspace-4.2.4/kcontrol/kxkb/x11helper.cpp 2008-12-21
15:19:16.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/kcontrol/kxkb/x11helper.cpp 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/kcontrol/kxkb/x11helper.cpp 2009-06-09
08:47:52.000000000 -0400
@@ -369,7 +369,7 @@
#endif /* HAVE_XKLAVIER*/
@@ -107,7 +73,7 @@
#endif
diff -Nurd kdebase-workspace-4.2.4/ksmserver/server.cpp
kdebase-workspace-4.2.4-new/ksmserver/server.cpp
--- kdebase-workspace-4.2.4/ksmserver/server.cpp 2009-04-30
05:11:55.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/ksmserver/server.cpp 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksmserver/server.cpp 2009-06-09
08:47:52.000000000 -0400
@@ -643,6 +643,8 @@
int i;
while( (i = display.indexOf(':')) >= 0)
@@ -128,7 +94,7 @@
::unlink(fName.data());
diff -Nurd kdebase-workspace-4.2.4/ksplash/ksplashx/qpoint.h
kdebase-workspace-4.2.4-new/ksplash/ksplashx/qpoint.h
--- kdebase-workspace-4.2.4/ksplash/ksplashx/qpoint.h 2008-01-04
18:55:38.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksplash/ksplashx/qpoint.h 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksplash/ksplashx/qpoint.h 2009-06-09
08:47:52.000000000 -0400
@@ -93,7 +93,7 @@
private:
static void warningDivByZero();
@@ -140,7 +106,7 @@
#else
diff -Nurd kdebase-workspace-4.2.4/ksplash/ksplashx/qrect.h
kdebase-workspace-4.2.4-new/ksplash/ksplashx/qrect.h
--- kdebase-workspace-4.2.4/ksplash/ksplashx/qrect.h 2008-01-04
18:55:38.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksplash/ksplashx/qrect.h 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksplash/ksplashx/qrect.h 2009-06-09
08:47:52.000000000 -0400
@@ -145,7 +145,7 @@
#if defined(Q_WS_X11) || defined(Q_OS_TEMP)
friend void qt_setCoords( QRect *r, int xp1, int yp1, int xp2, int yp2 );
@@ -152,7 +118,7 @@
QCOORD y2;
diff -Nurd kdebase-workspace-4.2.4/ksysguard/gui/setscheduler.c
kdebase-workspace-4.2.4-new/ksysguard/gui/setscheduler.c
--- kdebase-workspace-4.2.4/ksysguard/gui/setscheduler.c 2008-07-31
04:14:09.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/ksysguard/gui/setscheduler.c 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/gui/setscheduler.c 2009-06-09
08:47:52.000000000 -0400
@@ -4,6 +4,9 @@
int main(int argc, char **argv)
@@ -171,7 +137,7 @@
}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/CMakeLists.txt
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/CMakeLists.txt
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/CMakeLists.txt
2008-10-17 07:00:26.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/CMakeLists.txt
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/CMakeLists.txt
2009-06-09 08:47:52.000000000 -0400
@@ -25,8 +25,13 @@
add_subdirectory( "Solaris" )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Solaris )
@@ -190,7 +156,7 @@
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/CMakeLists.txt
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CMakeLists.txt
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/CMakeLists.txt
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CMakeLists.txt
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CMakeLists.txt
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,13 @@
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../CContLib
${CMAKE_CURRENT_SOURCE_DIR}/../ )
+
@@ -207,7 +173,7 @@
+
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/CPU.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CPU.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/CPU.c 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CPU.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CPU.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,80 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -291,7 +257,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/CPU.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CPU.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/CPU.h 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CPU.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/CPU.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,49 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -344,7 +310,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/Memory.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/Memory.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/Memory.c 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/Memory.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/Memory.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,111 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -459,7 +425,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/Memory.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/Memory.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/Memory.h 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/Memory.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/Memory.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,45 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -508,7 +474,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/ProcessList.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/ProcessList.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/ProcessList.c
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/ProcessList.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/ProcessList.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,73 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -585,7 +551,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/ProcessList.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/ProcessList.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/ProcessList.h
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/ProcessList.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/ProcessList.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,38 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -627,7 +593,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/apm.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/apm.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/apm.c 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/apm.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/apm.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,58 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -689,7 +655,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/apm.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/apm.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/apm.h 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/apm.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/apm.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,34 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -727,7 +693,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/diskstat.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/diskstat.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/diskstat.c
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/diskstat.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/diskstat.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,73 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -804,7 +770,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/diskstat.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/diskstat.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/diskstat.h
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/diskstat.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/diskstat.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,40 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -848,7 +814,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/loadavg.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/loadavg.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/loadavg.c
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/loadavg.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/loadavg.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,69 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -921,7 +887,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/loadavg.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/loadavg.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/loadavg.h
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/loadavg.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/loadavg.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,36 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -961,7 +927,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/logfile.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/logfile.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/logfile.c
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/logfile.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/logfile.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,53 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -1018,7 +984,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/logfile.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/logfile.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/logfile.h
1969-12-31 19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/logfile.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/logfile.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,36 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -1058,7 +1024,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/netdev.c
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/netdev.c
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/netdev.c 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/netdev.c
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/netdev.c
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,56 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -1118,7 +1084,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/netdev.h
kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/netdev.h
--- kdebase-workspace-4.2.4/ksysguard/ksysguardd/Stub/netdev.h 1969-12-31
19:00:00.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/netdev.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/ksysguard/ksysguardd/Stub/netdev.h
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,35 @@
+/*
+ KSysGuard, the KDE System Guard
@@ -1157,7 +1123,7 @@
+#endif
diff -Nurd kdebase-workspace-4.2.4/kwin/CMakeLists.txt
kdebase-workspace-4.2.4-new/kwin/CMakeLists.txt
--- kdebase-workspace-4.2.4/kwin/CMakeLists.txt 2008-11-19
05:18:06.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/kwin/CMakeLists.txt 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/kwin/CMakeLists.txt 2009-06-09
08:47:52.000000000 -0400
@@ -26,6 +26,10 @@
macro_bool_to_01( OPENGL_FOUND KWIN_HAVE_OPENGL )
@@ -1171,7 +1137,7 @@
# for kwin internal things
diff -Nurd kdebase-workspace-4.2.4/kwin/lib/CMakeLists.txt
kdebase-workspace-4.2.4-new/kwin/lib/CMakeLists.txt
--- kdebase-workspace-4.2.4/kwin/lib/CMakeLists.txt 2008-12-10
11:13:19.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/kwin/lib/CMakeLists.txt 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/kwin/lib/CMakeLists.txt 2009-06-09
08:47:52.000000000 -0400
@@ -8,7 +8,6 @@
kcommondecoration.cpp
kcommondecoration_p.cpp )
@@ -1190,7 +1156,7 @@
target_link_libraries(kwineffects ${X11_Xrender_LIB})
diff -Nurd
kdebase-workspace-4.2.4/libs/ksysguard/processcore/processes_local_p.cpp
kdebase-workspace-4.2.4-new/libs/ksysguard/processcore/processes_local_p.cpp
--- kdebase-workspace-4.2.4/libs/ksysguard/processcore/processes_local_p.cpp
2008-01-04 18:55:30.000000000 -0500
-+++
kdebase-workspace-4.2.4-new/libs/ksysguard/processcore/processes_local_p.cpp
2009-06-11 10:57:17.000000000 -0400
++++
kdebase-workspace-4.2.4-new/libs/ksysguard/processcore/processes_local_p.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -32,6 +32,8 @@
#include <qglobal.h>
#ifdef Q_OS_SOLARIS
@@ -1202,7 +1168,7 @@
diff -Nurd
kdebase-workspace-4.2.4/libs/ksysguard/processcore/processes_stub_p.cpp
kdebase-workspace-4.2.4-new/libs/ksysguard/processcore/processes_stub_p.cpp
--- kdebase-workspace-4.2.4/libs/ksysguard/processcore/processes_stub_p.cpp
1969-12-31 19:00:00.000000000 -0500
-+++
kdebase-workspace-4.2.4-new/libs/ksysguard/processcore/processes_stub_p.cpp
2009-06-11 10:57:17.000000000 -0400
++++
kdebase-workspace-4.2.4-new/libs/ksysguard/processcore/processes_stub_p.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -0,0 +1,163 @@
+/* This file is part of the KDE project
+ Copyright (C) 2007 Manolo Valdes <nolis7...@gmail.com>
@@ -1369,7 +1335,7 @@
+}
diff -Nurd kdebase-workspace-4.2.4/libs/kworkspace/kworkspace.cpp
kdebase-workspace-4.2.4-new/libs/kworkspace/kworkspace.cpp
--- kdebase-workspace-4.2.4/libs/kworkspace/kworkspace.cpp 2009-04-30
05:11:56.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/libs/kworkspace/kworkspace.cpp 2009-06-11
10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/libs/kworkspace/kworkspace.cpp 2009-06-09
08:47:52.000000000 -0400
@@ -207,6 +207,8 @@
int i;
while( (i = display.indexOf(':')) >= 0)
@@ -1381,7 +1347,7 @@
fName += display.toLocal8Bit();
diff -Nurd
kdebase-workspace-4.2.4/plasma/applets/system-monitor/CMakeLists.txt
kdebase-workspace-4.2.4-new/plasma/applets/system-monitor/CMakeLists.txt
--- kdebase-workspace-4.2.4/plasma/applets/system-monitor/CMakeLists.txt
2009-01-01 11:26:05.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/plasma/applets/system-monitor/CMakeLists.txt
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/plasma/applets/system-monitor/CMakeLists.txt
2009-06-09 08:47:52.000000000 -0400
@@ -10,6 +10,7 @@
kde4_add_library(plasma_applet-system-monitor SHARED ${lib_SRCS})
@@ -1392,7 +1358,7 @@
diff -Nurd
kdebase-workspace-4.2.4/plasma/applets/systemtray/core/notification.h
kdebase-workspace-4.2.4-new/plasma/applets/systemtray/core/notification.h
--- kdebase-workspace-4.2.4/plasma/applets/systemtray/core/notification.h
2008-11-19 05:18:12.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/plasma/applets/systemtray/core/notification.h
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/plasma/applets/systemtray/core/notification.h
2009-06-09 08:47:52.000000000 -0400
@@ -60,7 +60,7 @@
**/
void destroyed(SystemTray::Notification *notification = 0);
@@ -1404,7 +1370,7 @@
void setEventId(const QString &eventId);
diff -Nurd kdebase-workspace-4.2.4/plasma/shells/desktop/plasmaapp.cpp
kdebase-workspace-4.2.4-new/plasma/shells/desktop/plasmaapp.cpp
--- kdebase-workspace-4.2.4/plasma/shells/desktop/plasmaapp.cpp
2009-03-26 10:42:26.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/plasma/shells/desktop/plasmaapp.cpp
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/plasma/shells/desktop/plasmaapp.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -39,6 +39,11 @@
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -1443,7 +1409,7 @@
#endif
diff -Nurd kdebase-workspace-4.2.4/plasma/shells/screensaver/plasmaapp.cpp
kdebase-workspace-4.2.4-new/plasma/shells/screensaver/plasmaapp.cpp
--- kdebase-workspace-4.2.4/plasma/shells/screensaver/plasmaapp.cpp
2009-01-01 11:25:53.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/plasma/shells/screensaver/plasmaapp.cpp
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/plasma/shells/screensaver/plasmaapp.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -37,6 +37,11 @@
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -1482,7 +1448,7 @@
#endif
diff -Nurd kdebase-workspace-4.2.4/powerdevil/daemon/TimerBasedPoller.cpp
kdebase-workspace-4.2.4-new/powerdevil/daemon/TimerBasedPoller.cpp
--- kdebase-workspace-4.2.4/powerdevil/daemon/TimerBasedPoller.cpp
2008-09-29 01:55:39.000000000 -0400
-+++ kdebase-workspace-4.2.4-new/powerdevil/daemon/TimerBasedPoller.cpp
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/powerdevil/daemon/TimerBasedPoller.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -20,6 +20,7 @@
#include "TimerBasedPoller.h"
@@ -1493,7 +1459,7 @@
: AbstractSystemPoller(parent),
diff -Nurd kdebase-workspace-4.2.4/powerdevil/daemon/WidgetBasedPoller.cpp
kdebase-workspace-4.2.4-new/powerdevil/daemon/WidgetBasedPoller.cpp
--- kdebase-workspace-4.2.4/powerdevil/daemon/WidgetBasedPoller.cpp
2008-12-21 15:19:18.000000000 -0500
-+++ kdebase-workspace-4.2.4-new/powerdevil/daemon/WidgetBasedPoller.cpp
2009-06-11 10:57:17.000000000 -0400
++++ kdebase-workspace-4.2.4-new/powerdevil/daemon/WidgetBasedPoller.cpp
2009-06-09 08:47:52.000000000 -0400
@@ -21,6 +21,8 @@
#include <QWidget>
@@ -1505,7 +1471,7 @@
diff -Nurd kdebase-workspace-4.2.4/startkde.cmake
kdebase-workspace-4.2.4-new/startkde.cmake
--- kdebase-workspace-4.2.4/startkde.cmake 2009-03-26 10:42:29.000000000
-0400
-+++ kdebase-workspace-4.2.4-new/startkde.cmake 2009-06-11 10:57:17.000000000
-0400
++++ kdebase-workspace-4.2.4-new/startkde.cmake 2009-06-09 10:49:11.000000000
-0400
@@ -7,6 +7,26 @@
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
