Author: ranger
Date: Wed Dec 3 05:38:53 2008
New Revision: 1301
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1301&repname=user%3a+ranger>
Log:
kdebase4-workspace builds right now
Modified:
trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info
trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.patch
Modified: trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info&rev=1301&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.info Wed Dec
3 05:38:53 2008
@@ -53,7 +53,7 @@
Source-MD5: a9fe8c590749a6b11ef56e9ed181335d
SourceDirectory: kdebase-workspace-%v
PatchFile: kdebase4-workspace.patch
-PatchFile-MD5: 01fdc3410d37fa157beb92ce0259029b
+PatchFile-MD5: 525fb967166777481cc6e992c1a76215
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g; s,@FINKTYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
<<
Modified: trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.patch&rev=1301&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.patch
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase4-workspace.patch Wed
Dec 3 05:38:53 2008
@@ -1269,6 +1269,17 @@
fName += '_';
fName += display.toLocal8Bit();
+diff -Nurd
kdebase-workspace-4.1.81/plasma/applets/system-monitor/CMakeLists.txt
kdebase-workspace-4.1.81-new/plasma/applets/system-monitor/CMakeLists.txt
+--- kdebase-workspace-4.1.81/plasma/applets/system-monitor/CMakeLists.txt
2008-11-04 15:25:03.000000000 -0500
++++ kdebase-workspace-4.1.81-new/plasma/applets/system-monitor/CMakeLists.txt
2008-12-02 23:01:49.000000000 -0500
+@@ -9,6 +9,7 @@
+ )
+ kde4_add_library(plasma_applet-system-monitor SHARED ${lib_SRCS})
+ target_link_libraries(plasma_applet-system-monitor ${KDE4_PLASMA_LIBS}
${KDE4_KDEUI_LIBS})
++set_target_properties(plasma_applet-system-monitor PROPERTIES VERSION
${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+ # HDD Monitor
+
diff -Nurd
kdebase-workspace-4.1.81/plasma/applets/systemtray/core/notification.h
kdebase-workspace-4.1.81-new/plasma/applets/systemtray/core/notification.h
--- kdebase-workspace-4.1.81/plasma/applets/systemtray/core/notification.h
2008-11-19 05:18:12.000000000 -0500
+++ kdebase-workspace-4.1.81-new/plasma/applets/systemtray/core/notification.h
2008-12-02 17:09:51.000000000 -0500
@@ -1281,6 +1292,84 @@
void setApplicationName(const QString &applicationName);
void setApplicationIcon(const QIcon &applicationIcon);
void setEventId(const QString &eventId);
+diff -Nurd kdebase-workspace-4.1.81/plasma/shells/desktop/plasmaapp.cpp
kdebase-workspace-4.1.81-new/plasma/shells/desktop/plasmaapp.cpp
+--- kdebase-workspace-4.1.81/plasma/shells/desktop/plasmaapp.cpp
2008-11-28 10:33:28.000000000 -0500
++++ kdebase-workspace-4.1.81-new/plasma/shells/desktop/plasmaapp.cpp
2008-12-02 22:00:19.000000000 -0500
+@@ -39,6 +39,11 @@
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #endif
++
++ #if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
++ #include <sys/param.h>
++ #include <sys/sysctl.h>
++ #endif
+ #endif
+
+ #include <QApplication>
+@@ -201,6 +206,23 @@
+
+ memorySize = (statex.ullTotalPhys/1024) + (statex.ullTotalPageFile/1024);
+ #endif
++#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
++ uint64_t hostMemory;
++ size_t memorySize = 0;
++
++ int mib[2];
++ size_t size;
++
++ mib[0] = CTL_HW;
++ mib[1] = HW_MEMSIZE;
++
++ size = sizeof(hostMemory);
++ if (sysctl(mib, 2, &hostMemory, &size, NULL, 0) == -1) {
++ hostMemory = 0;
++ } else {
++ memorySize = (size_t)(hostMemory / 1024);
++ }
++#endif
+ // If you have no suitable sysconf() interface and are not FreeBSD,
+ // then you are out of luck and get a compile error.
+ #endif
+diff -Nurd kdebase-workspace-4.1.81/plasma/shells/screensaver/plasmaapp.cpp
kdebase-workspace-4.1.81-new/plasma/shells/screensaver/plasmaapp.cpp
+--- kdebase-workspace-4.1.81/plasma/shells/screensaver/plasmaapp.cpp
2008-11-19 05:18:08.000000000 -0500
++++ kdebase-workspace-4.1.81-new/plasma/shells/screensaver/plasmaapp.cpp
2008-12-02 22:00:09.000000000 -0500
+@@ -37,6 +37,11 @@
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #endif
++
++ #if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
++ #include <sys/param.h>
++ #include <sys/sysctl.h>
++ #endif
+ #endif
+
+ #include <QApplication>
+@@ -175,6 +180,23 @@
+ sysctl(mib, 2, &memorySize, &len, NULL, 0);
+ memorySize /= 1024;
+ #endif
++#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
++ uint64_t hostMemory;
++ size_t memorySize = 0;
++
++ int mib[2];
++ size_t size;
++
++ mib[0] = CTL_HW;
++ mib[1] = HW_MEMSIZE;
++
++ size = sizeof(hostMemory);
++ if (sysctl(mib, 2, &hostMemory, &size, NULL, 0) == -1) {
++ hostMemory = 0;
++ } else {
++ memorySize = (size_t)(hostMemory / 1024);
++ }
++#endif
+ // If you have no suitable sysconf() interface and are not FreeBSD,
+ // then you are out of luck and get a compile error.
+ #endif
diff -Nurd kdebase-workspace-4.1.81/startkde.cmake
kdebase-workspace-4.1.81-new/startkde.cmake
--- kdebase-workspace-4.1.81/startkde.cmake 2008-11-28 10:33:30.000000000
-0500
+++ kdebase-workspace-4.1.81-new/startkde.cmake 2008-12-02
16:42:24.000000000 -0500
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
