• R/O
  • HTTP
  • SSH
  • HTTPS

kde-workspace: Commit

Katana workspace


Commit MetaInfo

Revision795cb31a5978787ddb5ef8f962d7bfb9ae3067d9 (tree)
Time2022-11-25 07:46:00
AuthorIvailo Monev <xakepa10@gmai...>
CommiterIvailo Monev

Log Message

generic: remove redundant HAVE_XRENDER configuration definition

if Xrender is not found a fatal message will be issued by the top-level
CMakeLists file because it is required by KWin compositor for example

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

Change Summary

Incremental Difference

--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -25,7 +25,6 @@ kde4_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
2525 kde4_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
2626 kde4_bool_to_01(X11_Xkb_FOUND HAVE_XKB) # kglobalaccel, kcontrol/keyboard
2727 kde4_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
28-kde4_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
2928 kde4_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kcontrol/keyboard
3029 kde4_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin
3130 kde4_bool_to_01(X11_XRes_FOUND HAVE_XRES) # ksysguard
--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@@ -22,9 +22,6 @@
2222 /* Define if you have the XTest extension */
2323 #cmakedefine HAVE_XTEST 1
2424
25-/* Define if your system has XRender support */
26-#cmakedefine HAVE_XRENDER 1
27-
2825 /* Define if you have the XSync extension */
2926 #cmakedefine HAVE_XSYNC 1
3027
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -45,7 +45,6 @@ add_executable(kapplymousetheme ${kapplymousetheme_SRCS})
4545
4646 target_link_libraries(kapplymousetheme
4747 ${KDE4_KDEUI_LIBS}
48- ${X11_Xrender_LIB}
4948 ${X11_X11_LIB}
5049 )
5150 if (X11_Xcursor_FOUND)
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -62,8 +62,7 @@ target_link_libraries(krunner
6262 ${KDE4_SOLID_LIBRARIES}
6363 ${KDE4_KDEUI_LIBS}
6464 ${KDE4_KCMUTILS_LIBS}
65- ${X11_Xrender_LIB}
66- ${X11_LIBRARIES}
65+ ${X11_X11_LIB}
6766 )
6867
6968 if(X11_Xcursor_FOUND)
--- a/krunner/krunnerapp.cpp
+++ b/krunner/krunnerapp.cpp
@@ -44,7 +44,8 @@
4444 #include "krunnersettings.h"
4545
4646 #ifdef Q_WS_X11
47-#include <X11/extensions/Xrender.h>
47+#include <X11/Xlib.h>
48+#include <X11/Xutil.h>
4849 #endif
4950
5051 KRunnerApp* KRunnerApp::self()
@@ -138,9 +139,6 @@ void KRunnerApp::initialize()
138139 }
139140
140141 #ifdef Q_WS_X11
141- //FIXME: if argb visuals enabled Qt will always set WM_CLASS as "qt-subapplication" no matter what
142- //the application name is we set the proper XClassHint here, hopefully won't be necessary anymore when
143- //qapplication will manage apps with argvisuals in a better way
144142 XClassHint classHint;
145143 classHint.res_name = const_cast<char*>("krunner");
146144 classHint.res_class = const_cast<char*>("krunner");
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -53,7 +53,6 @@ target_link_libraries(ksmserver
5353 ${KDE4_KDECLARATIVE_LIBS}
5454 ${QT_QTDECLARATIVE_LIBRARY}
5555 ${X11_LIBRARIES}
56- ${X11_Xrender_LIB}
5756 kworkspace
5857 )
5958
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4848 #include <QtGui/qx11info_x11.h>
4949 #include <QtCore/qfile.h>
5050
51-#include <X11/extensions/Xrender.h>
51+#include <X11/Xlib.h>
5252
5353 static const char version[] = "0.4";
5454 static const char description[] = I18N_NOOP( "The reliable KDE session manager that talks the standard X11R6 \nsession management protocol (XSMP)." );
--- a/kstyles/oxygen/oxygenshadowhelper.cpp
+++ b/kstyles/oxygen/oxygenshadowhelper.cpp
@@ -56,16 +56,16 @@ namespace Oxygen
5656 _helper( helper ),
5757 _shadowCache( new ShadowCache( helper ) ),
5858 _size( 0 )
59- #ifdef Q_WS_X11
59+#ifdef Q_WS_X11
6060 ,_atom( None )
61- #endif
61+#endif
6262 {}
6363
6464 //_______________________________________________________
6565 ShadowHelper::~ShadowHelper( void )
6666 {
6767
68- #ifdef Q_WS_X11
68+#ifdef Q_WS_X11
6969 foreach( const Qt::HANDLE& value, _pixmaps ) {
7070 if (value != 0) {
7171 XFreePixmap( QX11Info::display(), value );
@@ -76,7 +76,7 @@ namespace Oxygen
7676 XFreePixmap( QX11Info::display(), value );
7777 }
7878 }
79- #endif
79+#endif // Q_WS_X11
8080
8181 delete _shadowCache;
8282
@@ -85,7 +85,7 @@ namespace Oxygen
8585 //______________________________________________
8686 void ShadowHelper::reset( void )
8787 {
88- #ifdef Q_WS_X11
88+#ifdef Q_WS_X11
8989 // round pixmaps
9090 foreach( const Qt::HANDLE& value, _pixmaps ) {
9191 if (value != 0) {
@@ -97,7 +97,7 @@ namespace Oxygen
9797 XFreePixmap( QX11Info::display(), value );
9898 }
9999 }
100- #endif
100+#endif // Q_WS_X11
101101
102102 _pixmaps.clear();
103103 _dockPixmaps.clear();
@@ -264,9 +264,9 @@ namespace Oxygen
264264 */
265265
266266 // create atom
267- #ifdef Q_WS_X11
267+#ifdef Q_WS_X11
268268 if( !_atom ) _atom = XInternAtom( QX11Info::display(), netWMShadowAtomName, False);
269- #endif
269+#endif
270270
271271 // make sure size is valid
272272 if( _size <= 0 ) return _pixmaps;
@@ -320,7 +320,7 @@ namespace Oxygen
320320 explicitly and draw the source pixmap on it.
321321 */
322322
323- #ifdef Q_WS_X11
323+#ifdef Q_WS_X11
324324 const int width( source.width() );
325325 const int height( source.height() );
326326
@@ -328,9 +328,9 @@ namespace Oxygen
328328 KPixmap pixmap(source);
329329 // handle not released, safe to return
330330 return pixmap.handle();
331- #else
331+#else
332332 return 0;
333- #endif
333+#endif // Q_WS_X11
334334
335335 }
336336
@@ -341,9 +341,7 @@ namespace Oxygen
341341 // check widget and shadow
342342 if( !widget ) return false;
343343
344- #ifdef Q_WS_X11
345- #ifndef QT_NO_XRENDER
346-
344+#ifdef Q_WS_X11
347345 // TODO: also check for NET_WM_SUPPORTED atom, before installing shadow
348346
349347 /*
@@ -408,9 +406,7 @@ namespace Oxygen
408406 reinterpret_cast<const unsigned char *>(data.constData()), data.size() );
409407
410408 return true;
411-
412- #endif
413- #endif
409+#endif // Q_WS_X11
414410
415411 return false;
416412
@@ -420,10 +416,10 @@ namespace Oxygen
420416 void ShadowHelper::uninstallX11Shadows( QWidget* widget ) const
421417 {
422418
423- #ifdef Q_WS_X11
419+#ifdef Q_WS_X11
424420 if( !( widget && widget->testAttribute(Qt::WA_WState_Created) ) ) return;
425421 XDeleteProperty(QX11Info::display(), widget->winId(), _atom);
426- #endif
422+#endif
427423
428424 }
429425
--- a/plasma/shells/plasma-desktop/CMakeLists.txt
+++ b/plasma/shells/plasma-desktop/CMakeLists.txt
@@ -35,14 +35,20 @@ qt4_add_dbus_interface(plasma_SRCS ${ksmserver_xml} ksmserver_interface)
3535
3636 add_executable(plasma-desktop ${plasma_SRCS})
3737
38-target_link_libraries(plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY})
38+target_link_libraries(plasma-desktop
39+ ${KDE4_PLASMA_LIBS}
40+ ${KDE4_KIO_LIBS}
41+ ${KDE4_KFILE_LIBS}
42+ ${KDE4_KTEXTEDITOR_LIBS}
43+ ${KDE4_KIDLETIME_LIBS}
44+ ${QT_QTSCRIPT_LIBRARY}
45+ ${QT_QTDECLARATIVE_LIBRARY}
46+ kworkspace
47+ plasmagenericshell
48+)
3949
4050 if(UNIX AND Q_WS_X11)
4151 target_link_libraries(plasma-desktop ${X11_LIBRARIES})
42-
43- if(X11_Xrender_FOUND)
44- target_link_libraries(plasma-desktop ${X11_Xrender_LIB})
45- endif(X11_Xrender_FOUND)
4652 endif(UNIX AND Q_WS_X11)
4753
4854 install(TARGETS plasma-desktop ${INSTALL_TARGETS_DEFAULT_ARGS})
--- a/plasma/shells/plasma-desktop/plasmaapp.cpp
+++ b/plasma/shells/plasma-desktop/plasmaapp.cpp
@@ -83,7 +83,7 @@
8383
8484 #ifdef Q_WS_X11
8585 #include <X11/Xlib.h>
86-#include <X11/extensions/Xrender.h>
86+#include <X11/Xutil.h>
8787 #endif
8888
8989 extern QString plasmaLocale;
@@ -755,9 +755,6 @@ void PlasmaApp::createView(Plasma::Containment *containment)
755755 void PlasmaApp::setWmClass(WId id)
756756 {
757757 #ifdef Q_WS_X11
758- //FIXME: if argb visuals enabled Qt will always set WM_CLASS as "qt-subapplication" no matter what
759- //the application name is we set the proper XClassHint here, hopefully won't be necessary anymore when
760- //qapplication will manage apps with argvisuals in a better way
761758 XClassHint classHint;
762759 classHint.res_name = const_cast<char*>("Plasma");
763760 classHint.res_class = const_cast<char*>("Plasma");
Show on old repository browser