Author: ranger
Date: Thu Mar 12 13:54:56 2009
New Revision: 1408
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1408&repname=user%3a+ranger>
Log:
forgot to generate
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info
trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.patch
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info&rev=1408&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.info Thu Mar
12 13:54:56 2009
@@ -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: 81d7e6613cb45937eda1862bc833a24c
+PatchFile-MD5: c5603beb254c8e74c25e92443a4c839a
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.patch&rev=1408&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.patch
(original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase4-workspace.patch Thu Mar
12 13:54:56 2009
@@ -50,6 +50,27 @@
if(X11_Xkbfile_FOUND AND HAVE_XKLAVIER)
+diff -Nurd kdebase-workspace-4.2.1/kcontrol/kxkb/x11helper.cpp
kdebase-workspace-4.2.1-new/kcontrol/kxkb/x11helper.cpp
+--- kdebase-workspace-4.2.1/kcontrol/kxkb/x11helper.cpp 2008-12-21
15:19:16.000000000 -0500
++++ kdebase-workspace-4.2.1-new/kcontrol/kxkb/x11helper.cpp 2009-03-11
12:35:23.000000000 -0400
+@@ -369,7 +369,7 @@
+
+ #endif /* HAVE_XKLAVIER*/
+
+-#ifdef HAVE_XINPUT
++#if defined(HAVE_XINPUT) && defined(DevicePresence)
+
+ int X11Helper::m_xinputEventType = -1;
+
+@@ -425,7 +425,7 @@
+ int
+ X11Helper::registerForNewDeviceEvent(Display* display)
+ {
+- kWarn() << "Kxkb is compiled without XInput, xkb configuration will be
reset when new keyboard device is plugged in!";
++ kWarning() << "Kxkb is compiled without XInput, xkb configuration will be
reset when new keyboard device is plugged in!";
+ return -1;
+ }
+ #endif
diff -Nurd kdebase-workspace-4.2.1/ksmserver/server.cpp
kdebase-workspace-4.2.1-new/ksmserver/server.cpp
--- kdebase-workspace-4.2.1/ksmserver/server.cpp 2008-11-12
11:37:16.000000000 -0500
+++ kdebase-workspace-4.2.1-new/ksmserver/server.cpp 2009-03-11
08:53:15.000000000 -0400
@@ -1425,6 +1446,29 @@
// 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.2.1/powerdevil/daemon/TimerBasedPoller.cpp
kdebase-workspace-4.2.1-new/powerdevil/daemon/TimerBasedPoller.cpp
+--- kdebase-workspace-4.2.1/powerdevil/daemon/TimerBasedPoller.cpp
2008-09-29 01:55:39.000000000 -0400
++++ kdebase-workspace-4.2.1-new/powerdevil/daemon/TimerBasedPoller.cpp
2009-03-11 14:00:12.000000000 -0400
+@@ -20,6 +20,7 @@
+ #include "TimerBasedPoller.h"
+
+ #include <klocalizedstring.h>
++#include <X11/Xlib.h>
+
+ TimerBasedPoller::TimerBasedPoller(QObject *parent)
+ : AbstractSystemPoller(parent),
+diff -Nurd kdebase-workspace-4.2.1/powerdevil/daemon/WidgetBasedPoller.cpp
kdebase-workspace-4.2.1-new/powerdevil/daemon/WidgetBasedPoller.cpp
+--- kdebase-workspace-4.2.1/powerdevil/daemon/WidgetBasedPoller.cpp
2008-12-21 15:19:18.000000000 -0500
++++ kdebase-workspace-4.2.1-new/powerdevil/daemon/WidgetBasedPoller.cpp
2009-03-11 11:38:59.000000000 -0400
+@@ -21,6 +21,8 @@
+
+ #include <QWidget>
+ #include <QTimer>
++#include <X11/Xlib.h>
++#undef KeyPress
+ #include <QX11Info>
+ #include <QEvent>
+
diff -Nurd kdebase-workspace-4.2.1/startkde.cmake
kdebase-workspace-4.2.1-new/startkde.cmake
--- kdebase-workspace-4.2.1/startkde.cmake 2009-02-27 07:42:15.000000000
-0500
+++ kdebase-workspace-4.2.1-new/startkde.cmake 2009-03-11 08:53:15.000000000
-0400
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
