dist-git conversion

* Mon Jun  1 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-2
- respun tarball

* Sat May 30 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-1
- KDE 4.2.4

.cvsignore

@@ -1 +0,0 @@
-kdelibs-4.0.3.tar.bz2

.gitignore

@@ -0,0 +1 @@
+kdelibs-4.2.4.tar.bz2

Makefile

@@ -4,7 +4,7 @@ NAME := kdelibs
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -0,0 +1 @@
+F-9

kde4.csh

@@ -10,9 +10,6 @@ if ( -f /etc/sysconfig/prelink ) then
    if ( "$PRELINKING" == "yes" )  then
      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
    endif
+   unset PRELINKING
 endif
 
-if ( ! $?QT_PLUGIN_PATH ) then
-  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
-  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
-endif

kde4.sh

@@ -5,13 +5,8 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
 
-if [ -z "$QT_PLUGIN_PATH" ]; then
-  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
-  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
-fi

kdelibs-3.95.0-kde149705.patch

@@ -1,39 +0,0 @@
-diff -up kdelibs-3.95.0/kutils/kdeglobals.kcfg.kde149705 kdelibs-3.95.0/kutils/kdeglobals.kcfg
---- kdelibs-3.95.0/kutils/kdeglobals.kcfg.kde149705	2007-10-03 05:50:18.000000000 -0500
-+++ kdelibs-3.95.0/kutils/kdeglobals.kcfg	2007-11-04 15:08:14.000000000 -0600
-@@ -24,6 +24,10 @@
-    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
-    <default>keramik</default>
-   </entry>
-+  <entry key="widgetStyle4" type="String" >
-+   <label>Widget style to use for KDE 4</label>
-+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
-+  </entry>
-   <entry key="windowBackground" type="String" />
-   <entry key="windowForeground" type="String" />
-   <entry key="UseSystemBell" type="Bool" >
-diff -up kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp
---- kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp.kde149705	2007-10-26 04:05:41.000000000 -0500
-+++ kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp	2007-11-04 15:09:11.000000000 -0600
-@@ -835,7 +835,8 @@ void KGlobalSettings::Private::applyGUIS
-     QString defaultStyle; // Mac, Windows: no change for style by default
- #endif
-     KConfigGroup pConfig (KGlobal::config(), "General");
--    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
-+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
-+
- 
-     if (kde_overrideStyle.isEmpty()) {
-         if (styleStr.isEmpty())
-diff -up kdelibs-3.95.0/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-3.95.0/kdeui/icons/kicontheme.cpp
---- kdelibs-3.95.0/kdeui/icons/kicontheme.cpp.kde149705	2007-10-25 04:34:48.000000000 -0500
-+++ kdelibs-3.95.0/kdeui/icons/kicontheme.cpp	2007-11-04 15:08:14.000000000 -0600
-@@ -515,7 +515,7 @@ QString KIconTheme::current()
-         return *_theme;
- 
-     KConfigGroup cg(KGlobal::config(), "Icons");
--    *_theme = cg.readEntry("Theme", defaultThemeName());
-+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
-     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
- /*    if (_theme->isEmpty())
-     {

kdelibs-3.95.0-parallel_devel.patch

@@ -1,289 +0,0 @@
-diff -up kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh.parallel-devel kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh
---- kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh.parallel-devel	2007-07-26 05:40:17.000000000 -0500
-+++ kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh	2007-11-04 15:47:59.000000000 -0600
-@@ -2,9 +2,9 @@
- # Generates and cleans KConfigXT source code during a API dox build
- #
- 
--kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
-+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
- if test -z "$kcfg_compiler"; then
--	echo "kconfig_compiler not found!"
-+	echo "kconfig_compiler4 not found!"
- 	exit 1;
- fi
- 
-diff -up kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt
---- kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel-devel	2007-10-03 05:49:47.000000000 -0500
-+++ kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-11-04 15:47:59.000000000 -0600
-@@ -8,11 +8,11 @@ add_subdirectory( example )
- set(kconfig_compiler_SRCS kconfig_compiler.cpp)
- 
- 
--kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
-+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
- 
--target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
-+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
- 
--install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
-+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
- 
- 
- ########### install files ###############
-diff -up kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel-devel kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl
---- kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel-devel	2006-10-25 21:25:48.000000000 -0500
-+++ kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl	2007-11-04 15:47:59.000000000 -0600
-@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
- 
- $kcfgc = $file . "c";
- 
--$cmd = "./kconfig_compiler $file $kcfgc";
-+$cmd = "./kconfig_compiler4 $file $kcfgc";
- 
- #print "CMD $cmd\n";
- 
- if ( system( $cmd ) != 0 ) {
--  print STDERR "Unable to run kconfig_compiler\n";
-+  print STDERR "Unable to run kconfig_compiler4\n";
-   exit 1;
- }
- 
-diff -up kdelibs-3.95.0/kdewidgets/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdewidgets/CMakeLists.txt
---- kdelibs-3.95.0/kdewidgets/CMakeLists.txt.parallel-devel	2007-10-03 05:50:13.000000000 -0500
-+++ kdelibs-3.95.0/kdewidgets/CMakeLists.txt	2007-11-04 15:47:59.000000000 -0600
-@@ -16,22 +16,22 @@ include_directories( 
- set(makekdewidgets_SRCS makekdewidgets.cpp )
- 
- 
--kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
-+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
- 
--target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
-+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
- 
--install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
-+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
- 
- 
- ########### next target ###############
- 
- 
- # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
--get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
-+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
-   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
--  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
-+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
- 
- set(kdewidgets_PART_SRCS
-    classpreviews.cpp
-diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel	2007-10-23 03:39:11.000000000 -0500
-+++ kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake	2007-11-04 15:55:31.000000000 -0600
-@@ -15,10 +15,10 @@
- # The following variables are defined for the various tools required to
- # compile KDE software:
- #
--# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
-+# KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
- # KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable
- # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
--# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
-+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
- #
- # The following variables point to the location of the KDE libraries,
- # but shouldn't be used directly:
-@@ -121,7 +121,7 @@
- #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
- #
- # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
--#    Use this to add widget description files for the makekdewidgets code generator
-+#    Use this to add widget description files for the makekdewidgets4 code generator
- #    for Qt Designer plugins.
- #
- # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
-@@ -272,24 +272,24 @@ if (_kdeBootStrapping)
-    if (WIN32)
-       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
-       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
--      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
-+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
-       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
-       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
--      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
-+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
-    else (WIN32)
-       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
--      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
-+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
-       set(KDE4_AUTOMOC_EXECUTABLE        ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
-       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
--      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
-+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
-    endif (WIN32)
- 
-    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
- 
-    # when building kdelibs, make the kcfg rules depend on the binaries...
--   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
-    set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
--   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
-+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
-    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
- 
-    set(KDE4_INSTALLED_VERSION_OK TRUE)
-@@ -342,72 +342,72 @@ else (_kdeBootStrapping)
-    # this file contains all dependencies of all libraries of kdelibs, Alex
-    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
- 
--   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
- 
--   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
- 
--   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
- 
--   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
- 
--   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
- 
--   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
- 
--   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
- 
--   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
- 
--   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
- 
--   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
- 
--   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
- 
-    if (UNIX)
--      find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+      find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-       set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} )
- 
--      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+      find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-       set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
-    endif (UNIX)
- 
--   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
- 
--   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
- 
--   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
- 
--   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
- 
--   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
- 
--   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
- 
--   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
- 
--   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
- 
--   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
- 
-    # Can't do that, it's not always compiled.
-@@ -426,8 +426,8 @@ else (_kdeBootStrapping)
- 
-    # at first look in LIBEXEC_INSTALL_DIR and no default paths,
-    # if this didn't succeed, the second call makes cmake search again, but in the standard paths
--   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
--   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
-+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
- 
-    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-    find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
-@@ -435,8 +435,8 @@ else (_kdeBootStrapping)
-    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-    find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
- 
--   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
--   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
-+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
- 
-    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
-    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-@@ -585,7 +585,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY
-                               "${_CMAKE_INSTALL_DIR}/bin"
-                               "${CMAKE_INSTALL_PREFIX}/bin" )
- 
--set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
-+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
-+                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
-                               "${KDE4_LIB_INSTALL_DIR}"
-                               "${_CMAKE_INSTALL_DIR}/lib" 
-                               "${CMAKE_INSTALL_PREFIX}/lib" )
-@@ -924,9 +925,9 @@ macro (KDE4_PRINT_RESULTS)
-    endif (NOT _kdeBootStrapping)
- 
-    if(KDE4_KCFGC_EXECUTABLE)
--      message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
-+      message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
-    else(KDE4_KCFGC_EXECUTABLE)
--      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
-+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
-    endif(KDE4_KCFGC_EXECUTABLE)
- 
-    if(KDE4_AUTOMOC_EXECUTABLE)
-diff -up kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt
---- kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-devel	2007-10-03 05:50:15.000000000 -0500
-+++ kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-11-04 15:47:59.000000000 -0600
-@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
-    add_custom_command(
-       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
-       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
--      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
-+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
- 
- #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
-    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )

kdelibs-3.97.0-alsa-default-device.patch

@@ -1,27 +0,0 @@
-diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp
---- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp	2007-11-20 23:02:30.000000000 +0100
-+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp	2008-01-04 16:23:04.000000000 +0100
-@@ -349,6 +349,8 @@
-     if (lines.size() > 1) {
-         d->cardName = i18n("%1 (%2)", d->cardName, lines[1]);
-     }
-+    if (alsaDeviceName == "default")
-+        d->initialPreference = 1000;
-     if (alsaDeviceName.startsWith("front:") ||
-             alsaDeviceName.startsWith("rear:") ||
-             alsaDeviceName.startsWith("center_lfe:") ||
-diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp
---- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp	2007-11-27 18:17:14.000000000 +0100
-+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp	2008-01-04 16:23:04.000000000 +0100
-@@ -188,6 +188,11 @@
-     }
-     snd_device_name_free_hint(hints);
- 
-+    DeviceHint defaultHint;
-+    defaultHint.name = QString::fromLatin1("default");
-+    defaultHint.description= QString::fromLatin1("ALSA Default Device");
-+    deviceHints << defaultHint;
-+
-     snd_config_update_free_global();
-     snd_config_update();
-     Q_ASSERT(snd_config);

kdelibs-4.0.1-dcop-servicetype.patch

@@ -1,17 +0,0 @@
-diff -ur kdelibs-4.0.1/kdecore/services/kservice.cpp kdelibs-4.0.1-dcop-servicetype/kdecore/services/kservice.cpp
---- kdelibs-4.0.1/kdecore/services/kservice.cpp	2008-01-05 01:00:34.000000000 +0100
-+++ kdelibs-4.0.1-dcop-servicetype/kdecore/services/kservice.cpp	2008-02-19 20:21:57.000000000 +0100
-@@ -194,7 +194,12 @@
-     //Compatibility
-     if( dbusStartupType.isEmpty() && desktopGroup.hasKey("X-DCOP-ServiceType"))
-     {
--        dbusStartupType = desktopGroup.readEntry("X-DCOP-ServiceType").toLower();
-+        QString dcopStartupType = desktopGroup.readEntry("X-DCOP-ServiceType").toLower();
-+        // We can't use unique or multi because KLauncher will try to use D-Bus instead of DCOP on it.
-+        // Only "wait" is safe (only waits for the process to complete, no DCOP or D-Bus involved).
-+        // We use the default "none" otherwise.
-+        if (dcopStartupType == "wait")
-+            dbusStartupType = dcopStartupType;
-         entryMap.remove("X-DCOP-ServiceType");
-     }
-     entryMap.remove("X-DBUS-StartupType");

kdelibs-4.0.3-fedora-buildtype.patch

@@ -1,17 +0,0 @@
-diff -ur kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.0.3/cmake/modules/FindKDE4Internal.cmake	2008-03-27 21:33:23.000000000 +0100
-+++ kdelibs-4.0.3-fedora-buildtype/cmake/modules/FindKDE4Internal.cmake	2008-03-31 17:34:40.000000000 +0200
-@@ -882,11 +882,13 @@
-    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
-    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
-    set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-+   set(CMAKE_CXX_FLAGS_FEDORA         "-DNDEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
-    set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
-    set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
-    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
-    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-+   set(CMAKE_C_FLAGS_FEDORA           "-DNDEBUG")
- 
-    if (CMAKE_SYSTEM_NAME MATCHES Linux)
-      set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")

kdelibs-4.0.3-kconfig_sync_crash.patch

@@ -1,156 +0,0 @@
-Index: kdelibs/kdecore/kernel/kglobal.cpp
-===================================================================
---- kdelibs/kdecore/kernel/kglobal.cpp	(Revision 791351)
-+++ kdelibs/kdecore/kernel/kglobal.cpp	(Revision 791352)
-@@ -28,6 +28,12 @@
- #include "kglobal.h"
- #include "kglobal_p.h"
- 
-+#include <config.h>
-+
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+
- #include <QtCore/QList>
- #include <QtCore/QSet>
- 
-@@ -64,6 +70,10 @@
-             locale(0),
-             charsets(0)
-         {
-+            // the umask is read here before any threads are created to avoid race conditions
-+            mode_t tmp = 0;
-+            umsk = umask(tmp);
-+            umask(umsk);
-         }
- 
-         inline ~KGlobalPrivate()
-@@ -81,6 +91,7 @@
-         KStringDict *stringDict;
-         KLocale *locale;
-         KCharsets *charsets;
-+        mode_t umsk;
- };
- 
- K_GLOBAL_STATIC(KGlobalPrivate, globalData)
-@@ -151,6 +162,12 @@
-     return d->charsets;
- }
- 
-+mode_t KGlobal::umask()
-+{
-+    PRIVATE_DATA;
-+    return d->umsk;
-+}
-+
- KComponentData KGlobal::activeComponent()
- {
-     PRIVATE_DATA;
-Index: kdelibs/kdecore/kernel/kglobal.h
-===================================================================
---- kdelibs/kdecore/kernel/kglobal.h	(Revision 791351)
-+++ kdelibs/kdecore/kernel/kglobal.h	(Revision 791352)
-@@ -21,7 +21,9 @@
- 
- #include <kdecore_export.h>
- #include <QtCore/QAtomicPointer>
-+#include <sys/types.h>
- 
-+
- //
- // WARNING!!
- // This code uses undocumented Qt API
-@@ -354,6 +356,12 @@
-     KDECORE_EXPORT KCharsets *charsets();
- 
-     /**
-+     * Returns the umask of the process.
-+     * @return the umask of the process
-+     */
-+    KDECORE_EXPORT mode_t umask();
-+
-+    /**
-      * Creates a static QString.
-      *
-      * To be used inside functions(!) like:
-Index: kdelibs/kdecore/io/ksavefile.cpp
-===================================================================
---- kdelibs/kdecore/io/ksavefile.cpp	(Revision 791351)
-+++ kdelibs/kdecore/io/ksavefile.cpp	(Revision 791352)
-@@ -119,6 +119,10 @@
-         if (!fchown(tempFile.handle(), fi.ownerId(), fi.groupId()))
-             tempFile.setPermissions(fi.permissions());
-     }
-+    else {
-+        mode_t umsk = KGlobal::umask();
-+        fchmod(tempFile.handle(), 0666&(~umsk));
-+    }
- 
-     //Open oursleves with the temporary file
-     QFile::setFileName(tempFile.fileName());
-Index: kdelibs/kdecore/io/ktempdir.cpp
-===================================================================
---- kdelibs/kdecore/io/ktempdir.cpp	(Revision 791351)
-+++ kdelibs/kdecore/io/ktempdir.cpp	(Revision 791352)
-@@ -94,9 +94,7 @@
-    d->tmpName = QFile::decodeName(realNameStr)+'/';
-    kDebug(180) << "KTempDir: Temporary directory created :" << d->tmpName
- 	        << endl;
--   mode_t tmp = 0;
--   mode_t umsk = umask(tmp);
--   umask(umsk);
-+   mode_t umsk = KGlobal::umask();
-    chmod(nme, mode&(~umsk));
- 
-    // Success!
-Index: kdelibs/kdecore/kernel/kglobal.cpp
-===================================================================
---- kdelibs/kdecore/kernel/kglobal.cpp	(Revision 793503)
-+++ kdelibs/kdecore/kernel/kglobal.cpp	(Revision 793504)
-@@ -46,6 +46,7 @@
- #include <QtCore/QCoreApplication>
- #include <QtCore/QTextCodec>
- #include "kcmdlineargs.h"
-+#include <unistd.h> // umask
- 
- #ifndef NDEBUG
- #define MYASSERT(x) if (!x) \
-@@ -61,6 +62,7 @@
- Q_CONSTRUCTOR_FUNCTION(qrand)
- 
- typedef QSet<QString> KStringDict;
-+mode_t s_umsk;
- 
- class KGlobalPrivate
- {
-@@ -72,8 +74,8 @@
-         {
-             // the umask is read here before any threads are created to avoid race conditions
-             mode_t tmp = 0;
--            umsk = umask(tmp);
--            umask(umsk);
-+            s_umsk = umask(tmp);
-+            umask(s_umsk);
-         }
- 
-         inline ~KGlobalPrivate()
-@@ -91,7 +93,6 @@
-         KStringDict *stringDict;
-         KLocale *locale;
-         KCharsets *charsets;
--        mode_t umsk;
- };
- 
- K_GLOBAL_STATIC(KGlobalPrivate, globalData)
-@@ -164,8 +165,8 @@
- 
- mode_t KGlobal::umask()
- {
--    PRIVATE_DATA;
--    return d->umsk;
-+    // Don't use PRIVATE_DATA here. This is called by ~KGlobalPrivate -> ~KConfig -> sync -> KSaveFile, so there's no KGlobalPrivate anymore.
-+    return s_umsk;
- }
- 
- KComponentData KGlobal::activeComponent()

kdelibs-4.0.3-klauncher-crash.patch

@@ -1,83 +0,0 @@
-Index: kdelibs/kinit/klauncher.cpp
-===================================================================
---- kdelibs/kinit/klauncher.cpp	(Revision 792865)
-+++ kdelibs/kinit/klauncher.cpp	(Revision 792866)
-@@ -231,16 +231,19 @@
- {
- #ifdef Q_WS_X11
-    if( mCached_dpy != NULL )
-+   {
-        XCloseDisplay( mCached_dpy );
-+       mCached_dpy = NULL;
-+   }
- #endif
- }
- 
- void
--KLauncher::destruct(int exit_code)
-+KLauncher::destruct()
- {
-     if (QCoreApplication::instance()) ((KLauncher*)QCoreApplication::instance())->close();
-     // We don't delete the app here, that's intentional.
--    ::_exit(exit_code);
-+    ::_exit(255);
- }
- 
- void KLauncher::setLaunchEnv(const QString &name, const QString &value)
-@@ -312,7 +315,7 @@
-       kDebug(7016) << "Exiting on read_socket errno:" << errno;
-       ::signal( SIGHUP, SIG_IGN);
-       ::signal( SIGTERM, SIG_IGN);
--      destruct(255); // Exit!
-+      destruct(); // Exit!
-    }
-    requestData.resize(request_header.arg_length);
-    result = read_socket(kdeinitSocket, (char *) requestData.data(),
-Index: kdelibs/kinit/klauncher_main.cpp
-===================================================================
---- kdelibs/kinit/klauncher_main.cpp	(Revision 792865)
-+++ kdelibs/kinit/klauncher_main.cpp	(Revision 792866)
-@@ -35,13 +35,15 @@
- #include <QtCore/QCoreApplication>
- 
- #ifndef Q_WS_WIN
-+static int sigpipe[ 2 ];
- static void sig_handler(int sig_num)
- {
-    // No recursion
-    signal( SIGHUP, SIG_IGN);
-    signal( SIGTERM, SIG_IGN);
--fprintf(stderr, "klauncher: Exiting on signal %d\n", sig_num);
--   KLauncher::destruct(255);
-+   fprintf(stderr, "klauncher: Exiting on signal %d\n", sig_num);
-+   char tmp = 'x';
-+   write( sigpipe[ 1 ], &tmp, 1 );
- }
- #endif
- 
-@@ -103,6 +105,9 @@
-    QDBusConnection::sessionBus().registerObject("/", launcher);
- 
- #ifndef Q_WS_WIN
-+   pipe( sigpipe );
-+   QSocketNotifier* signotif = new QSocketNotifier( sigpipe[ 0 ], QSocketNotifier::Read, launcher );
-+   QObject::connect( signotif, SIGNAL( activated( int )), launcher, SLOT( destruct()));
-    KCrash::setEmergencySaveFunction(sig_handler);
-    signal( SIGHUP, sig_handler);
-    signal( SIGPIPE, SIG_IGN);
-Index: kdelibs/kinit/klauncher.h
-===================================================================
---- kdelibs/kinit/klauncher.h	(Revision 792865)
-+++ kdelibs/kinit/klauncher.h	(Revision 792866)
-@@ -123,8 +123,10 @@
-    ~KLauncher();
- 
-    void close();
--   static void destruct(int exit_code); // exit!
- 
-+public slots:
-+   void destruct(); // exit!
-+
- protected:
-    void processDied(pid_t pid, long exitStatus);
- 

kdelibs-4.0.3-libexecdir.patch

@@ -1,57 +0,0 @@
-diff -ur kdelibs-4.0.3/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs.cpp
---- kdelibs-4.0.3/kdecore/kernel/kstandarddirs.cpp	2008-03-27 21:33:34.000000000 +0100
-+++ kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs.cpp	2008-03-31 18:07:10.000000000 +0200
-@@ -1585,7 +1585,7 @@
-         addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
-         index+=2;
-     }
--    addResourceType("exe", "lib", "kde4/libexec", true );
-+    addResourceType("exe", 0, "libexec/kde4", true );
- 
-     addResourceDir("home", QDir::homePath(), false);
- }
-diff -ur kdelibs-4.0.3/kdecore/kernel/kstandarddirs_unix.cpp kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs_unix.cpp
---- kdelibs-4.0.3/kdecore/kernel/kstandarddirs_unix.cpp	2008-03-27 21:27:35.000000000 +0100
-+++ kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs_unix.cpp	2008-03-31 17:54:58.000000000 +0200
-@@ -62,7 +62,7 @@
-             if (strcmp("lib", type) == 0)
-                 return QString::fromLatin1(LIB_INSTALL_DIR "/");
-             if (strcmp("libexec", type) == 0)
--                return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
-+                return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
-             if (strcmp("locale", type) == 0)
-                 return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
-             break;
-diff -ur kdelibs-4.0.3/kdecore/tests/kstandarddirstest.cpp kdelibs-4.0.3-libexecdir/kdecore/tests/kstandarddirstest.cpp
---- kdelibs-4.0.3/kdecore/tests/kstandarddirstest.cpp	2008-03-27 21:33:34.000000000 +0100
-+++ kdelibs-4.0.3-libexecdir/kdecore/tests/kstandarddirstest.cpp	2008-03-31 17:54:58.000000000 +0200
-@@ -69,7 +69,7 @@
- #endif
-     const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
-     QVERIFY( !bin.isEmpty() );
--    QVERIFY( bin.endsWith( "kde4/libexec/kioslave" EXT ) );
-+    QVERIFY( bin.endsWith( "kde4/libexec/kioslave" EXT ) || bin.endsWith( "libexec/kde4/kioslave" EXT ) );
-     QVERIFY( !QDir::isRelativePath(bin) );
- 
-     const QString data = KGlobal::dirs()->findResource( "data", "katepart/syntax/sql.xml" );
-@@ -164,7 +164,7 @@
-     // findExe with a result in libexec
-     const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
-     QVERIFY( !lnusertemp.isEmpty() );
--    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
-+    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) );
- 
-     // Check the "exe" resource too
-     QCOMPARE( KGlobal::dirs()->realFilePath(kdeinit),
-diff -ur kdelibs-4.0.3/kio/tests/krununittest.cpp kdelibs-4.0.3-libexecdir/kio/tests/krununittest.cpp
---- kdelibs-4.0.3/kio/tests/krununittest.cpp	2008-03-27 21:27:16.000000000 +0100
-+++ kdelibs-4.0.3-libexecdir/kio/tests/krununittest.cpp	2008-03-31 17:54:58.000000000 +0200
-@@ -139,7 +139,7 @@
-     if (kmailservice.isEmpty()) kmailservice = "kmailservice";
-     if (!kdeinit.isEmpty()) {
-         QVERIFY(!kmailservice.isEmpty());
--        QVERIFY(kmailservice.contains("kde4/libexec"));
-+        QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
-     }
- 
-     QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;

kdelibs-4.0.85-libexecdir.patch

@@ -0,0 +1,59 @@
+diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp
+--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir	2008-07-03 00:06:28.000000000 -0500
++++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp	2008-07-06 14:38:18.000000000 -0500
+@@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults()
+         addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
+         index+=2;
+     }
+-    addResourceType("exe", "lib", "kde4/libexec", true );
++    addResourceType("exe", 0, "libexec/kde4", true );
+ 
+     addResourceDir("home", QDir::homePath(), false);
+ }
+diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp
+--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir	2008-05-21 06:08:57.000000000 -0500
++++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp	2008-07-06 14:38:18.000000000 -0500
+@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
+             if (strcmp("lib", type) == 0)
+                 return QString::fromLatin1(LIB_INSTALL_DIR "/");
+             if (strcmp("libexec", type) == 0)
+-                return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
++                return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
+             if (strcmp("locale", type) == 0)
+                 return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
+             break;
+diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp
+--- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir	2008-07-03 00:06:29.000000000 -0500
++++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp	2008-07-06 14:41:31.000000000 -0500
+@@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource
+ #define KIOSLAVE "bin/kioslave.exe"
+ #else
+ #define EXT ""
+-#define KIOSLAVE "kde4/libexec/kioslave"
++#define KIOSLAVE "libexec/kde4/kioslave"
+ #endif
++
+     const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
+     QVERIFY( !bin.isEmpty() );
+     QVERIFY( bin.endsWith( KIOSLAVE ) );
+@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe()
+     // findExe with a result in libexec
+     const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
+     QVERIFY( !lnusertemp.isEmpty() );
+-    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
++    QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) ); 
+ #endif
+ 
+     // Check the "exe" resource too
+diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp
+--- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir	2008-05-21 06:08:08.000000000 -0500
++++ kdelibs-4.0.85/kio/tests/krununittest.cpp	2008-07-06 14:38:18.000000000 -0500
+@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
+     if (kmailservice.isEmpty()) kmailservice = "kmailservice";
+     if (!kdeinit.isEmpty()) {
+         QVERIFY(!kmailservice.isEmpty());
+-        QVERIFY(kmailservice.contains("kde4/libexec"));
++        QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
+     }
+ 
+     QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;

kdelibs-4.1.0-xdg-menu.patch

@@ -1,12 +1,30 @@
---- kdelibs-4.0.2/kded/applications.menu.orig	2008-01-05 01:00:10.000000000 +0100
-+++ kdelibs-4.0.2/kded/applications.menu	2008-03-28 12:49:11.000000000 +0100
-@@ -31,12 +31,31 @@
+diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applications.menu
+--- kdelibs-4.1.0/kded/applications.menu	2008-05-21 13:07:34.000000000 +0200
++++ kdelibs-4.1.0-xdg-menu/kded/applications.menu	2008-08-23 09:45:03.000000000 +0200
+@@ -31,29 +31,31 @@
  					<Category>Core</Category>
  					<Not><Category>KDE</Category></Not>
  				</And>
 +				<Category>X-Red-Hat-Base</Category>
  				<!-- Don't list SUSE's YaST in here -->
  				<Category>X-SuSE-YaST</Category>
+-				<Category>X-KDE-settings-hardware</Category>
+-				<Category>X-KDE-settings-accessibility</Category>
+-				<Category>X-KDE-settings-components</Category>
+-				<Category>X-KDE-settings-desktop</Category>
+-				<Category>X-KDE-settings-looknfeel</Category>
+-				<Category>X-KDE-settings-network</Category>
+-				<Category>X-KDE-settings-webbrowsing</Category>
+-				<Category>X-KDE-settings-peripherals</Category>
+-				<Category>X-KDE-settings-hardware</Category>
+-				<Category>X-KDE-settings-power</Category>
+-				<Category>X-KDE-settings-security</Category>
+-				<Category>X-KDE-settings-sound</Category>
+-				<Category>X-KDE-settings-system</Category>
+-				<Category>X-KDE-information</Category>
+-				<Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
+-				<Filename>kde-medianotifications.desktop</Filename>
+-				<Filename>kde-audioencoding.desktop</Filename>
  			</Not>
  		</Include>
  	</Menu>
@@ -32,7 +50,7 @@
  		<Name>Development</Name>
  		<Directory>kde-development.directory</Directory>
  		<Menu>
-@@ -341,7 +360,11 @@
+@@ -358,7 +360,11 @@
  		<Name>Settingsmenu</Name>
  		<Directory>kde-settingsmenu.directory</Directory>
  		<Include>
@@ -45,7 +63,7 @@
  		</Include>
  	</Menu>
  	<Menu>
-@@ -350,7 +373,9 @@
+@@ -367,7 +373,9 @@
  		<Include>
  			<And>
  				<Category>System</Category>

kdelibs-4.1.70-cmake.patch

@@ -0,0 +1,11 @@
+diff -Naur kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake	2008-10-19 16:56:45.000000000 +0200
++++ kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake	2008-10-19 17:06:14.000000000 +0200
+@@ -817,6 +817,7 @@
+ # CMake generators if no build type is set.
+ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE RelWithDebInfo)
++   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
+ endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+ 
+ 

kdelibs-4.1.72-kstandarddirs.patch

@@ -0,0 +1,26 @@
+diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp
+--- kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:31:44.000000000 +0100
++++ kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:38:40.000000000 +0100
+@@ -1002,7 +1002,9 @@
+                  pit != prefixList->end();
+                  ++pit)
+             {
+-	        if((*pit)!=installprefix||installdir.isEmpty())
++                // "exe" never has a custom install path, and the check triggers
++                // a false positive due to the libexecdir patch
++	        if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
+ 	        {
+                     for (QStringList::ConstIterator it = dirs.constBegin();
+                          it != dirs.constEnd(); ++it)
+@@ -1016,6 +1018,11 @@
+                         if ((local || testdir.exists()) && !candidates.contains(path))
+                             candidates.append(path);
+                     }
++                    // special-case "config" (forward porting Chris Cheney's
++                    // hack) - we want /etc/kde after the local config paths
++                    // and before the ones in /usr (including kde-profile)
++                    if (local && !strcmp("config", type))
++                       candidates.append("/etc/kde/");
+                     local = false;
+                 }
+ 	        else

kdelibs-4.1.72-no-cache-kdeglobals-paths.patch

@@ -1,7 +1,7 @@
-diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp
---- kdelibs-4.0.2/kdecore/config/kconfig.cpp	2008-01-05 01:00:39.000000000 +0100
-+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig.cpp	2008-03-09 23:58:41.000000000 +0100
-@@ -60,12 +60,6 @@
+diff -Naur kdelibs-4.1.72/kdecore/config/kconfig.cpp kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig.cpp
+--- kdelibs-4.1.72/kdecore/config/kconfig.cpp	2008-10-23 01:05:09.000000000 +0200
++++ kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig.cpp	2008-11-10 17:38:33.000000000 +0100
+@@ -61,12 +61,6 @@
  {
      sGlobalFileName = componentData.dirs()->saveLocation("config") +
                            QString::fromLatin1("kdeglobals");
@@ -13,8 +13,8 @@ diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglob
 -    }
      const QString etc_kderc =
  #ifdef Q_WS_WIN
-         QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
-@@ -75,15 +69,11 @@
+         QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
+@@ -76,15 +70,11 @@
      KEntryMap tmp;
      // first entry is always /etc/kderc or empty if cannot read
      if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
@@ -30,7 +30,7 @@ diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglob
          mappingsRegistered = true;
      }
  
-@@ -372,10 +362,31 @@
+@@ -461,10 +451,31 @@
  
  void KConfigPrivate::parseGlobalFiles()
  {
@@ -64,10 +64,10 @@ diff -ur kdelibs-4.0.2/kdecore/config/kconfig.cpp kdelibs-4.0.2-no-cache-kdeglob
      const QByteArray utf8Locale = locale.toUtf8();
      foreach(const QString& file, globalFiles) {
          KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal|KConfigBackend::ParseExpansions;
-diff -ur kdelibs-4.0.2/kdecore/config/kconfig_p.h kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h
---- kdelibs-4.0.2/kdecore/config/kconfig_p.h	2008-01-05 01:00:39.000000000 +0100
-+++ kdelibs-4.0.2-no-cache-kdeglobals-paths/kdecore/config/kconfig_p.h	2008-03-09 23:50:26.000000000 +0100
-@@ -82,7 +82,6 @@
+diff -Naur kdelibs-4.1.72/kdecore/config/kconfig_p.h kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig_p.h
+--- kdelibs-4.1.72/kdecore/config/kconfig_p.h	2008-06-03 11:34:54.000000000 +0200
++++ kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig_p.h	2008-11-10 17:38:33.000000000 +0100
+@@ -86,7 +86,6 @@
  
      KEntryMap entryMap;
      QString backendType;

kdelibs-4.1.72-policykit-workaround.patch

@@ -1,19 +1,20 @@
-diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.cpp
---- kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp	2008-01-05 01:00:10.000000000 +0100
-+++ kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.cpp	2008-03-18 11:00:40.000000000 +0100
-@@ -20,6 +20,7 @@
+diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp
+--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp	2008-11-04 18:13:11.000000000 +0100
++++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp	2008-11-10 18:45:41.000000000 +0100
+@@ -17,6 +17,8 @@
+ 
+ */
+ 
++#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
++
  #include "halstorageaccess.h"
  
- #include <QtCore/QDebug>
-+#include <QtCore/QProcess>
- #include <QtDBus/QDBusConnection>
- #include <QtDBus/QDBusInterface>
- #include <QtDBus/QDBusReply>
-@@ -131,11 +132,21 @@
+ #include "halfstabhandling.h"
+@@ -172,11 +174,21 @@
  {
      // TODO: Better error reporting here
      if (m_setupInProgress) {
-+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
++	if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
 +            if (callPrivilegedMount())
 +              return;
 +            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
@@ -23,7 +24,7 @@ diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.0
                         error.name()+": "+error.message(),
                         m_device->udi());
      } else if (m_teardownInProgress) {
-+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
++	if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
 +            if (callPrivilegedUnmount())
 +              return;
 +            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
@@ -31,19 +32,19 @@ diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.0
          m_teardownInProgress = false;
          emit teardownDone(Solid::UnauthorizedOperation,
                            error.name()+": "+error.message(),
-@@ -229,8 +240,10 @@
-                                                       "Mount");
-     QStringList options;
-     QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
-+    QString fstype = m_device->property("volume.fstype").toString();
- 
--    if (halOptions.contains("uid=")) {
-+    if (halOptions.contains("uid=")
-+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
-         options << "uid="+QString::number(::getuid());
+@@ -294,8 +306,9 @@
+ #else
+     QString uid="uid=";
+ #endif
+-    if (halOptions.contains(uid)) {
+-        options << uid+QString::number(::getuid());
++    if (halOptions.contains(uid) &&
++       (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
++            options << uid+QString::number(::getuid());
      }
  
-@@ -256,6 +269,59 @@
+ #ifdef Q_OS_FREEBSD
+@@ -333,6 +346,59 @@
                                SLOT(slotDBusError(const QDBusError &)));
  }
  
@@ -100,12 +101,12 @@ diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.0
 +    }
 +}
 +
- bool Solid::Backends::Hal::StorageAccess::callSystemMount()
+ bool StorageAccess::callHalVolumeUnmount()
  {
-     const QString device = m_device->property("block.device").toString();
-diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.h
---- kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.h	2008-01-05 01:00:11.000000000 +0100
-+++ kdelibs-4.0.2-userdiskmount/solid/solid/backends/hal/halstorageaccess.h	2008-03-18 09:26:39.000000000 +0100
+     QDBusConnection c = QDBusConnection::systemBus();
+diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h
+--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h	2008-05-21 13:07:38.000000000 +0200
++++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h	2008-11-10 18:45:01.000000000 +0100
 @@ -69,6 +69,9 @@
      bool callSystemMount();
      bool callSystemUnmount();
@@ -116,15 +117,3 @@ diff -ur kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.0.2
      bool requestPassphrase();
      void callCryptoSetup(const QString &passphrase);
      bool callCryptoTeardown();
-diff -up kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp.orig kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp
---- kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp.orig	2008-03-26 17:00:23.000000000 +0100
-+++ kdelibs-4.0.2/solid/solid/backends/hal/halstorageaccess.cpp	2008-03-26 17:04:35.000000000 +0100
-@@ -17,6 +17,8 @@
- 
- */
- 
-+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
-+
- #include "halstorageaccess.h"
- 
- #include <QtCore/QDebug>

kdelibs-4.1.82-kde149705.patch

@@ -0,0 +1,38 @@
+diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp
+--- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp	2008-10-23 01:05:04.000000000 +0200
++++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp	2008-12-09 14:15:14.000000000 +0100
+@@ -516,7 +516,7 @@
+         return *_theme;
+ 
+     KConfigGroup cg(KGlobal::config(), "Icons");
+-    *_theme = cg.readEntry("Theme", defaultThemeName());
++    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
+     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
+ /*    if (_theme->isEmpty())
+     {
+diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp
+--- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp	2008-11-28 16:40:11.000000000 +0100
++++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp	2008-12-09 14:17:51.000000000 +0100
+@@ -831,7 +831,7 @@
+     if (kde_overrideStyle.isEmpty()) {
+         const QString &defaultStyle = KStyle::defaultStyle();
+         const KConfigGroup pConfig(KGlobal::config(), "General");
+-        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
++        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
+ 
+         if (styleStr.isEmpty() ||
+                 // check whether we already use the correct style to return then
+diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg
+--- kdelibs-4.1.82/kutils/kdeglobals.kcfg	2008-05-21 13:08:56.000000000 +0200
++++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg	2008-12-09 14:15:14.000000000 +0100
+@@ -24,6 +24,10 @@
+    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
+    <default>keramik</default>
+   </entry>
++  <entry key="widgetStyle4" type="String" >
++   <label>Widget style to use for KDE 4</label>
++   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
++  </entry>
+   <entry key="windowBackground" type="String" />
+   <entry key="windowForeground" type="String" />
+   <entry key="UseSystemBell" type="Bool" >

kdelibs-4.1.96-AllowExternalPaths.patch

@@ -0,0 +1,117 @@
+diff -up kdelibs-4.1.96/plasma/package.cpp.orig kdelibs-4.1.96/plasma/package.cpp
+--- kdelibs-4.1.96/plasma/package.cpp.orig	2009-01-06 18:27:56.000000000 +0100
++++ kdelibs-4.1.96/plasma/package.cpp	2009-01-16 14:42:39.000000000 +0100
+@@ -139,6 +139,10 @@ QString Package::filePath(const char *fi
+     }
+ 
+     if (QFile::exists(path)) {
++        if (d->structure->allowExternalPaths()) {
++            return path;
++        }
++
+         // ensure that we don't return files outside of our base path
+         // due to symlink or ../ games
+         QDir dir(path);
+@@ -171,6 +175,10 @@ QStringList Package::entryList(const cha
+     QDir dir(d->basePath + d->structure->contentsPrefix() + path);
+ 
+     if (dir.exists()) {
++        if (d->structure->allowExternalPaths()) {
++            return dir.entryList(QDir::Files | QDir::Readable);
++        }
++
+         // ensure that we don't return files outside of our base path
+         // due to symlink or ../ games
+         QString canonicalized = dir.canonicalPath();
+diff -up kdelibs-4.1.96/plasma/packagestructure.cpp.orig kdelibs-4.1.96/plasma/packagestructure.cpp
+--- kdelibs-4.1.96/plasma/packagestructure.cpp.orig	2009-01-16 14:41:56.000000000 +0100
++++ kdelibs-4.1.96/plasma/packagestructure.cpp	2009-01-16 14:42:39.000000000 +0100
+@@ -58,17 +58,19 @@ class ContentStructure
+         QString path;
+         QString name;
+         QStringList mimetypes;
+-        bool directory;
+-        bool required;
++        bool directory : 1;
++        bool required : 1;
+ };
+ 
+ class PackageStructurePrivate
+ {
+ public:
+     PackageStructurePrivate()
+-        : metadata(0)
++        : metadata(0),
++          externalPaths(false)
+     {
+     }
++
+     ~PackageStructurePrivate()
+     {
+         delete metadata;
+@@ -76,6 +78,8 @@ public:
+ 
+     void createPackageMetadata(const QString &path);
+ 
++    static QHash<QString, PackageStructure::Ptr> structures;
++
+     QString type;
+     QString path;
+     QString contentsPrefix;
+@@ -83,8 +87,8 @@ public:
+     QString servicePrefix;
+     QMap<QByteArray, ContentStructure> contents;
+     QStringList mimetypes;
+-    static QHash<QString, PackageStructure::Ptr> structures;
+     PackageMetadata *metadata;
++    bool externalPaths;
+  };
+ 
+ QHash<QString, PackageStructure::Ptr> PackageStructurePrivate::structures;
+@@ -487,6 +491,16 @@ PackageMetadata PackageStructure::metada
+     return *d->metadata;
+ }
+ 
++bool PackageStructure::allowExternalPaths() const
++{
++    return d->externalPaths;
++}
++
++void PackageStructure::setAllowExternalPaths(bool allow)
++{
++    d->externalPaths = allow;
++}
++
+ } // Plasma namespace
+ 
+ #include "packagestructure.moc"
+diff -up kdelibs-4.1.96/plasma/packagestructure.h.orig kdelibs-4.1.96/plasma/packagestructure.h
+--- kdelibs-4.1.96/plasma/packagestructure.h.orig	2009-01-16 14:19:12.000000000 +0100
++++ kdelibs-4.1.96/plasma/packagestructure.h	2009-01-16 14:42:39.000000000 +0100
+@@ -278,6 +278,12 @@ public:
+       */
+     virtual PackageMetadata metadata();
+ 
++    /**
++     * @return true if paths/symlinks outside the package itself should be followed.
++     * By default this is set to false for security reasons.
++     */
++    bool allowExternalPaths() const;
++
+ Q_SIGNALS:
+     /**
+      * Emitted when the new widget browser process completes.
+@@ -286,6 +292,13 @@ Q_SIGNALS:
+ 
+ protected:
+     /**
++     * Sets whether or not external paths/symlinks can be followed by a package
++     * @arg allow true if paths/symlinks outside of the package should be followed,
++     *             false if they should be rejected.
++     */
++    void setAllowExternalPaths(bool allow);
++
++    /**
+      * Sets the prefix that all the contents in this package should
+      * appear under. This defaults to "contents/" and is added automatically
+      * between the base path and the entries as defined by the package

kdelibs-4.1.96-cmake.patch

@@ -0,0 +1,38 @@
+diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
+--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig	2009-01-08 22:14:13.000000000 +0100
++++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake	2009-01-08 22:14:59.000000000 +0100
+@@ -64,9 +64,13 @@
+ # See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in 
+ # for details. Alex
+ 
+-
++set(KDEPIMLIBS_VERSION 4.2.0)
++set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
++if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++   set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
++endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ set(_KdepimLibs_FIND_QUIETLY  ${KdepimLibs_FIND_QUIETLY})
+-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
++find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
+ set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
+ 
+ include(FindPackageHandleStandardArgs)
+diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
+--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig	2009-01-10 21:53:41.000000000 +0100
++++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake	2009-01-10 21:54:03.000000000 +0100
+@@ -62,8 +62,14 @@
+ # for details. Alex
+ 
+ 
++set(KDE4WORKSPACE_VERSION 4.2.0)
++set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
++if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++   set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
++endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++
+ set(_KDE4Workspace_FIND_QUIETLY  ${KDE4Workspace_FIND_QUIETLY})
+-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
++find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
+ set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
+ 
+ include(FindPackageHandleStandardArgs)

kdelibs-4.1.96-parallel_devel.patch

@@ -0,0 +1,210 @@
+diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-01-07 01:13:55.000000000 +0100
++++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake	2009-01-07 22:42:22.000000000 +0100
+@@ -15,10 +15,10 @@
+ # The following variables are defined for the various tools required to
+ # compile KDE software:
+ #
+-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
++#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
+ #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
+ #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
+-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
++#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
+ #
+ # The following variables point to the location of the KDE libraries,
+ # but shouldn't be used directly:
+@@ -131,7 +131,7 @@
+ #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
+ #
+ #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
+-#    Use this to add widget description files for the makekdewidgets code generator
++#    Use this to add widget description files for the makekdewidgets4 code generator
+ #    for Qt Designer plugins.
+ #
+ #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
+@@ -370,23 +370,23 @@ if (_kdeBootStrapping)
+    if (WIN32)
+       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
+       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
+-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
++      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
+ 
+       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
+-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
++      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
+    else (WIN32)
+       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
+-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
++      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
+ 
+       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
+-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
++      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
+    endif (WIN32)
+ 
+    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
+ 
+    # when building kdelibs, make the kcfg rules depend on the binaries...
+-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
++   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
++   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
+    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
+ 
+    set(KDE4_INSTALLED_VERSION_OK TRUE)
+@@ -488,7 +488,8 @@ else (_kdeBootStrapping)
+ 
+    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
+    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
+-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
++   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
++   link_directories("${KDE4_LIB_DIR}")
+    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
+ 
+ 
+@@ -501,12 +502,12 @@ else (_kdeBootStrapping)
+ 
+    # get the build CONFIGURATIONS which were exported in this file, and use just the first
+    # of them to get the location of the installed executables
+-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
++   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
+    list(GET _importedConfigurations 0 _firstConfig)
+ 
+-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig})
++   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig})
+    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${firstConfig})
+-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${firstConfig})
++   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${firstConfig})
+ 
+    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
+    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
+ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
+                               "${KDE4_BIN_INSTALL_DIR}" )
+ 
+-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
++set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
++                              ${CMAKE_SYSTEM_LIBRARY_PATH}
+                               "${KDE4_LIB_INSTALL_DIR}" )
+ 
+ # under Windows dlls may be also installed in bin/
+@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS)
+    endif (NOT _kdeBootStrapping)
+ 
+    if(KDE4_KCFGC_EXECUTABLE)
+-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
++      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+    else(KDE4_KCFGC_EXECUTABLE)
+-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
++      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
+    endif(KDE4_KCFGC_EXECUTABLE)
+ 
+    if(AUTOMOC4_EXECUTABLE)
+@@ -1142,7 +1145,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
+    endif (NOT KDE4_INSTALLED_VERSION_OK)
+ 
+    if (NOT KDE4_KCFGC_EXECUTABLE)
+-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
++     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
+    endif (NOT KDE4_KCFGC_EXECUTABLE)
+ 
+    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
+diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
+--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
++++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh	2009-01-07 22:04:13.000000000 +0100
+@@ -2,9 +2,9 @@
+ # Generates and cleans KConfigXT source code during a API dox build
+ #
+ 
+-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
++kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
+ if test -z "$kcfg_compiler"; then
+-	echo "kconfig_compiler not found!"
++	echo "kconfig_compiler4 not found!"
+ 	exit 1;
+ fi
+ 
+diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl
+--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
++++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-01-07 22:04:13.000000000 +0100
+@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
+ 
+ $kcfgc = $file . "c";
+ 
+-$cmd = "./kconfig_compiler $file $kcfgc";
++$cmd = "./kconfig_compiler4 $file $kcfgc";
+ 
+ #print "CMD $cmd\n";
+ 
+ if ( system( $cmd ) != 0 ) {
+-  print STDERR "Unable to run kconfig_compiler\n";
++  print STDERR "Unable to run kconfig_compiler4\n";
+   exit 1;
+ }
+ 
+diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt
+--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
++++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-01-07 22:44:57.000000000 +0100
+@@ -8,13 +8,13 @@ add_subdirectory( example )
+ set(kconfig_compiler_SRCS kconfig_compiler.cpp)
+ 
+ 
+-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
++kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+ 
+-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
++target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+ 
+ # "export" this target too so we can use the LOCATION property of the imported target in
+ # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
+-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
++install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
+ 
+ ########### install files ###############
+diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
+--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
++++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-01-07 22:04:13.000000000 +0100
+@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
+    add_custom_command(
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
+       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
+-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
++      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
+ 
+ #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
+    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
+diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt
+--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
++++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt	2009-01-07 22:46:30.000000000 +0100
+@@ -14,24 +14,24 @@ include_directories( 
+ set(makekdewidgets_SRCS makekdewidgets.cpp )
+ 
+ 
+-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
++kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+ 
+-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
++target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
+ 
+ # "export" this target too so we can use the LOCATION property of the imported target in
+ # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
+-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
++install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
+ 
+ ########### next target ###############
+ 
+ 
+ # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
+-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
++get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
+ 
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
+   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
++  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
+ 
+ set(kdewidgets_PART_SRCS
+    classpreviews.cpp

kdelibs.spec

@@ -1,13 +1,13 @@
-
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.3
-Release: 6%{?dist}
+Version: 4.2.4
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
+%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}
 %else
 Name: kdelibs4
 %endif
@@ -18,7 +18,7 @@ Name: kdelibs4
 License: LGPLv2
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -28,13 +28,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 
 BuildRequires: kde4-macros(api) >= 2
-BuildRequires: kde-filesystem >= 4
+BuildRequires: kde-filesystem >= 4-23
+# used in kde.(sh|csh)
+Requires: coreutils grep
+# dbus-launch needed here? don't think so, but be safe and keep 
+# for now -- Rex
 Requires: dbus-x11
 Requires: hicolor-icon-theme
-# kdebase-runtime not *strictly* required here, but how better to pull
-# it in?  comps only?
-#Requires: kdebase-runtime
-Requires: kde-filesystem >= 4
+Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
@@ -44,26 +45,23 @@ Requires: kdelibs-common
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
+Requires: phonon%{?_isa} >= 4.3.0
+Requires: soprano%{?_isa} >= 2.2
+Requires: strigi-libs%{?_isa} >= 0.6.3
 
 Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-3.95.0-parallel_devel.patch
+Patch0: kdelibs-4.1.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-3.95.0-kde149705.patch
-# Force Phonon to use the ALSA default device by default
-# This should make it work better with PulseAudio.
-Patch4: kdelibs-3.97.0-alsa-default-device.patch
+Patch2: kdelibs-4.1.82-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
 Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
 # openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
 Patch6: kdelibs-4.0.0-openssl.patch
-# fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
-# (can't talk over D-Bus to an app only supporting DCOP)
-Patch7: kdelibs-4.0.1-dcop-servicetype.patch
 # install all .css files and Doxyfile.global in kdelibs-common to build
 # kdepimlibs-apidocs against
 Patch8: kdelibs-4.0.2-install-all-css.patch
@@ -71,35 +69,40 @@ Patch8: kdelibs-4.0.2-install-all-css.patch
 Patch9: kdelibs-4.0.2-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
-Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
+Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
 # workaround for policykit
-Patch11: kdelibs-4.0.2-policykit-workaround.patch
-Patch12: kdelibs-4.x-xdg-menu.patch
-# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
-Patch13: kdelibs-4.0.3-fedora-buildtype.patch
+Patch11: kdelibs-4.1.72-policykit-workaround.patch
+Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.0.3-libexecdir.patch
+Patch14: kdelibs-4.0.85-libexecdir.patch
+# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
+Patch18: kdelibs-4.1.72-kstandarddirs.patch
+Patch20: kdelibs-4.1.70-cmake.patch
+Patch22: kdelibs-4.1.96-cmake.patch
 
-## upstream patches
-# based on SVN commit 793504 by dfaure
-# Move the umask value out of KConfigPrivate to avoid a crash on exit when ~KConfig calls sync.
-Patch100: kdelibs-4.0.3-kconfig_sync_crash.patch 
-Patch101: kdelibs-4.0.3-klauncher-crash.patch
+# upstream
+# 4.2 branch
 
-BuildRequires: qt4-devel >= 4.3.0
-Requires: qt4 >= %{_qt4_version} 
+# 4.3 branch
+Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
+
+BuildRequires: qt4-devel >= 4.4.0
+# qt4%{_?_isa} isn't provided yet -- Rex
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: alsa-lib-devel
 %if 0%{?fedora} < 9
 # we don't want a hard dependency on aspell on F9+, use enchant only
 BuildRequires: aspell-devel
 %endif
+BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
 BuildRequires: enchant-devel
 BuildRequires: gamin-devel
@@ -117,22 +120,27 @@ BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
+BuildRequires: phonon-devel >= 4.3.0
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 1.99
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel >= 2.2
+BuildRequires: strigi-devel >= 0.6.3
 BuildRequires: zlib-devel
-# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) 
-%define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
+BuildRequires: libutempter-devel
+# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
+%define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
 BuildRequires: openssh-clients
 BuildRequires: subversion
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+Provides: kross(javascript) = %{version}-%{release}
+Provides: kross(qtscript) = %{version}-%{release}
+
 %description
 Libraries for the K Desktop Environment 4.
 
@@ -147,15 +155,20 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
+Requires: cmake >= 2.6.2-3
+Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: bzip2-devel gamin-devel libacl-devel zlib-devel
-Requires: strigi-devel >= 0.5.7
+Requires: phonon-devel
+# do we really still need all these below? -- Rex
+Requires: strigi-devel
+Requires: bzip2-devel gamin-devel libacl-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
 This package includes the header files you will need to compile
@@ -186,35 +199,39 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%patch4 -p1 -b .alsa-default
 %if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
 %else
 # shouldn't be needed f9+, we'll see -- Rex
 %patch6 -p1 -b .openssl
 %endif
-%patch7 -p1 -b .dcop-servicetype
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
-%patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
+%patch18 -p1 -b .kstandarddirs
+%patch20 -p1 -b .xxcmake
+%patch22 -p1 -b .kdepimlibs-cmake
+
+# upstream patches
+# 4.2
+
+# 4.3
+%patch200 -p1 -b .AllowExternalPaths
 
-%patch100 -p1 -b .kconfig_sync_crash
-%patch101 -p1 -b .klauncher-crash
 
 %build
 
 mkdir -p %{_target_platform}
-pushd %{_target_platform} 
+pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 # build apidocs
@@ -228,12 +245,15 @@ doc/api/doxygen.sh .
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# see also use-of/patching of XDG_MENU_PREFIX in kdebase
+# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+# create/own, see http://bugzilla.redhat.com/483318
+mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
+
 %if "%{name}" != "kdelibs"
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
@@ -252,6 +272,7 @@ do
   case "$i" in
     libkdeinit4_*.so)
       ;;
+    ## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex
     *)
       linktarget=`readlink "$i"`
       rm -f "$i"
@@ -264,6 +285,11 @@ popd
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
 
+# fix Sonnet documentation multilib conflict
+bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
+sed -i -e 's!<a name="id[0-9]*"></a>!!g' %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
+bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
+
 # install apidocs and generator script
 install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
 %endif
@@ -275,14 +301,22 @@ cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
-%postun 
+%postun
 /sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    update-desktop-database -q &> /dev/null
+    update-mime-database %{_kde4_datadir}/mime &> /dev/null
+    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %clean
@@ -301,44 +335,51 @@ rm -rf %{buildroot}
 # kdewidgets
 %exclude %{_kde4_bindir}/makekdewidgets4
 %exclude %{_kde4_appsdir}/kdewidgets/
-%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 %exclude %{_kde4_appsdir}/cmake/
-# ksgmltools2
-%exclude %{_kde4_appsdir}/ksgmltools2/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_datadir}/mime/packages/*
+%{_kde4_datadir}/mime/packages/kde.xml
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
-%{_kde4_docdir}/HTML/en/*
+%{_kde4_iconsdir}/hicolor/*/actions/*
+%{_kde4_docdir}/HTML/en/sonnet/
+%{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kconf_update_bin/
 %dir %{_kde4_libdir}/kde4/
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libexecdir}/*
-%dir %{_kde4_libdir}/kde4/plugins/
-%{_kde4_libdir}/kde4/plugins/imageformats/
-%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/plugins/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 %doc %{_mandir}/man*/*
-%if 0%{?apidocs}
-%exclude %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
-%endif
 # kdelibs-common comes from here for fedora >= 9
 %if "%{name}" == "kdelibs"
 %exclude %{_kde4_configdir}/kdebug.areas
 %exclude %{_kde4_configdir}/kdebugrc
 %exclude %{_kde4_configdir}/ui/ui_standards.rc
-%exclude %{_kde4_docdir}/HTML/en/common
+%exclude %{_kde4_appsdir}/kdeui
+%exclude %{_kde4_configdir}/colors/40.colors
+%exclude %{_kde4_configdir}/colors/Rainbow.colors
+%exclude %{_kde4_configdir}/colors/Royal.colors
+%exclude %{_kde4_configdir}/colors/Web.colors
+%exclude %{_kde4_configdir}/ksslcalist
+%exclude %{_kde4_bindir}/preparetips
 
 %files common
 %defattr(-,root,root,-)
+%{_kde4_configdir}/colors/40.colors
+%{_kde4_configdir}/colors/Rainbow.colors
+%{_kde4_configdir}/colors/Royal.colors
+%{_kde4_configdir}/colors/Web.colors
+%{_kde4_configdir}/ksslcalist
+%{_kde4_bindir}/preparetips
 %{_kde4_configdir}/kdebug.areas
 %{_kde4_configdir}/kdebugrc
 %dir %{_kde4_configdir}/ui
 %{_kde4_configdir}/ui/ui_standards.rc
-%{_kde4_docdir}/HTML/en/common
+%{_kde4_appsdir}/kdeui
+%{_kde4_docdir}/HTML/en/common/
 %{_kde4_datadir}/locale/all_languages/
 %endif
 
@@ -350,10 +391,8 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/kde4-doxygen.sh
 %{_kde4_appsdir}/cmake/
 %{_kde4_appsdir}/kdewidgets/
-%{_kde4_appsdir}/ksgmltools2/
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/
-%{_kde4_libdir}/kde4/plugins/designer/
 %endif
 
 %if 0%{?apidocs}
@@ -364,6 +403,407 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun  1 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-2
+- respun tarball
+
+* Sat May 30 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.4-1
+- KDE 4.2.4
+
+* Tue May 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-3
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+
+* Mon May 04 2009 Than Ngo <than@redhat.com> - 4.2.3-2
+- better fix for strcasestr detection
+
+* Sun May 03 2009 Than Ngo <than@redhat.com> - 4.2.3-1
+- 4.2.3
+
+* Tue Apr 28 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-13
+- upstream patch to fix GCC4.4 crashes in kjs
+  (kdebug:189809)
+
+* Fri Apr 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-12
+- drop the PopupApplet configuration backports (#495998) for now, kconf_update
+  does not work as expected for Plasma
+
+* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-11
+- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
+
+* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-10
+- fix the kconf_update scriptlet for #495998 (broken .upd syntax)
+
+* Tue Apr 21 2009 Than Ngo <than@redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
+* Mon Apr 20 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.2.2-8
+- fix Plasma PopupApplet configuration interfering with weather applet (#495998)
+
+* Sun Apr 19 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-7
+- fix and simplify the child struct disposal (kde#180785)
+
+* Sat Apr 18 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-6
+- squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
+
+* Fri Apr 10 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-5
+- fix bidi-related hangs in khtml (kde#189161)
+
+* Wed Apr 08 2009 Than Ngo <than@redhat.com> - 4.2.2-4
+- upstream patch fix ReadOnlyPart crash for non-local file
+
+* Tue Apr 07 2009 Than Ngo <than@redhat.com> - 4.2.2-3
+- fix kickoff focus issue
+
+* Tue Apr 07 2009 Than Ngo <than@redhat.com> - 4.2.2-2
+- upstream patch to fix kio_http issue
+
+* Wed Apr  1 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Mon Mar 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.1-9
+- scriptlet optimization
+
+* Thu Mar 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.1-8
+- Provides: kdelibs4%%{?_isa} ... (#491082)
+
+* Wed Mar 18 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.1-7
+- Provides: kross(javascript) kross(qtscript)  (#490586)
+
+* Thu Mar 12 2009 Than Ngo <than@redhat.com> - 4.2.1-6
+- apply patch to fix encoding for Qt-4.5.0 
+
+* Mon Mar 09 2009 Than Ngo <than@redhat.com> - 4.2.1-5
+- apply patch to fix issue in CSS style that causes konqueror shows a blank page
+
+* Wed Mar 05 2009 Rex Dieter <rdieter@fedorproject.org> - 4.2.1-4 
+- move designer plugins to main/runtime (#487622)
+
+* Sun Mar 01 2009 Than Ngo <than@redhat.com> - 4.2.1-2
+- respin
+
+* Fri Feb 27 2009 Than Ngo <than@redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Thu Feb 26 2009 Than Ngo <than@redhat.com> 4.2.0-17
+- fix build issue against gcc44
+
+* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 4.2.0-16
+- fix files conflicts with 3.5.x
+
+* Tue Feb 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.0-15
+- fix crash in ~KMainWindow triggered by sending messages in KNode (kde#182322)
+
+* Mon Feb 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-14
+- (Build)Req: soprano(-devel) >= 2.2
+- devel: drop Req: zlib-devel libutempter-devel
+
+* Wed Feb 18 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.0-13
+- disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
+
+* Thu Feb 12 2009 Than Ngo <than@redhat.com> - 4.2.0-11
+- make plasma work better with Qt 4.5 (when built against Qt 4.5)
+- add gcc44-workaround
+
+* Fri Feb 06 2009 Than Ngo <than@redhat.com> - 4.2.0-10
+- Fix duplicated applications in the K menu and in keditfiletype
+
+* Thu Feb 05 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-9
+- ssl/proxy patch (kde#179934)
+
+* Sat Jan 31 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-8
+- unowned dirs (#483315,#483318)
+
+* Fri Jan 30 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-7
+- kded/kdirwatch patch (kde#182472)
+
+* Fri Jan 30 2009 Lukáš Tinkl <ltinkl@redhat.com> 4.2.0-6
+- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
+  otherwise it can result in confusion and data loss (overwriting files with files
+  that don't exist). kdebug:118593
+- Fix "klauncher hangs when kdeinit4 dies" -- this happened because
+  klauncher was doing a blocking read forever.
+- Repair klauncher support for unique-applications like konsole.
+  kdebug:162729, kdebug:75492
+
+* Fri Jan 30 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.0-5
+- reenable PolicyKit and NTFS workarounds
+
+* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-4
+- revert Requires: qt4%%{_isa}
+
+* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-3
+- respun tarball
+
+* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-2
+- plasma-on-screensaver-security patch
+- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
+- Requires: strigi-libs >= 0.6.3
+- use %%{?_isa} to avoid potential multilib heartbreak
+
+* Thu Jan 22 2009 Than Ngo <than@redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Than Ngo <than@redhat.com> - 4.1.96-9
+- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
+  since new plasma allows to define default wallpaper, new kde-setting
+  is required
+- backport fix from trunk to allow symlinks in wallpaper theme
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.96-8
+- rebuild for new OpenSSL
+
+* Mon Jan 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-7
+- Slight speedup to profile.d/kde.sh (#465370)
+- (Build)Req: strigi(-devel) >= 0.6.3
+
+* Mon Jan 12 2009 Than Ngo <than@redhat.com> - 4.1.96-6
+- fix a crash (appearing in KSMServer)
+
+* Sat Jan 10 2009 Than Ngo <than@redhat.com> - 4.1.96-5
+- kdeworkspace cmake files in correct place
+
+* Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-4
+- bump min deps (cmake, kde-filesystem, phonon)
+- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling (#477095)
+- Requires: coreutils grep
+
+* Fri Jan 09 2009 Than Ngo <than@redhat.com> - 4.1.96-3
+- BR soprano >= 2.1.64
+
+* Thu Jan 08 2009 Than Ngo <than@redhat.com> - 4.1.96-2
+- kdepim cmake files in correct place
+
+* Wed Jan 07 2009 Than Ngo <than@redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 19 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.85-6
+- add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1
+
+* Tue Dec 16 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.85-5
+- respun tarball, integrates kde-l10n-systemsettings patch
+
+* Tue Dec 16 2008 Than Ngo <than@redhat.com> - 4.1.85-4
+- add missing ENTITY systemsettings in pt, that fixes kde-l10
+  build breakage
+
+* Mon Dec 15 2008 Than Ngo <than@redhat.com> - 4.1.85-3
+- add missing ENTITY systemsettings in ru/gl/es/pt, that fixes kde-l10
+  build breakage
+- rename suffix .xxcmake to avoid install .cmake
+
+* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2
+- tweak parallel_devel patch to get a -L flag for the symlink directory
+
+* Thu Dec 11 2008 Than Ngo <than@redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Tue Dec 09 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.82-2
+- rebase parallel devel patch and kde149705 patch
+
+* Mon Dec 08 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.82-1
+- 4.1.82
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.80-5
+- remove workaround BR on phonon-backend-gstreamer, it's ineffective since
+  phonon now explicitly Requires: phonon-backend-xine and the dependency is no
+  longer circular anyway
+- update parallel_devel patch
+- fix minimum strigi version (only 0.5.9 needed)
+
+* Tue Nov 25 2008 Than Ngo <than@redhat.com> 4.1.80-4
+- respin
+
+* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.80-3
+- -devel: Provides: plasma-devel
+
+* Thu Nov 20 2008 Than Ngo <than@redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR strigi 0.60
+- BR cmake 2.6
+- make install/fast
+- rebase policykit patch
+- rebase cmake patch
+- rebase a couple of patches and drop _default_patch_fuzz 2
+
+* Wed Nov 12 2008 Than Ngo <than@redhat.com> 4.1.3-1
+- 4.1.3
+
+* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-6
+- backport http_cache_cleaner fix (kdebug:172182)
+
+* Wed Oct 15 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.2-5
+- backport fix for faulty window resizing (kdebug:172042)
+
+* Mon Oct 13 2008 Than Ngo <than@redhat.com> 4.1.2-4
+- backport patch to fix crash kded startup crash
+
+* Wed Oct 08 2008 Than Ngo <than@redhat.com> 4.1.2-3
+- backport fix for google maps
+
+* Sun Sep 28 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+
+* Thu Sep 25 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-1
+- kde-4.1.2
+
+* Fri Sep 19 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.1-12
+- make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789)
+
+* Thu Sep 18 2008 Than Ngo <than@redhat.com> 4.1.1-11
+- apply upstream patch to fix the regression
+- drop the kdelibs-4.1.1-bz#461725-regression.patch
+
+* Thu Sep 18 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-10
+- Fix file association bug, the global mimeapps.list file had priority
+  over the local one.
+- khtml scroll crash fix (kdebug:170880)
+- Don't eat text when the emoticons were not installed. This fixes
+  mail text not being displayed in KMail when kdebase-runtime wasn't
+  installed.
+
+* Wed Sep 17 2008 Than Ngo <than@redhat.com> 4.1.1-9
+- #461725, revert the patch to fix the regression
+
+* Sat Sep 13 2008 Than Ngo <than@redhat.com> 4.1.1-8
+- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
+
+* Sat Sep 13 2008 Than Ngo <than@redhat.com> 4.1.1-7
+- remove redundant FEDORA, use CMAKE_BUILD_TYPE=release
+- fix install problem with cmake > 2.5
+
+* Mon Sep 08 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-6
+- fix crashes in plugin selector
+- fix problems in various kdeui widgets
+
+* Wed Sep 03 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.1-5
+- fixed crash on setting cookies on empty domains (like the file
+  system), KDE bug #170147
+- fix URL navigator focus in file dialogs, KDE bug #169497, #170211
+
+* Tue Sep 02 2008 Than Ngo <than@redhat.com> 4.1.1-4
+- apply patch to fix regression in khtml
+
+* Mon Sep 01 2008 Than Ngo <than@redhat.com> 4.1.1-3
+- respun
+
+* Fri Aug 29 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.1-2
+- fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly
+- drop revert-kinit-regression hack (fixes ioslave translations)
+
+* Fri Aug 29 2008 Than Ngo <than@redhat.com> 4.1.1-1
+- 4.1.1
+
+* Fri Aug 29 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.0-9
+- -devel: +Requires: libutempter-devel (cmake wants to link it in)
+
+* Thu Aug 28 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.0-8
+- rewrite kstandarddirs patch to fix side effects (#459904 (KDEDIRS), #457633)
+
+* Mon Aug 25 2008 Than Ngo <than@redhat.com> 4.1.0-7
+- konsole doesn't write to utmp
+
+* Sat Aug 23 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.0-6
+- don't hide KDE 3 KCMs in kde4-applications.menu, not needed with our
+  OnlyShowIn=KDE3 patch and breaks KDE 3 KCMs (kcmshell, apps) in KDE 4 sessions
+
+* Sun Aug 10 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.0-5
+- fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)
+
+* Fri Aug 01 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.0-4
+- -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades)
+- konq processes never terminate (kde#167826, rh#457526)
+
+* Wed Jul 30 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.0-3
+- (Build)Requires: soprano(-devel) >= 2.1 (#456827)
+
+* Thu Jul 24 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.0-2
+- move Sonnet documentation back to the main package
+- fix #341751 (Sonnet documentation multilib conflict) properly
+
+* Wed Jul 23 2008 Than Ngo <than@redhat.com> 4.1.0-1
+- 4.1.0
+
+* Sun Jul 20 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.99-3
+- fix kstandarddirs patch to always append the installed location last, even if
+  it is already present earlier in the search path (#456004)
+
+* Sat Jul 19 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.99-2
+- use better fedora-buildtype patch from F-9 branch
+
+* Fri Jul 18 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.99-1
+- 4.0.99
+
+* Mon Jul 14 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.98-4
+- respun tarball
+
+* Sat Jul 12 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.98-2
+- revert a kinit patch causing an assertion failure in KComponentData (#455130)
+
+* Thu Jul 10 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.98-1
+- 4.0.98
+- omit proxy patch (fixed upstream)
+
+* Sun Jul 06 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.85-1
+- 4.0.85
+
+* Fri Jun 27 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.84-1
+- 4.0.84
+
+* Fri Jun 27 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.83-3
+- fix kstandarddirs patch so /usr/libexec/kde4 is found (#453063)
+
+* Wed Jun 25 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.83-2
+- -common: move %{_kde4_docdir}/HTML/en/sonnet/ here (#341751)
+
+* Thu Jun 19 2008 Than Ngo <than@redhat.com> 4.0.83-1
+- 4.0.83 (beta2)
+
+* Fri Jun 13 2008 Than Ngo <than@redhat.com> 4.0.82-1
+- 4.0.82
+
+* Fri May 30 2008 Than Ngo <than@redhat.com> 4.0.80-2
+- fix #447965, order issue in kde path, thanks to Kevin
+- backport patch to check html style version
+
+* Mon May 26 2008 Than Ngo <than@redhat.com> 4.0.80-1
+- 4.1 beta1
+
+* Sat May 24 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.72-8
+- revert previous, don't include kde3-compat symlink (here, anyway)
+
+* Fri May 23 2008 Rex Dieter <rdieter@fedoraproejct.org> - 4.0.72-7
+- -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965)
+
+* Thu May 22 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.72-6
+- kstandarddirs hack to search /etc/kde
+
+* Thu May 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-5
+- keep libphonon.so in %%{_libdir} for non-KDE apps (#447831)
+
+* Thu May 15 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-4
+- fix proxy support (#443931, kde#155707)
+- move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)
+
+* Tue May 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-3
+- drop no longer needed ALSA default device Phonon hack
+
+* Sun May  4 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-2
+- BR new minimum versions of qt4-devel and soprano-devel
+
+* Fri May  2 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-1
+- update to 4.0.72 (4.1 alpha 1)
+- parallel_devel patch ported by Lorenzo Villani <lvillani@binaryhelix.net>
+- update file list (Lorenzo Villani)
+- drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches
+- update xdg-menu (Administration menu) patch
+
+* Tue Apr 22 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.3-7
+- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1,
+  #443766: CVE-2008-1670)
+
 * Fri Apr 04 2008 Than Ngo <than@redhat.com> -  4.0.3-6
 - apply upstream patch to fix klauncher crash
 - fix kconfig_sync_crash patch
@@ -643,7 +1083,7 @@ rm -rf %{buildroot}
 
 * Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
 - kde-3.91.0
-- CMAKE_BUILD_TYPE=debug 
+- CMAKE_BUILD_TYPE=debug
 
 * Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
 - specfile cleanup (%%prefix issues mostly)

sources

@@ -1 +1 @@
-7ac2cb9fb2eb24ea6b9d4babfb906101  kdelibs-4.0.3.tar.bz2
+9ed29086c33bc73256a7fa5268df560b  kdelibs-4.2.4.tar.bz2