[packages/kdelibs/dev-trinity] kdelibs-xgl.patch: fix qt_x_time -> get_tqt_x_time()
glen
glen at pld-linux.org
Sun Mar 22 11:52:52 CET 2015
commit c1d0581841fec4a27b4b5c263af882fda146c1fc
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Mar 22 10:52:12 2015 +0000
kdelibs-xgl.patch: fix qt_x_time -> get_tqt_x_time()
kdelibs-xgl.patch | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/kdelibs-xgl.patch b/kdelibs-xgl.patch
index 3b3d5c5..bd03bb5 100644
--- a/kdelibs-xgl.patch
+++ b/kdelibs-xgl.patch
@@ -1,5 +1,5 @@
---- kdelibs-3.5.12/tdeui/ksystemtray.cpp~ 2011-01-04 19:06:54.000000000 +0200
-+++ kdelibs-3.5.12/tdeui/ksystemtray.cpp 2011-01-04 19:09:28.517100570 +0200
+--- kdelibs-R14.0.0/tdeui/ksystemtray.cpp~ 2015-03-22 12:49:02.000000000 +0200
++++ kdelibs-R14.0.0/tdeui/ksystemtray.cpp 2015-03-22 12:49:04.972273107 +0200
@@ -32,6 +32,7 @@
#include <kwin.h>
#include <kwinmodule.h>
@@ -8,15 +8,6 @@
#endif
#include <kiconloader.h>
-@@ -39,6 +40,8 @@
-
- #include <qapplication.h>
-
-+extern Time qt_x_time;
-+
- class KSystemTrayPrivate
- {
- public:
@@ -65,6 +66,42 @@
QXEmbed::initialize();
#endif
@@ -46,7 +37,7 @@
+ ev.xclient.window = tray;
+ ev.xclient.message_type = atom;
+ ev.xclient.format = 32;
-+ ev.xclient.data.l[ 0 ] = qt_x_time;
++ ev.xclient.data.l[ 0 ] = get_tqt_x_time();
+ ev.xclient.data.l[ 1 ] = 0; // SYSTEM_TRAY_REQUEST_DOCK
+ ev.xclient.data.l[ 2 ] = winId();
+ ev.xclient.data.l[ 3 ] = 0; // unused
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/c1d0581841fec4a27b4b5c263af882fda146c1fc
More information about the pld-cvs-commit
mailing list