]> git.pld-linux.org Git - packages/kdelibs.git/blame - gcc45.patch
- bcond openexr (broken somewhere something)
[packages/kdelibs.git] / gcc45.patch
CommitLineData
14dd0b02
ER
1--- kdelibs/kdefx/kstyle.cpp~ 2011-01-05 00:23:08.000000000 +0200
2+++ kdelibs/kdefx/kstyle.cpp 2011-01-05 00:23:43.787007235 +0200
3@@ -2265,7 +2265,14 @@
4
5 // HACK for gtk-qt-engine
6
7-KDE_EXPORT extern "C"
8+/* FIXME temp hack to get it compiled
9+kstyle.cpp: At global scope:
10+kstyle.cpp:2268:19: error: expected unqualified-id before string constant
11+make[2]: *** [kstyle.lo] Error 1
12+
13+// KDE_EXPORT
14+*/
15+extern "C"
16 void kde_kstyle_set_scrollbar_type_windows( void* style )
17 {
18 ((KStyle*)style)->setScrollBarType( KStyle::WindowsStyleScrollBar );
19#--- kdelibs/networkstatus/serviceiface_stub.cpp~ 2011-01-05 01:24:06.000000000 +0200
20#+++ kdelibs/networkstatus/serviceiface_stub.cpp 2011-01-05 01:24:38.660091691 +0200
21#@@ -55,7 +55,11 @@
22# TQCString replyType;
23# TQDataStream arg( data, IO_WriteOnly );
24# arg << arg0;
25#- arg << arg1;
26#+ // FIXME temp hack to get it compiled
27#+ // serviceiface_stub.o: In function `ServiceIface_stub::registerNetwork(QString const&, NetworkStatus::Properties)':
28#+ // serviceiface_stub.cpp:58: undefined reference to `operator<<(QDataStream&, NetworkStatus::Properties)'
29#+ // collect2: ld returned 1 exit status
30#+ arg << arg1.status;
31# if ( dcopClient()->call( app(), obj(), "registerNetwork(TQString,NetworkStatus::Properties)", data, replyType, replyData ) ) {
32# setStatus( CallSucceeded );
33# } else {
34--- kdelibs/networkstatus/networkstatuscommon.cpp~ 2010-09-04 21:08:12.000000000 +0300
35+++ kdelibs/networkstatus/networkstatuscommon.cpp 2011-01-05 01:44:47.862346338 +0200
36@@ -22,7 +22,7 @@
37 #include "networkstatuscommon.h"
38 #include <kdebug.h>
39
40-TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
41+TQDataStream & operator<< ( TQDataStream & s, NetworkStatus::Properties p )
42 {
43 kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl;
44 s << (int)p.status;
45--- kdelibs/networkstatus/networkstatuscommon.h~ 2010-09-04 21:08:12.000000000 +0300
46+++ kdelibs/networkstatus/networkstatuscommon.h 2011-01-05 01:44:57.519989113 +0200
47@@ -49,6 +49,6 @@
48 }
49
50 TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p );
51-TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p );
52+TQDataStream & operator<< ( TQDataStream & s, NetworkStatus::Properties p );
53
54 #endif
This page took 0.069706 seconds and 4 git commands to generate.