dist-git conversion

Fix typo that causes a failure to update the common directory. (releng #2781 )
soprano_ver 2.3.0 here
2010-07-29 06:59:12 +00:00 · 2009-11-26 01:21:25 +00:00 · 2009-11-14 15:51:23 +00:00 · 2009-11-14 15:35:38 +00:00 · 2009-11-14 15:32:45 +00:00 · 2009-11-09 13:48:31 +00:00
27 changed files with 1487 additions and 655 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-kdelibs-4.1.2.tar.bz2
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+kdelibs-4.3.3.tar.bz2
--- a/2
+++ b/2
@ -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))
--- a/1
+++ b/1
@ -0,0 +1 @@
+F-10
--- a/kde4.csh
+++ b/kde4.csh
@ -10,9 +10,5 @@ if ( -f /etc/sysconfig/prelink ) then
   if ( "$PRELINKING" == "yes" )  then
     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
   endif
-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
+   unset PRELINKING
 endif
--- a/kde4.sh
+++ b/kde4.sh
@ -5,13 +5,7 @@
 [ -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
-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
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
--- a/kdelibs-3.95.0-kde149705.patch
+++ b/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())
-     {
--- a/kdelibs-4.1.0-parallel_devel.patch
+++ b/kdelibs-4.1.0-parallel_devel.patch
@ -1,281 +0,0 @@
-diff -up kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2008-07-23 10:26:30.000000000 +0200
-+++ kdelibs-4.1.0/cmake/modules/FindKDE4Internal.cmake	2008-07-23 18:11:28.000000000 +0200
-@@ -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:
-@@ -124,7 +124,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)
-@@ -307,23 +307,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)
-@@ -372,69 +372,69 @@ else (_kdeBootStrapping)
-    include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
- 
-    if (UNIX)
-      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} )
-    endif (UNIX)
- 
-   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_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-+   find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
-    set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_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_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.
-@@ -453,14 +453,14 @@ 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_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)
-@@ -708,7 +708,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" )
-@@ -1108,9 +1109,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(AUTOMOC4_EXECUTABLE)
-diff -up kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
-+++ kdelibs-4.1.0/doc/api/doxygen-preprocess-kcfg.sh	2008-07-23 18:01:48.000000000 +0200
-@@ -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.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
-+++ kdelibs-4.1.0/kdecore/kconfig_compiler/checkkcfg.pl	2008-07-23 18:01:48.000000000 +0200
-@@ -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.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:09:13.000000000 +0200
-+++ kdelibs-4.1.0/kdecore/kconfig_compiler/CMakeLists.txt	2008-07-23 18:01:48.000000000 +0200
-@@ -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-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
-+++ kdelibs-4.1.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2008-07-23 18:01:48.000000000 +0200
-@@ -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.0/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.0/kdewidgets/CMakeLists.txt
--- kdelibs-4.1.0/kdewidgets/CMakeLists.txt.parallel_devel	2008-05-21 13:08:17.000000000 +0200
-+++ kdelibs-4.1.0/kdewidgets/CMakeLists.txt	2008-07-23 18:01:48.000000000 +0200
-@@ -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
--- a/kdelibs-4.1.1-cmake.patch
+++ b/kdelibs-4.1.1-cmake.patch
@ -1,34 +0,0 @@
-diff -up kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig	2008-09-12 23:54:36.000000000 +0200
-+++ kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake	2008-09-13 00:02:50.000000000 +0200
-@@ -745,6 +745,7 @@ endif(WIN32)
- # 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)
- 
- 
-@@ -953,10 +954,6 @@ endif(MSVC)
- 
- 
- if (CMAKE_COMPILER_IS_GNUCXX)
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
-    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
-    # Select flags.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-@@ -1063,11 +1060,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
- 
- 
- if (CMAKE_C_COMPILER MATCHES "icc")
-
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
-    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
-    # Select flags.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
--- a/kdelibs-4.1.1-kdeui-widgets-fixes.patch
+++ b/kdelibs-4.1.1-kdeui-widgets-fixes.patch
@ -1,121 +0,0 @@
-Index: kdeui/widgets/krichtextedit.cpp
-===================================================================
--- kdeui/widgets/krichtextedit.cpp	(revision 857817)
-+++ kdeui/widgets/krichtextedit.cpp	(revision 857818)
-@@ -492,7 +492,7 @@
-     static QString evilline = "<p style=\" margin-top:0px; margin-bottom:0px; "
-                       "margin-left:0px; margin-right:0px; -qt-block-indent:0; "
-                       "text-indent:0px; -qt-user-state:0;\">";
-        
-+
-     QString result;
-     QStringList lines = toHtml().split("\n");
-     foreach(QString tempLine, lines ) {
-@@ -507,6 +507,33 @@
-             result += tempLine;
-         }
-     }
-+
-+    // ### HACK to fix bug 86925: A completely empty line is ignored in HTML-mode
-+    int offset = 0;
-+    QRegExp paragraphFinder("<p.*>(.*)</p>");
-+    QRegExp paragraphEnd("</p>");
-+    paragraphFinder.setMinimal(true);
-+
-+    while (offset != -1) {
-+
-+        // Find the next paragraph
-+        offset = paragraphFinder.indexIn(result, offset);
-+
-+        if (offset != -1) {
-+
-+            // If the text in the paragraph is empty, add a &nbsp there.
-+            if (paragraphFinder.capturedTexts().size() == 2 &&
-+                paragraphFinder.capturedTexts()[1].isEmpty()) {
-+                int end = paragraphEnd.indexIn(result, offset);
-+                Q_ASSERT(end != -1 && end > offset);
-+                result.replace(end, paragraphEnd.pattern().length(), "<br></p>");
-+            }
-+
-+            // Avoid finding the same match again
-+            offset++;
-+        }
-+    }
-+
-     return result;
- }
- 
-Index: kdeui/fonts/kfontchooser.cpp
-===================================================================
--- kdeui/fonts/kfontchooser.cpp	(revision 858147)
-+++ kdeui/fonts/kfontchooser.cpp	(revision 858148)
-@@ -444,6 +444,10 @@
-     QPalette pal = d->sampleEdit->palette();
-     pal.setColor( QPalette::Active, QPalette::Text, col );
-     d->sampleEdit->setPalette( pal );
-+    QTextCursor cursor = d->sampleEdit->textCursor();
-+    d->sampleEdit->selectAll();
-+    d->sampleEdit->setTextColor( col );
-+    d->sampleEdit->setTextCursor( cursor );
- }
- 
- QColor KFontChooser::color() const
-Index: kdeui/widgets/khelpmenu.cpp
-===================================================================
--- kdeui/widgets/khelpmenu.cpp	(revision 858312)
-+++ kdeui/widgets/khelpmenu.cpp	(revision 858313)
-@@ -162,6 +162,7 @@
-       d->mWhatsThisAction = new KAction(KIcon("help-contextual"), i18n( "What's &This" ), d->mMenu);
-       d->mWhatsThisAction->setShortcut(Qt::SHIFT + Qt::Key_F1);
-       connect(d->mWhatsThisAction, SIGNAL(triggered(bool)), this, SLOT(contextHelpActivated()));
-+      d->mMenu->addAction(d->mWhatsThisAction);
-       need_separator = true;
-     }
-
-Index: kdeui/widgets/ktabwidget.cpp
-===================================================================
--- kdeui/widgets/ktabwidget.cpp	(Revision 858490)
-+++ kdeui/widgets/ktabwidget.cpp	(Revision 858491)
-@@ -281,14 +281,22 @@
- 
- QString KTabWidget::tabText( int index ) const
- {
-  if ( d->m_automaticResizeTabs ) {
-    if ( index >= 0 && index < count() )
-      return d->m_tabNames[ index ];
-+    if ( d->m_automaticResizeTabs ) {
-+        if (index >= 0 && index < count()) {
-+            if (index >= d->m_tabNames.count()) {
-+                // Ooops, the tab exists, but tabInserted wasn't called yet.
-+                // This can happen when inserting the first tab,
-+                // and calling tabText from slotCurrentChanged,
-+                // see KTabWidget_UnitTest.
-+                const_cast<KTabWidget*>(this)->tabInserted(index);
-+            }
-+            return d->m_tabNames[ index ];
-+        }
-+        else
-+            return QString();
-+    }
-     else
-      return QString();
-  }
-  else
-    return QTabWidget::tabText( index );
-+        return QTabWidget::tabText( index );
- }
- 
- void KTabWidget::setTabText( int index, const QString &text )
-Index: kdeui/widgets/ktabwidget.h
-===================================================================
--- kdeui/widgets/ktabwidget.h	(Revision 858490)
-+++ kdeui/widgets/ktabwidget.h	(Revision 858491)
-@@ -187,7 +187,7 @@
-      * Removes the widget, reimplemented for
-      * internal reasons (keeping labels in sync).
-      */
-    virtual void removeTab(int index);
-+    virtual void removeTab(int index); // but it's not virtual in QTabWidget...
- 
-     /**
-      * If \a enable is true, tab reordering with middle button will be enabled.
--- a/kdelibs-4.1.70-cmake.patch
+++ b/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)
+ 
+ 
--- a/kdelibs-4.1.72-kstandarddirs.patch
+++ b/kdelibs-4.1.72-kstandarddirs.patch
@ -1,7 +1,7 @@
-diff -ur kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.0-kstandarddirs/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp	2008-07-09 15:28:22.000000000 +0200
-+++ kdelibs-4.1.0-kstandarddirs/kdecore/kernel/kstandarddirs.cpp	2008-08-29 00:07:51.000000000 +0200
-@@ -996,7 +996,9 @@
+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)
             {
@ -10,9 +10,9 @@ diff -ur kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.0-kstandardd
 +                // a false positive due to the libexecdir patch
 +	        if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
 	        {
-                     for (QStringList::ConstIterator it = dirs.begin();
-                          it != dirs.end(); ++it)
-@@ -1010,6 +1012,11 @@
+                     for (QStringList::ConstIterator it = dirs.constBegin();
+                          it != dirs.constEnd(); ++it)
+@@ -1016,6 +1018,11 @@
                         if ((local || testdir.exists()) && !candidates.contains(path))
                             candidates.append(path);
                     }
--- a/kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
+++ b/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;
--- a/kdelibs-4.1.72-policykit-workaround.patch
+++ b/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>
--- a/kdelibs-4.2.85-kde149705.patch
+++ b/kdelibs-4.2.85-kde149705.patch
@ -0,0 +1,38 @@
+diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
+--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705	2009-04-15 12:26:44.000000000 +0200
+++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp	2009-05-11 16:01:29.000000000 +0200
+@@ -525,7 +525,7 @@ QString KIconTheme::current()
+     }
+ 
+     KConfigGroup cg(KGlobal::config(), "Icons");
+-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
+     if ( *_theme == QLatin1String("hicolor") ) {
+         *_theme = defaultThemeName();
+     }
+diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
+--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705	2009-03-27 15:47:33.000000000 +0100
+++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp	2009-05-11 16:00:06.000000000 +0200
+@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
+     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 -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
+--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705	2009-04-15 12:26:45.000000000 +0200
+++ kdelibs-4.2.85/kutils/kdeglobals.kcfg	2009-05-11 16:00:06.000000000 +0200
+@@ -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" >
--- a/kdelibs-4.2.85-libexecdir.patch
+++ b/kdelibs-4.2.85-libexecdir.patch
@ -1,7 +1,7 @@
-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()
+diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
+--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir	2009-05-06 05:14:38.000000000 -0500
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp	2009-05-14 11:34:04.732889142 -0500
+@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
         addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
         index+=2;
     }
@ -9,10 +9,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.
 +    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
+ 
+diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
+--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir	2008-05-21 06:08:57.000000000 -0500
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
             if (strcmp("lib", type) == 0)
                 return QString::fromLatin1(LIB_INSTALL_DIR "/");
@ -22,10 +22,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs
             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
+diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
+--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir	2009-02-27 06:31:32.000000000 -0600
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp	2009-05-14 11:30:40.737623244 -0500
+@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
 #define KIOSLAVE "bin/kioslave.exe"
 #else
 #define EXT ""
@ -36,7 +36,7 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
     const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
     QVERIFY( !bin.isEmpty() );
     QVERIFY( bin.endsWith( KIOSLAVE ) );
-@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe()
+@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
     // findExe with a result in libexec
     const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
     QVERIFY( !lnusertemp.isEmpty() );
@ -45,9 +45,9 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
 #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
+diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
+--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir	2008-05-21 06:08:08.000000000 -0500
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp	2009-05-14 11:30:40.737623244 -0500
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
     if (kmailservice.isEmpty()) kmailservice = "kmailservice";
     if (!kdeinit.isEmpty()) {
--- a/kdelibs-4.2.96-parallel_devel.patch
+++ b/kdelibs-4.2.96-parallel_devel.patch
@ -0,0 +1,219 @@
+diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-07-08 16:41:09.000000000 +0200
+++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake	2009-07-13 16:32:48.000000000 +0200
+@@ -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:
+@@ -129,7 +129,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)
+@@ -383,23 +383,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)
+@@ -497,7 +497,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} )
+ 
+ 
+@@ -510,12 +511,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)
+@@ -782,7 +783,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/
+@@ -1166,9 +1168,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)
+@@ -1187,7 +1189,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.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
+--- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh	2009-07-13 16:26:04.000000000 +0200
+@@ -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.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
+--- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-07-13 16:26:04.000000000 +0200
+@@ -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.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt
+--- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
+@@ -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.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
+--- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
+@@ -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.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt
+--- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt	2009-07-13 16:26:04.000000000 +0200
+@@ -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
+@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
+ 
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
+      COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
+-     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
+     MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
+ 
+    set(kde3supportwidgets_PART_SRCS
+       classpreviews.cpp
--- a/kdelibs-4.3.0-bookmarks.patch
+++ b/kdelibs-4.3.0-bookmarks.patch
@ -0,0 +1,16 @@
+diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
+--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc	2008-07-08 05:54:18.000000000 -0400
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc	2009-08-28 15:09:07.000000000 -0400
+@@ -681,11 +681,11 @@
+         doc.setContent( payload );
+         QDomElement elem = doc.documentElement();
+         QDomNodeList children = elem.childNodes();
+         for ( int childno = 0; childno < children.count(); childno++)
+         {
+-            bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
+            bookmarks.append( KBookmark( children.item(childno).toElement() ));
+         }
+         return bookmarks;
+     }
+     const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
+     if ( !urls.isEmpty() )
--- a/kdelibs-4.3.1-CVE-2009-2702.patch
+++ b/kdelibs-4.3.1-CVE-2009-2702.patch
@ -0,0 +1,69 @@
+diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp kdelibs-4.3.1/kio/kssl/kopenssl.cpp
+--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.cpp	2008-10-23 01:05:00.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-04 14:09:22.000000000 +0200
+@@ -196,6 +196,7 @@
+ static X509_NAME *(*K_X509_NAME_new)() = 0L;
+ static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
+ static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
+ static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
+ 
+ #endif
+@@ -530,6 +531,7 @@
+       K_X509_NAME_new = (X509_NAME *(*)()) d->cryptoLib->resolveFunction("X509_NAME_new");
+       K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) d->cryptoLib->resolveFunction("X509_REQ_set_subject_name");
+       K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_data");
+      K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) d->cryptoLib->resolveFunction("ASN1_STRING_length");
+ #endif
+    }
+ 
+@@ -1577,6 +1579,13 @@
+    return 0L;
+ }
+ 
+
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
+   if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
+   return 0L;
+}
+
+
+ STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
+   if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
+   return 0L;
+diff -Nur kdelibs-4.3.1.orig/kio/kssl/kopenssl.h kdelibs-4.3.1/kio/kssl/kopenssl.h
+--- kdelibs-4.3.1.orig/kio/kssl/kopenssl.h	2009-05-19 14:06:53.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-04 14:09:22.000000000 +0200
+@@ -589,13 +589,17 @@
+     */
+    void ASN1_INTEGER_free(ASN1_INTEGER *x);
+ 
+-
+    /*
+     *  ASN1_STRING_data
+     */
+    unsigned char *ASN1_STRING_data(ASN1_STRING *x);
+ 
+    /*
+    * ASN1_STRING_length
+    */
+   int ASN1_STRING_length(ASN1_STRING *x);
+
+   /*
+     *
+     */
+    int OBJ_obj2nid(ASN1_OBJECT *o);
+diff -Nur kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp
+--- kdelibs-4.3.1.orig/kio/kssl/ksslcertificate.cpp	2009-01-16 16:07:05.000000000 +0100
+++ kdelibs-4.3.1/kio/kssl/ksslcertificate.cpp	2009-09-04 14:09:22.000000000 +0200
+@@ -1305,7 +1305,9 @@
+         }
+ 
+         QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
+-        if (!s.isEmpty()) {
+        if (!s.isEmpty()  &&
+                /* skip subjectAltNames with embedded NULs */
+                s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
+             rc += s;
+         }
+     }
--- a/kdelibs-4.3.1-drkonq.patch
+++ b/kdelibs-4.3.1-drkonq.patch
@ -0,0 +1,12 @@
+diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
+--- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig	2009-09-21 17:42:19.000000000 +0200
+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp	2009-09-21 17:43:44.000000000 +0200
+@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
+ static char *s_appPath = 0;
+ static char *s_drkonqiPath = 0;
+ static KCrash::CrashFlags s_flags = 0;
+-static bool s_launchDrKonqi = true;
+static bool s_launchDrKonqi = false;
+ 
+ namespace KCrash
+ {
--- a/kdelibs-4.3.1-ossl-1.x.patch
+++ b/kdelibs-4.3.1-ossl-1.x.patch
@ -0,0 +1,61 @@
+diff -up kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig kdelibs-4.3.1/kio/kssl/kopenssl.cpp
+--- kdelibs-4.3.1/kio/kssl/kopenssl.cpp.orig	2009-09-01 21:58:06.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.cpp	2009-09-01 22:08:16.000000000 +0200
+@@ -622,7 +622,7 @@ KOpenSSLProxy::KOpenSSLProxy()
+       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
+       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
+       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
+-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
+ #endif
+ 
+ 
+diff -up kdelibs-4.3.1/kio/kssl/kopenssl.h.orig kdelibs-4.3.1/kio/kssl/kopenssl.h
+--- kdelibs-4.3.1/kio/kssl/kopenssl.h.orig	2009-09-01 21:58:31.000000000 +0200
+++ kdelibs-4.3.1/kio/kssl/kopenssl.h	2009-09-01 22:48:44.000000000 +0200
+@@ -44,6 +44,14 @@ class KOpenSSLProxyPrivate;
+ #include <openssl/stack.h>
+ #include <openssl/bn.h>
+ #undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#define OSSL_SKVALUE_RTYPE void
+#define OSSL_MORECONST const
+#else
+#define OSSL_SKVALUE_RTYPE char
+#define OSSL_MORECONST
+#endif
+ #endif
+ 
+ /**
+@@ -505,6 +513,9 @@ public:
+     */
+    void sk_free(STACK *s);
+ 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
+ 
+    /*
+     *  Number of elements in the stack
+@@ -517,6 +528,9 @@ public:
+     */
+    char *sk_value(STACK *s, int n);
+ 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
+ 
+    /*
+     *  Create a new stack
+@@ -529,6 +543,10 @@ public:
+     */
+    int sk_push(STACK *s, char *d);
+ 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
+
+ 
+    /*
+     *  Duplicate the stack
--- a/kdelibs-4.3.3-adFilteredBy.patch
+++ b/kdelibs-4.3.3-adFilteredBy.patch
@ -0,0 +1,156 @@
+Index: khtml/khtml_settings.h
+===================================================================
+--- khtml/khtml_settings.h	(revision 1027233)
+++ khtml/khtml_settings.h	(revision 1027234)
+@@ -186,7 +186,23 @@
+     bool isPluginsEnabled( const QString& hostname = QString() ) const;
+ 
+     // AdBlocK Filtering
+
+    /** tests whether @p url is filtered.
+     * @param url the URL to test.
+     * @return @c true if the URL is blacklisted and is not whitelisted.
+     */
+     bool isAdFiltered( const QString &url ) const;
+
+    /** identify the filter which matches @p url.
+     * @param url the URL to test.
+     * @param isWhiteListed if not @c NULL, set to @c true if the URL matched
+     * a whitelist filter; set to @c false if it matched a blacklist filter.
+     * @return the filter string that matched,
+     * or @c QString() if no filter matched.
+     * @since 4.4
+    */
+    QString adFilteredBy( const QString &url, bool *isWhiteListed = 0 ) const;
+
+     bool isAdFilterEnabled() const;
+     bool isHideAdsEnabled() const;
+     void addAdFilter( const QString &url );
+Index: khtml/khtml_filter_p.h
+===================================================================
+--- khtml/khtml_filter_p.h	(revision 1027233)
+++ khtml/khtml_filter_p.h	(revision 1027234)
+@@ -35,8 +35,9 @@
+     // add filter to matching set
+     void addString(const QString& pattern);
+ 
+-    // check if string match at least one string from matching set
+-    bool isMatched(const QString& str) const;
+    // check if string matches at least one string from matching set,
+    // optionally return the matching string or filter
+    bool isMatched(const QString& str, QString *by = 0) const;
+ 
+     // add filter to matching set with wildcards (*,?) in it
+     void addWildedString(const QString& prefix, const QRegExp& rx);
+@@ -60,9 +61,10 @@
+     // Parses and registers a filter. This will also strip @@ for exclusion rules, skip comments, etc.
+     // The user does have to split black and white lists into separate sets, however
+     void addFilter(const QString& filter);
+-    
+
+     bool isUrlMatched(const QString& url);
+-    
+    QString urlMatchedBy(const QString& url);
+
+     void clear();
+ 
+ private:
+Index: khtml/khtml_settings.cpp
+===================================================================
+--- khtml/khtml_settings.cpp	(revision 1027233)
+++ khtml/khtml_settings.cpp	(revision 1027234)
+@@ -743,6 +743,27 @@
+     return false;
+ }
+ 
+QString KHTMLSettings::adFilteredBy( const QString &url, bool *isWhiteListed ) const
+{
+    QString m = d->adWhiteList.urlMatchedBy(url);
+    if (!m.isEmpty())
+    {
+        if (isWhiteListed != 0)
+            *isWhiteListed = true;
+        return (m);
+    }
+
+    m = d->adBlackList.urlMatchedBy(url);
+    if (!m.isEmpty())
+    {
+        if (isWhiteListed != 0)
+            *isWhiteListed = false;
+        return (m);
+    }
+
+    return (QString());
+}
+
+ void KHTMLSettings::addAdFilter( const QString &url )
+ {
+     KConfigGroup config = KSharedConfig::openConfig( "khtmlrc", KConfig::NoGlobals )->group( "Filter Settings" );
+Index: khtml/khtml_filter.cpp
+===================================================================
+--- khtml/khtml_filter.cpp	(revision 1027233)
+++ khtml/khtml_filter.cpp	(revision 1027234)
+@@ -133,6 +133,25 @@
+     return false;
+ }
+ 
+QString FilterSet::urlMatchedBy(const QString& url)
+{
+    QString by;
+
+    if (stringFiltersMatcher.isMatched(url, &by))
+        return by;
+
+    for (int c = 0; c < reFilters.size(); ++c)
+    {
+        if (url.contains(reFilters[c]))
+        {
+            by = reFilters[c].pattern();
+            break;
+        }
+    }
+
+    return by;
+}
+
+ void FilterSet::clear()
+ {
+     reFilters.clear();
+@@ -196,12 +215,15 @@
+     }
+ }
+ 
+-bool StringsMatcher::isMatched(const QString& str) const
+bool StringsMatcher::isMatched(const QString& str, QString *by) const
+ {
+     // check short strings first
+     for (int i = 0; i < shortStringFilters.size(); ++i) {
+         if (str.contains(shortStringFilters[i]))
+        {
+            if (by != 0) *by = shortStringFilters[i];
+             return true;
+        }
+     }
+ 
+     int len = str.length();
+@@ -235,13 +257,19 @@
+                 if (index >= 0) {
+                     int flen = stringFilters[index].length();
+                     if (k - flen + 1 >= 0 && stringFilters[index] == str.midRef(k - flen + 1 , flen))
+                    {
+                        if (by != 0) *by = stringFilters[index];
+                         return true;
+                    }
+                 } else {
+                     index = -index - 1;
+                     int flen = rePrefixes[index].length();
+                     if (k - 8 + flen < len && rePrefixes[index] == str.midRef(k - 7, flen) &&
+                             str.indexOf(reFilters[index], k - 7 + flen) == k - 7 + flen)
+                    {
+                        if (by != 0) *by = rePrefixes[index]+reFilters[index].pattern();
+                         return true;
+                    }
+                 }
+             }
+         }
--- a/kdelibs-4.3.3-fix-kdefakes-build.patch
+++ b/kdelibs-4.3.3-fix-kdefakes-build.patch
@ -0,0 +1,21 @@
+diff -ur kdelibs-4.3.3/kdecore/fakes.c kdelibs-4.3.3-fix-kdefakes-build/kdecore/fakes.c
+--- kdelibs-4.3.3/kdecore/fakes.c	2008-05-21 13:09:15.000000000 +0200
+++ kdelibs-4.3.3-fix-kdefakes-build/kdecore/fakes.c	2009-11-06 01:47:27.000000000 +0100
+@@ -313,6 +313,8 @@
+ #endif /* !HAVE_MKDTEMP */
+ 
+ #ifndef HAVE_STRLCPY
+#include <string.h>
+
+ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
+ {
+     unsigned long len, ret = strlen(s);
+@@ -331,6 +333,8 @@
+ #endif
+ 
+ #ifndef HAVE_STRLCAT
+#include <string.h>
+
+ KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
+ {
+     char *cp;
--- a/kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
+++ b/kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
@ -0,0 +1,11 @@
+diff -up kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames kdelibs-4.3.3/khtml/CMakeLists.txt
+--- kdelibs-4.3.3/khtml/CMakeLists.txt.SVGNames	2009-08-27 03:19:09.000000000 -0500
+++ kdelibs-4.3.3/khtml/CMakeLists.txt	2009-11-13 17:43:07.618002091 -0600
+@@ -194,6 +194,7 @@ set(khtmldom_STAT_SRCS
+ )
+ 
+ #set_source_files_properties(${khtmldom_STAT_SRCS} PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
+set_source_files_properties(${khtmlsvg_STAT_SRCS} PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments )
+ 
+ # khtml/misc/Makefile.am: khtmlmisc
+ 
--- a/kdelibs.spec
+++ b/kdelibs.spec
@ -1,25 +1,26 @@
-%define _default_patch_fuzz 2
+%define phonon_ver 4.3.1
+%define soprano_ver 2.3.0
+%define strigi_ver 0.7
+
+%if 0%{?fedora} > 11
+%define soprano_ver 2.3.1
+%endif

 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.2
-Release: 2%{?dist}
+Version: 4.3.3
+Release: 4%{?dist}

-%if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
 Provides:  kdelibs4 = %{version}-%{release}
-%else
-Name: kdelibs4
-%endif
+%{?_isa:Provides: kdelibs4%{?_isa} = %{version}-%{release}}

-# LGPLv2: everything, except (see below)
-# BSD: kdoctools/
-# GFDL: kdoctools/customization ?
-License: LGPLv2
+# http://techbase.kde.org/Policies/Licensing_Policy
+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
@ -29,31 +30,30 @@ 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
-%if "%{name}" == "kdelibs"
 Requires: kdelibs-common
-%endif
-%if 0%{?fedora} >= 9
 Requires: hunspell
-%endif
-Requires: soprano >= 2.1
+Requires: phonon%{?_isa} >= %{phonon_ver} 
+Requires: soprano%{?_isa} >= %{soprano_ver} 
+Requires: strigi-libs%{?_isa} >= %{strigi_ver} 

 Source1: kde4.sh
 Source2: kde4.csh

 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.0-parallel_devel.patch
+Patch0: kdelibs-4.2.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-3.95.0-kde149705.patch
+Patch2: kdelibs-4.2.85-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@ -67,33 +67,47 @@ 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
+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.85-libexecdir.patch
+Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
-Patch18: kdelibs-4.1.0-kstandarddirs.patch
-Patch20: kdelibs-4.1.1-cmake.patch
+Patch18: kdelibs-4.1.72-kstandarddirs.patch
+Patch20: kdelibs-4.1.70-cmake.patch
+Patch21: kdelibs-4.3.1-ossl-1.x.patch
+# patch to fix keditbookmarks crash (kde#160679)
+Patch22: kdelibs-4.3.0-bookmarks.patch
+Patch24: kdelibs-4.3.1-drkonq.patch
+# fix build of fakes.c due to missing #include <string.h>
+Patch25: kdelibs-4.3.3-fix-kdefakes-build.patch
+# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
+Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch

-## upstream patches
+# upstream
+# kubuntu working to upstream this
+Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
+# 4.4 trunk
+# http://websvn.kde.org/?view=revision&revision=1027234
+# add adFilteredBy API required for konq-plugins-4.3.3 to build
+Patch100: kdelibs-4.3.3-adFilteredBy.patch

-BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4 >= %{_qt4_version} 
+# security fix
+Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
+
+BuildRequires: qt4-devel >= 4.5.0
+Requires: qt4%{?_isa} >= %{_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: automoc
+BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
+BuildRequires: bison flex
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
 BuildRequires: enchant-devel
 BuildRequires: gamin-devel
@ -108,19 +122,18 @@ BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libutempter-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-# work around circular dependency from phonon-devel pulling in phonon-backend-xine
-BuildRequires: phonon-backend-gstreamer
-BuildRequires: phonon-devel >= 4.2
+BuildRequires: phonon-devel >= %{phonon_ver} 
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.1
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel >= %{soprano_ver} 
+BuildRequires: strigi-devel >= %{strigi_ver} 
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
-BuildRequires: libutempter-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
+# 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
@ -131,31 +144,36 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif

+Provides: kross(javascript) = %{version}-%{release}
+Provides: kross(qtscript) = %{version}-%{release}
+
 %description
 Libraries for the K Desktop Environment 4.

-%if "%{name}" == "kdelibs"
 %package common
 Group: System Environment/Libraries
 Summary: Common files for KDE 3 and KDE 4 libraries
 %description common
 This package includes the common files for the KDE 3 and KDE 4 libraries.
-%endif

 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+# stuff moved, help upgrade path
+Conflicts: kdebase-runtime < 4.2.90
+Conflicts: kdebase-workspace-devel < 4.2.90
+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: automoc
+Requires: cmake >= 2.6.2-3
+Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2
+Requires: phonon-devel
+# do we really still need all these below? -- Rex
 Requires: strigi-devel
-Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-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
@ -167,14 +185,7 @@ Summary: KDE 4 API documentation
 # Not strictly required -- Rex
 # Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 Requires: kde-filesystem
-%if "%{name}" != "kdelibs4"
 Provides: kdelibs4-apidocs = %{version}-%{release}
-#else
-# Don't do that for now, we'd need to make sure all Requires: kdelibs-apidocs
-# (in kdevelop etc.) are fixed to kdelibs3-apidocs first and it may not be
-# worth it anyway.
-#Provides: kdelibs-apidocs = 6:%{version}-%{release}
-%endif

 %description apidocs
 This package includes the KDE 4 API documentation in HTML
@ -186,33 +197,44 @@ format for easy browsing.

 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
-%else
-# shouldn't be needed f9+, we'll see -- Rex
-%patch6 -p1 -b .openssl
-%endif
 %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
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch20 -p1 -b .cmake
+%patch20 -p1 -b .xxcmake
+%patch21 -p1 -b .ossl-1.x
+%patch22 -p1 -b .bookmarks
+%if 0%{?rhel} > 5
+%patch24 -p1 -b .drkonq
+%endif
+%patch25 -p1 -b .fix-kdefakes-build
+%if 0%{?fedora} > 11
+%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
+%endif

-## upstream patches
+# upstream patches
+%patch50 -p1 -b .kaction_qt_keys
+# 4.4
+%patch100 -p0 -b .adFilteredBy
+
+# security fix
+%patch200 -p1 -b .CVE-2009-2702

 %build

+# add release version
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
+
 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
@ -226,12 +248,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/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 \
@ -260,8 +285,10 @@ do
 done
 popd

+%if 0%{?fedora} &&  0%{?fedora} < 12 
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+%endif

 # fix Sonnet documentation multilib conflict
 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
@ -279,14 +306,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
@ -298,30 +333,32 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING.LIB
+%if 0%{?fedora} &&  0%{?fedora} < 12
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
 # kdewidgets
 %exclude %{_kde4_bindir}/makekdewidgets4
+%exclude %{_kde4_bindir}/kde4-doxygen.sh
 %exclude %{_kde4_appsdir}/kdewidgets/
-%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_libdir}/kde4/plugins/script/*
-%{_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_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/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 %doc %{_mandir}/man*/*
 # kdelibs-common comes from here for fedora >= 9
@ -330,9 +367,21 @@ rm -rf %{buildroot}
 %exclude %{_kde4_configdir}/kdebugrc
 %exclude %{_kde4_configdir}/ui/ui_standards.rc
 %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
@ -352,7 +401,6 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/kdewidgets/
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/
-%{_kde4_libdir}/kde4/plugins/designer/
 %endif

 %if 0%{?apidocs}
@ -363,6 +411,351 @@ rm -rf %{buildroot}


 %changelog
+* Fri Nov 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-4
+- kubuntu_80_kaction_qt_keys.diff (#475247)
+- soprano_ver 2.3.1 (f12+)
+
+* Fri Nov 13 2009 Than Ngo <than@redhat.com> - 4.3.3-3
+- rhel cleanup, fix conditional for RHEL
+
+* Fri Nov 06 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.3-2
+- backport adFilteredBy API from trunk, required to build konq-plugins-4.3.3
+- BR flex and bison for the Solid predicate parser
+- fix build of fakes.c due to missing #include <string.h>
+
+* Fri Oct 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
+* Mon Oct 12 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.2-4
+- khtml kpart crasher nr. 2 (rev.1033984)
+
+* Thu Oct 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.2-3
+- khtml kpart crasher (kde #207173/209876)
+
+* Wed Oct 07 2009 Than Ngo <than@redhat.com> - 4.3.2-2
+- fix a deadlock in KLocale
+
+* Mon Oct 05 2009 Than Ngo <than@redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Wed Sep 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.1-7
+- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
+
+* Mon Sep 21 2009 Than Ngo <than@redhat.com> - 4.3.1-6
+- use abrt for RHEL
+
+* Sat Sep 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.1-5
+- groupdav connect to egroupware failed (kde#186763)
+
+* Fri Sep 18 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.1-4
+- ship kde4-doxygen.sh only in -devel (fix duplicate file)
+
+* Fri Sep 04 2009 Than Ngo <than@redhat.com> - 4.3.1-3
+- security fix for -CVE-2009-2702
+
+* Wed Sep 02 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.1-2
+- Patch for kde#160679
+
+* Fri Aug 28 2009 Than Ngo <than@redhat.com> - 4.3.1-1
+- 4.3.1
+- openssl-1.0 build fixes
+
+* Wed Aug 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-8
+- BR: xz-devel
+
+* Sun Aug 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-7
+- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
+
+* Wed Aug 19 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0-6
+- fix crash when editting toolbars (kdebug:200815)
+
+* Tue Aug 18 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0.5
+- fix KDE bug #19538, copy file after rename uses old file name
+
+* Mon Aug 17 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0-4
+- fix unmounting devices
+- fix copying URLs to clipboard (kdebug:170608)
+
+* Fri Aug 14 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-3
+- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
+
+* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
+- microblog crashes plasma on show friends toggle (kdebug#202550)
+- khtml crasher (kdebug#199557)
+
+* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.98-4
+- -devel: Conflicts: kdebase-runtime < 4.2.90, kdebase-workspace-devel < 4.2.90
+
+* Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.98-3
+- fix CVE-2009-2537 - select length DoS
+- fix CVE-2009-1725 - crash, possible ACE in numeric character references
+- fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes)
+- fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
+- fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
+
+* Fri Jul 24 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.98-2
+- respun tarball, to fix KIO HTTP redirects
+- fix phonon/strigi versions
+
+* Wed Jul 22 2009 Than Ngo <than@redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.96-2
+- soprano_ver 2.3.0
+- License: LGPLv2+
+
+* Fri Jul 10 2009 Than Ngo <than@redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Wed Jul 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.95-4
+- fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)
+
+* Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-3
+- plasma animation crasher (kdebug#198338)
+
+* Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-2
+- up min versions, phonon, strigi, soprano (#509511)
+
+* Thu Jun 25 2009 Than Ngo <than@redhat.com> - 4.2.95-1
+- 4.3 rc1
+
+* Wed Jun 03 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Tue May 12 2009 Than Ngo <than@redhat.com> 4.2.85-1
+- KDE-4.3 beta1 (4.2.85)
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+
+* Wed Apr 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.2-14
+- -devel: Provides: kdelibs4-devel%%{?_isa} ...
+
+* 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
@ -442,7 +835,7 @@ rm -rf %{buildroot}

 * Thu Jul 24 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.0-2
 - move Sonnet documentation back to the main package
- fix #453063 (Sonnet documentation multilib conflict) properly
+- fix #341751 (Sonnet documentation multilib conflict) properly

 * Wed Jul 23 2008 Than Ngo <than@redhat.com> 4.1.0-1
 - 4.1.0
@ -804,7 +1197,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)
--- a/kubuntu_80_kaction_qt_keys.diff
+++ b/kubuntu_80_kaction_qt_keys.diff
@ -0,0 +1,320 @@
+#
+# Ubuntu: https://bugs.launchpad.net/bugs/293213
+# Description: Allow more Qt::Keys to be used as KAction shortcuts
+#
+--- kde4libs-4.3.2.orig/kdeui/util/kkeyserver_x11.cpp
+++ kde4libs-4.3.2/kdeui/util/kkeyserver_x11.cpp
+@@ -198,50 +198,153 @@
+     { '+',                XK_KP_Add },
+     { Qt::Key_Return,     XK_KP_Enter }
+ 
+-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
+ // multimedia keys. They are included here as not every system has them.
+-#define XF86XK_Standby      0x1008FF10
+-#define XF86XK_AudioLowerVolume 0x1008FF11
+-#define XF86XK_AudioMute    0x1008FF12
+-#define XF86XK_AudioRaiseVolume 0x1008FF13
+-#define XF86XK_AudioPlay    0x1008FF14
+-#define XF86XK_AudioStop    0x1008FF15
+-#define XF86XK_AudioPrev    0x1008FF16
+-#define XF86XK_AudioNext    0x1008FF17
+-#define XF86XK_HomePage     0x1008FF18
+-#define XF86XK_Calculator   0x1008FF1D
+-#define XF86XK_Mail     0x1008FF19
+-#define XF86XK_Start        0x1008FF1A
+-#define XF86XK_Search       0x1008FF1B
+-#define XF86XK_AudioRecord  0x1008FF1C
+-#define XF86XK_Back     0x1008FF26
+-#define XF86XK_Forward      0x1008FF27
+-#define XF86XK_Stop     0x1008FF28
+-#define XF86XK_Refresh      0x1008FF29
+-#define XF86XK_Favorites    0x1008FF30
+-#define XF86XK_AudioPause   0x1008FF31
+-#define XF86XK_AudioMedia   0x1008FF32
+-#define XF86XK_MyComputer   0x1008FF33
+-#define XF86XK_OpenURL      0x1008FF38
+-#define XF86XK_Launch0      0x1008FF40
+-#define XF86XK_Launch1      0x1008FF41
+-#define XF86XK_Launch2      0x1008FF42
+-#define XF86XK_Launch3      0x1008FF43
+-#define XF86XK_Launch4      0x1008FF44
+-#define XF86XK_Launch5      0x1008FF45
+-#define XF86XK_Launch6      0x1008FF46
+-#define XF86XK_Launch7      0x1008FF47
+-#define XF86XK_Launch8      0x1008FF48
+-#define XF86XK_Launch9      0x1008FF49
+-#define XF86XK_LaunchA      0x1008FF4A
+-#define XF86XK_LaunchB      0x1008FF4B
+-#define XF86XK_LaunchC      0x1008FF4C
+-#define XF86XK_LaunchD      0x1008FF4D
+-#define XF86XK_LaunchE      0x1008FF4E
+-#define XF86XK_LaunchF      0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+ // end of XF86keysyms.h
+         ,
+-    { Qt::Key_Standby,    XF86XK_Standby },
+    { Qt::Key_Back,       XF86XK_Back },
+    { Qt::Key_Forward,    XF86XK_Forward },
+    { Qt::Key_Stop,       XF86XK_Stop },
+    { Qt::Key_Refresh,    XF86XK_Refresh },
+    { Qt::Key_Favorites,  XF86XK_Favorites },
+    { Qt::Key_LaunchMedia, XF86XK_AudioMedia },
+    { Qt::Key_OpenUrl,    XF86XK_OpenURL },
+    { Qt::Key_HomePage,   XF86XK_HomePage },
+    { Qt::Key_Search,     XF86XK_Search },
+     { Qt::Key_VolumeDown, XF86XK_AudioLowerVolume },
+     { Qt::Key_VolumeMute, XF86XK_AudioMute },
+     { Qt::Key_VolumeUp,   XF86XK_AudioRaiseVolume },
+@@ -249,19 +352,107 @@
+     { Qt::Key_MediaStop,  XF86XK_AudioStop },
+     { Qt::Key_MediaPrevious,  XF86XK_AudioPrev },
+     { Qt::Key_MediaNext,  XF86XK_AudioNext },
+-    { Qt::Key_HomePage,   XF86XK_HomePage },
+-    { Qt::Key_LaunchMail, XF86XK_Mail },
+-    { Qt::Key_Search,     XF86XK_Search },
+     { Qt::Key_MediaRecord, XF86XK_AudioRecord },
+-    { Qt::Key_LaunchMedia, XF86XK_AudioMedia },
+-    { Qt::Key_Launch1,    XF86XK_Calculator },
+-    { Qt::Key_Back,       XF86XK_Back },
+-    { Qt::Key_Forward,    XF86XK_Forward },
+-    { Qt::Key_Stop,       XF86XK_Stop },
+-    { Qt::Key_Refresh,    XF86XK_Refresh },
+-    { Qt::Key_Favorites,  XF86XK_Favorites },
+    { Qt::Key_LaunchMail, XF86XK_Mail },
+     { Qt::Key_Launch0,    XF86XK_MyComputer },
+-    { Qt::Key_OpenUrl,    XF86XK_OpenURL },
+    { Qt::Key_Calculator,    XF86XK_Calculator },
+    { Qt::Key_Memo,    XF86XK_Memo },
+    { Qt::Key_ToDoList,    XF86XK_ToDoList },
+    { Qt::Key_Calendar,    XF86XK_Calendar },
+    { Qt::Key_PowerDown,    XF86XK_PowerDown },
+    { Qt::Key_ContrastAdjust,    XF86XK_ContrastAdjust },
+    { Qt::Key_Standby,    XF86XK_Standby },
+    { Qt::Key_MonBrightnessUp,  XF86XK_MonBrightnessUp },
+    { Qt::Key_MonBrightnessDown,  XF86XK_MonBrightnessDown },
+    { Qt::Key_KeyboardLightOnOff,  XF86XK_KbdLightOnOff },
+    { Qt::Key_KeyboardBrightnessUp,  XF86XK_KbdBrightnessUp },
+    { Qt::Key_KeyboardBrightnessDown,  XF86XK_KbdBrightnessDown },
+    { Qt::Key_PowerOff,  XF86XK_PowerOff },
+    { Qt::Key_WakeUp,  XF86XK_WakeUp },
+    { Qt::Key_Eject,  XF86XK_Eject },
+    { Qt::Key_ScreenSaver,  XF86XK_ScreenSaver },
+    { Qt::Key_WWW,  XF86XK_WWW },
+    { Qt::Key_Sleep,  XF86XK_Sleep },
+    { Qt::Key_LightBulb,  XF86XK_LightBulb },
+    { Qt::Key_Shop,  XF86XK_Shop },
+    { Qt::Key_History,  XF86XK_History },
+    { Qt::Key_AddFavorite,  XF86XK_AddFavorite },
+    { Qt::Key_HotLinks,  XF86XK_HotLinks },
+    { Qt::Key_BrightnessAdjust,  XF86XK_BrightnessAdjust },
+    { Qt::Key_Finance,  XF86XK_Finance },
+    { Qt::Key_Community,  XF86XK_Community },
+    { Qt::Key_AudioRewind,  XF86XK_AudioRewind },
+    { Qt::Key_BackForward,  XF86XK_BackForward },
+    { Qt::Key_ApplicationLeft,  XF86XK_ApplicationLeft },
+    { Qt::Key_ApplicationRight,  XF86XK_ApplicationRight },
+    { Qt::Key_Book,  XF86XK_Book },
+    { Qt::Key_CD,  XF86XK_CD },
+    { Qt::Key_Calculator,  XF86XK_Calculater },
+    { Qt::Key_Clear,  XF86XK_Clear },
+    { Qt::Key_ClearGrab,  XF86XK_ClearGrab },
+    { Qt::Key_Close,  XF86XK_Close },
+    { Qt::Key_Copy,  XF86XK_Copy },
+    { Qt::Key_Cut,  XF86XK_Cut },
+    { Qt::Key_Display,  XF86XK_Display },
+    { Qt::Key_DOS,  XF86XK_DOS },
+    { Qt::Key_Documents,  XF86XK_Documents },
+    { Qt::Key_Excel,  XF86XK_Excel },
+    { Qt::Key_Explorer,  XF86XK_Explorer },
+    { Qt::Key_Game,  XF86XK_Game },
+    { Qt::Key_Go,  XF86XK_Go },
+    { Qt::Key_iTouch,  XF86XK_iTouch },
+    { Qt::Key_LogOff,  XF86XK_LogOff },
+    { Qt::Key_Market,  XF86XK_Market },
+    { Qt::Key_Meeting,  XF86XK_Meeting },
+    { Qt::Key_MenuKB,  XF86XK_MenuKB },
+    { Qt::Key_MenuPB,  XF86XK_MenuPB },
+    { Qt::Key_MySites,  XF86XK_MySites },
+    { Qt::Key_News,  XF86XK_News },
+    { Qt::Key_OfficeHome,  XF86XK_OfficeHome },
+    { Qt::Key_Option,  XF86XK_Option },
+    { Qt::Key_Paste,  XF86XK_Paste },
+    { Qt::Key_Phone,  XF86XK_Phone },
+    { Qt::Key_Reply,  XF86XK_Reply },
+    { Qt::Key_Reload,  XF86XK_Reload },
+    { Qt::Key_RotateWindows,  XF86XK_RotateWindows },
+    { Qt::Key_RotationPB,  XF86XK_RotationPB },
+    { Qt::Key_RotationKB,  XF86XK_RotationKB },
+    { Qt::Key_Save,  XF86XK_Save },
+    { Qt::Key_Send,  XF86XK_Send },
+    { Qt::Key_Spell,  XF86XK_Spell },
+    { Qt::Key_SplitScreen,  XF86XK_SplitScreen },
+    { Qt::Key_Support,  XF86XK_Support },
+    { Qt::Key_TaskPane,  XF86XK_TaskPane },
+    { Qt::Key_Terminal,  XF86XK_Terminal },
+    { Qt::Key_Tools,  XF86XK_Tools },
+    { Qt::Key_Travel,  XF86XK_Travel },
+    { Qt::Key_Video,  XF86XK_Video },
+    { Qt::Key_Word,  XF86XK_Word },
+    { Qt::Key_Xfer,  XF86XK_Xfer },
+    { Qt::Key_ZoomIn,  XF86XK_ZoomIn },
+    { Qt::Key_ZoomOut,  XF86XK_ZoomOut },
+    { Qt::Key_Away,  XF86XK_Away },
+    { Qt::Key_Messenger,  XF86XK_Messenger },
+    { Qt::Key_WebCam,  XF86XK_WebCam },
+    { Qt::Key_MailForward,  XF86XK_MailForward },
+    { Qt::Key_Pictures,  XF86XK_Pictures },
+    { Qt::Key_Music,  XF86XK_Music },
+    { Qt::Key_Battery,  XF86XK_Battery },
+    { Qt::Key_Bluetooth,  XF86XK_Bluetooth },
+    { Qt::Key_WLAN,  XF86XK_WLAN },
+    { Qt::Key_UWB,  XF86XK_UWB },
+    { Qt::Key_AudioForward,  XF86XK_AudioForward },
+    { Qt::Key_AudioRepeat,  XF86XK_AudioRepeat },
+    { Qt::Key_AudioRandomPlay,  XF86XK_AudioRandomPlay },
+    { Qt::Key_Subtitle,  XF86XK_Subtitle },
+    { Qt::Key_AudioCycleTrack,  XF86XK_AudioCycleTrack },
+    { Qt::Key_Time,  XF86XK_Time },
+    { Qt::Key_Select,  XF86XK_Select },
+    { Qt::Key_View,  XF86XK_View },
+    { Qt::Key_TopMenu,  XF86XK_TopMenu },
+    { Qt::Key_Bluetooth,  XF86XK_Bluetooth },
+    { Qt::Key_Suspend,  XF86XK_Suspend },
+    { Qt::Key_Hibernate,  XF86XK_Hibernate },
+     { Qt::Key_Launch2,    XF86XK_Launch0 },
+     { Qt::Key_Launch3,    XF86XK_Launch1 },
+     { Qt::Key_Launch4,    XF86XK_Launch2 },
--- a/2
+++ b/2
@ -1 +1 @@
-cb5f43d2b11669fb17b0a1ecf3736c17  kdelibs-4.1.2.tar.bz2
+20fd3793d9d23088ecb1d5aed0254216  kdelibs-4.3.3.tar.bz2
Author	SHA1	Message	Date
Fedora Release Engineering	085f0148bc	dist-git conversion	2010-07-29 06:59:12 +00:00
Bill Nottingham	71a98c9bf1	Fix typo that causes a failure to update the common directory. (releng #2781 )	2009-11-26 01:21:25 +00:00
Rex Dieter	607864b32e	soprano_ver 2.3.0 here	2009-11-14 15:51:23 +00:00
Rex Dieter	0a75049151	* Fri Nov 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-4 - kubuntu_80_kaction_qt_keys.diff (#475247) - soprano_ver 2.3.1	2009-11-14 15:35:38 +00:00
Rex Dieter	6aaaea77a8	unused-patch	2009-11-14 15:32:45 +00:00
Lukas Tinkl	261774ceb6	KDE 4.3.3	2009-11-09 13:48:31 +00:00
Lukas Tinkl	bbda798c67	fix the patch name	2009-11-02 16:18:04 +00:00
Lukas Tinkl	2dd67fd426	fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015)	2009-11-02 16:10:36 +00:00
Lukas Tinkl	114650ed8d	fix another khtml kpart crasher (to go with the previous one)	2009-10-12 16:31:14 +00:00
Rex Dieter	aff9287a5c	sync w/devel (new khtml patch)	2009-10-08 18:29:53 +00:00
Lukas Tinkl	ef765a52de	forgotten patch	2009-10-07 15:30:10 +00:00
Lukas Tinkl	e3bcad9d80	KDE 4.3.2	2009-10-07 10:49:18 +00:00
Kevin Kofler	17e5b9a87f	Add missing patch.	2009-09-06 02:42:20 +00:00
Than Ngo	ef7439d811	security fix for -CVE-2009-2702	2009-09-04 12:27:04 +00:00
Kevin Kofler	248f9cee9e	Sync from F-11: * Wed Sep 02 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.1-2 - Patch for kde#160679	2009-09-02 18:57:49 +00:00
Lukas Tinkl	8c04914275	KDE 4.3.1	2009-09-01 17:41:47 +00:00
Lukas Tinkl	e2211ed4b9	fix crash when editting toolbars (KDE bug #200815 )	2009-08-19 09:39:14 +00:00
Lukas Tinkl	c691ee472e	backport fix for KDE bug #195385	2009-08-18 12:02:42 +00:00
Lukas Tinkl	d2d4d20571	backport the recent kdelibs fixes	2009-08-17 12:18:19 +00:00
Rex Dieter	529dcc96af	khtml crasher (kdebug#199557)	2009-08-05 18:36:06 +00:00
Rex Dieter	29de1a31ce	* Wed Aug 05 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2 - microblog crashes plasma on show friends toggle (kdebug#202550)	2009-08-05 18:13:50 +00:00
Rex Dieter	8fbca7e4e9	* Thu Jul 30 2009 Than Ngo <than@redhat.com> - 4.3.0-1 - 4.3.0	2009-08-04 19:32:57 +00:00
Kevin Kofler	0ee6ccbd82	Sync from F11: * Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.4-6 - fix CVE-2009-1725 - crash, possible ACE in numeric character references - fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free) - fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?) - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling - fix CVE-2009-0945 - NULL-pointer dereference in the SVGList interface impl * Thu Jul 23 2009 Jaroslav Reznik <jreznik@redhat.com> - 4.2.4-5 - CVE-2009-2537 - select length DoS - correct fixPopupForPlasmaboard.patch * Wed Jul 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.4-4 - fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki) * Mon Jun 15 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.4-3 - fixPopupForPlasmaboard.patch	2009-07-26 05:28:18 +00:00
Lukas Tinkl	9f0c4697df	respun tarball	2009-06-01 11:51:50 +00:00
Lukas Tinkl	c236ea3d8a	drop upstream patch	2009-05-31 17:38:28 +00:00
Lukas Tinkl	d0a486dd85	drop upstream patch	2009-05-31 17:00:59 +00:00
Lukas Tinkl	b559dd42f8	KDE 4.2.4	2009-05-30 13:41:42 +00:00
Rex Dieter	226ac40f22	* 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)	2009-05-12 17:04:16 +00:00
Than Ngo	a8865794f2	fix gcc-4.4 builld issue	2009-05-05 09:30:33 +00:00
Than Ngo	3537acf5aa	better fix for strcasestr detection	2009-05-04 21:46:55 +00:00
Than Ngo	ecd6a3f02d	better fix for strcasestr detection	2009-05-04 21:40:39 +00:00
Lukas Tinkl	8bbe9d3198	KDE 4.2.3	2009-05-04 14:22:24 +00:00
Lukas Tinkl	ee8b90ef00	/tmp/cvsXCJtVy	2009-04-28 12:20:36 +00:00
Kevin Kofler	9ae2c5b4f0	* 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	2009-04-24 01:45:14 +00:00
Kevin Kofler	f4fe036869	* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-11 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)	2009-04-23 22:50:28 +00:00
Kevin Kofler	3341732eb9	* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-10 - fix the kconf_update scriptlet for #495998	2009-04-23 21:29:01 +00:00
Kevin Kofler	afe4cbe2c9	Sync from F11: * Tue Apr 21 2009 Than Ngo <than@redhat.com> - 4.2.2-9 - don't let plasma appear over screensaver	2009-04-21 15:13:00 +00:00
Kevin Kofler	a32a6d25a2	Apply the correct patch.	2009-04-20 13:08:28 +00:00
Kevin Kofler	503f387002	* Mon Apr 20 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.2.2-8 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)	2009-04-20 12:45:39 +00:00
Rex Dieter	b7f8c79bd9	* Sun Apr 19 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-7 - fix and simplify the child struct disposal (kde#180785)	2009-04-19 15:27:50 +00:00
Rex Dieter	2264439fae	* Sat Apr 18 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-6 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)	2009-04-18 23:13:43 +00:00
Kevin Kofler	b8733f9b04	Sync from devel: * 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	2009-04-10 22:26:18 +00:00
Than Ngo	c2044510a5	fix kickoff focus issue	2009-04-07 16:10:05 +00:00
Than Ngo	0c4c9ac292	upstream patch to fix kio_http issue	2009-04-07 10:26:29 +00:00
Rex Dieter	6f066dd078	* Wed Apr 1 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-1 - KDE 4.2.2	2009-04-01 17:50:32 +00:00
Rex Dieter	7d056a05ad	* Wed Mar 05 2009 Rex Dieter <rdieter@fedorproject.org> - 4.2.1-4 - move designer plugins to main/runtime (#487622)	2009-03-05 01:25:33 +00:00
Kevin Kofler	1b0099c976	Revert, the "better" patch does not work.	2009-03-03 22:06:10 +00:00
Kevin Kofler	f75244b041	* Tue Mar 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.1-3 - better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing)	2009-03-03 19:40:15 +00:00
Lukas Tinkl	2cb08dfb71	sync with devel/	2009-03-02 10:11:41 +00:00
Lukas Tinkl	cafb904feb	KDE 4.2.1	2009-02-27 16:57:29 +00:00
Kevin Kofler	e941411d71	Sync from devel: * 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	2009-02-24 04:28:21 +00:00
Rex Dieter	e25144ca36	* Fri Feb 06 2009 Than Ngo <than@redhat.com> - 4.2.0-10 - Fix duplicated applications in the K menu and in keditfiletype	2009-02-06 17:09:54 +00:00
Rex Dieter	317e06b184	* Thu Feb 05 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-9 - ssl/proxy patch (kde#179934)	2009-02-05 14:39:52 +00:00
Rex Dieter	e9f7446680	* Fri Jan 30 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.0-7 - kded/kdirwatch patch (kde#182472)	2009-01-30 20:48:38 +00:00
Rex Dieter	d0b19dcd2d	* 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	2009-01-30 17:18:42 +00:00
Kevin Kofler	0119078d9b	* Fri Jan 30 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.0-5 - reenable PolicyKit and NTFS workarounds WHY was this commented out??? It applies without the slightest offset or fuzz. Please don't comment out patches!	2009-01-30 02:05:28 +00:00
Kevin Kofler	6a02575f60	Remove plasma-on-screensaver-security patch, already in respun tarball and thus no longer applied.	2009-01-28 15:56:16 +00:00
Rex Dieter	fe70c73c14	* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-4 - revert Requires: qt4%{_isa}	2009-01-27 00:23:50 +00:00
Rex Dieter	1988bb0820	* Mon Jan 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.0-3 - respun tarball	2009-01-26 21:45:06 +00:00
Rex Dieter	05114451a9	* 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	2009-01-26 18:10:28 +00:00
Rex Dieter	5acbb2c567	sync with devel/ for 4.2.0 hotness	2009-01-23 18:59:58 +00:00
Kevin Kofler	4911c1c8af	Oops, it's 2009 already. ;-)	2009-01-08 05:00:14 +00:00
Lukas Tinkl	be8a00aeca	another upstream patch	2009-01-07 15:10:34 +00:00
Lukas Tinkl	565aef0793	really drop it :)	2009-01-07 14:51:44 +00:00
Lukas Tinkl	8694825829	drop upstream patches	2009-01-07 14:47:42 +00:00
Lukas Tinkl	7ff99d212a	fix PolicyKit patch	2009-01-07 14:31:59 +00:00
Lukas Tinkl	154eb2fa33	KDE 4.1.4	2009-01-07 12:27:19 +00:00
Kevin Kofler	44934497a7	Fix patch.	2008-12-08 01:34:19 +00:00
Kevin Kofler	a533937225	* Mon Dec 08 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.1.3-4 - restore NTFS workaround which accidentally got dropped in the 4.1.3 update	2008-12-08 01:12:23 +00:00
Rex Dieter	4de069dc6f	fix .cvsignore	2008-11-20 18:20:57 +00:00
Rex Dieter	20ea751d26	* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-3 - unmess Utilities menu (kdebug:161117)	2008-11-20 18:16:24 +00:00
Than Ngo	04bf7f2778	update kdelibs-4.0.2-policykit-workaround.patch	2008-11-12 14:29:28 +00:00
Than Ngo	61549b46e2	4.1.3	2008-11-12 00:04:54 +00:00
Rex Dieter	fd9a71eecb	* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-6 - backport http_cache_cleaner fix (kdebug:172182)	2008-11-07 14:02:14 +00:00
Kevin Kofler	40c1874118	* Wed Oct 15 2008 Lukáš Tinkl <ltinkl@redhat.com> 4.1.2-5 - backport fix for faulty window resizing (kdebug:172042)	2008-10-15 15:25:51 +00:00
Than Ngo	88e65a714b	backport patch to fix crash kded startup crash	2008-10-13 09:33:00 +00:00
Than Ngo	67deeba480	backport fix for google maps	2008-10-08 20:33:15 +00:00
Kevin Kofler	0c5a480fe4	Remove no longer used patch.	2008-10-05 23:56:00 +00:00
Dennis Gilmore	981d8966f0	Initialize branch F-10 for kdelibs	2008-10-03 18:12:44 +00:00