Ticket #46359: patch-kcontrol.patch

File patch-kcontrol.patch, 2.4 KB (added by RJVB (René Bertin), 10 years ago)

  • kcontrol/CMakeLists.txt 

    diff --git kcontrol/CMakeLists.txt kcontrol/CMakeLists.txt
index fc666b1..a7686d5 100644
    if(X11_Xkb_FOUND) 
    1818    add_subdirectory( keyboard )
    1919endif(X11_Xkb_FOUND)
    2020
    21 if(NOT WIN32)
     21if(NOT WIN32 AND NOT APPLE)
    2222add_subdirectory( bell )
    2323add_subdirectory( input )
    2424add_subdirectory( access )
    2525add_subdirectory( screensaver )
    2626add_subdirectory( dateandtime )
    2727add_subdirectory( autostart )
    28 endif(NOT WIN32)
     28endif(NOT WIN32 AND NOT APPLE)
    2929
    3030add_subdirectory( launch )
    3131add_subdirectory( colors )
    … … add_subdirectory( hardware ) 
    4343add_subdirectory( desktoppaths )
    4444
    4545if( FREETYPE_FOUND )
    46     if( WIN32 OR FONTCONFIG_FOUND )
     46    if( WIN32 OR APPLE OR FONTCONFIG_FOUND )
    4747        add_subdirectory( fonts )
    48     endif( WIN32 OR FONTCONFIG_FOUND )
     48    endif( WIN32 OR APPLE OR FONTCONFIG_FOUND )
    4949endif( FREETYPE_FOUND )
    5050if(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
    5151    add_subdirectory( kfontinst )

  • kcontrol/krdb/krdb.cpp 

    diff --git kcontrol/krdb/krdb.cpp kcontrol/krdb/krdb.cpp
index 36fc99c..b49993e 100644
    void runRdb( uint flags ) 
    518518
    519519    if( cfgfonts.readEntry( "forceFontDPI", 0 ) != 0 )
    520520      contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
     521#ifdef Q_WS_X11
    521522    else
    522523    {
    523524      KProcess proc;
    … … void runRdb( uint flags ) 
    530531        proc.waitForFinished();
    531532      }
    532533    }
     534#endif // Q_WS_X11
    533535  }
    534536
    535537  if (contents.length() > 0)
    … … void runRdb( uint flags ) 
    537539
    538540  tmpFile.flush();
    539541
     542#ifdef Q_WS_X11
    540543  KProcess proc;
    541544#ifndef NDEBUG
    542545  proc << "xrdb" << "-merge" << tmpFile.fileName();
    … … void runRdb( uint flags ) 
    544547  proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
    545548#endif
    546549  proc.execute();
     550#endif // Q_WS_X11
    547551
    548552  applyGtkStyles(exportColors, 1);
    549553  applyGtkStyles(exportColors, 2);

  • kcontrol/style/CMakeLists.txt 

    diff --git kcontrol/style/CMakeLists.txt kcontrol/style/CMakeLists.txt
index d832b20..7c84cf9 100644
    kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS}) 
    1818
    1919target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
    2020    ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
    21 if(NOT WIN32)
     21if(NOT WIN32 AND NOT APPLE)
    2222    target_link_libraries(kcm_style kdecorations)
    23 endif(NOT WIN32)
     23endif(NOT WIN32 AND NOT APPLE)
    2424
    2525install(TARGETS kcm_style  DESTINATION ${PLUGIN_INSTALL_DIR})
    2626