Ticket #46359: patch-kcontrol.patch

kcontrol/CMakeLists.txt

@@ -18 +18 @@
     add_subdirectory( keyboard )
 endif(X11_Xkb_FOUND)
 
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
 add_subdirectory( bell )
 add_subdirectory( input )
 add_subdirectory( access )
 add_subdirectory( screensaver )
 add_subdirectory( dateandtime )
 add_subdirectory( autostart )
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT APPLE)
 
 add_subdirectory( launch )
 add_subdirectory( colors )
@@ -43 +43 @@
 add_subdirectory( desktoppaths )
 
 if( FREETYPE_FOUND )
-    if( WIN32 OR FONTCONFIG_FOUND )
+    if( WIN32 OR APPLE OR FONTCONFIG_FOUND )
         add_subdirectory( fonts )
-    endif( WIN32 OR FONTCONFIG_FOUND )
+    endif( WIN32 OR APPLE OR FONTCONFIG_FOUND )
 endif( FREETYPE_FOUND )
 if(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
     add_subdirectory( kfontinst )

kcontrol/krdb/krdb.cpp

@@ -518 +518 @@
 
     if( cfgfonts.readEntry( "forceFontDPI", 0 ) != 0 )
       contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
+#ifdef Q_WS_X11
     else
     {
       KProcess proc;
@@ -530 +531 @@
         proc.waitForFinished();
       }
     }
+#endif // Q_WS_X11
   }
 
   if (contents.length() > 0)
@@ -537 +539 @@
 
   tmpFile.flush();
 
+#ifdef Q_WS_X11
   KProcess proc;
 #ifndef NDEBUG
   proc << "xrdb" << "-merge" << tmpFile.fileName();
@@ -544 +547 @@
   proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
 #endif
   proc.execute();
+#endif // Q_WS_X11
 
   applyGtkStyles(exportColors, 1);
   applyGtkStyles(exportColors, 2);

kcontrol/style/CMakeLists.txt

@@ -18 +18 @@
 
 target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
     ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
     target_link_libraries(kcm_style kdecorations)
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT APPLE)
 
 install(TARGETS kcm_style  DESTINATION ${PLUGIN_INSTALL_DIR})