From a7e893cb170acba6c03af724ab3cfb984ec3548d Mon Sep 17 00:00:00 2001
From: Kevin Kofler
Date: Sat, 1 Dec 2007 19:43:21 +0000
Subject: [PATCH] Sync from kdelibs4 (kdelibs 3.96.2).
---
.cvsignore | 5 +-
devices.protocol | 18 -
kde-3.5-libtool-shlibext.patch | 72 -
kde.csh => kde4.csh | 9 +-
kde.sh => kde4.sh | 5 +
kdelibs-3.0.0-ndebug.patch | 11 -
kdelibs-3.0.4-ksyscoca.patch | 29 -
kdelibs-3.2.3-cups.patch | 7 -
kdelibs-3.3.2-ppc.patch | 10 -
kdelibs-3.4.0-qtdoc.patch | 11 -
kdelibs-3.4.91-buildroot.patch | 26 -
kdelibs-3.4.92-inttype.patch | 11 -
kdelibs-3.5.0-101956.patch | 32 -
kdelibs-3.5.1-xdg-menu.patch | 21 -
kdelibs-3.5.2-cupsdconf2-group.patch | 25 -
kdelibs-3.5.2-kdebug-kmail-quiet.patch | 11 -
kdelibs-3.5.4-kabc-make.patch | 10 -
kdelibs-3.5.4-kdeprint-utf8.patch | 11 -
kdelibs-3.5.5-kstandarddirs.patch | 14 -
kdelibs-3.5.5-lib_loader-1.2.patch | 169 ---
kdelibs-3.5.6-137675.patch | 133 --
kdelibs-3.5.6-lang.patch | 17 -
kdelibs-3.5.6-utempter.patch | 86 --
kdelibs-3.5.7-autostart.patch | 15 -
kdelibs-3.5.7-openssl.patch | 34 -
kdelibs-3.5.8-http-regression.patch | 41 -
kdelibs-3.5.8-kate-vhdl.patch | 10 -
kdelibs-3.5.8-kde#150944.patch | 13 -
kdelibs-3.93.0-kde149703.diff | 12 +
kdelibs-3.95.0-kde149705.patch | 39 +
kdelibs-3.95.0-parallel_devel.patch | 289 ++++
kdelibs.spec | 1702 +++++-------------------
sources | 2 +-
33 files changed, 697 insertions(+), 2203 deletions(-)
delete mode 100644 devices.protocol
delete mode 100644 kde-3.5-libtool-shlibext.patch
rename kde.csh => kde4.csh (63%)
rename kde.sh => kde4.sh (68%)
delete mode 100644 kdelibs-3.0.0-ndebug.patch
delete mode 100644 kdelibs-3.0.4-ksyscoca.patch
delete mode 100644 kdelibs-3.2.3-cups.patch
delete mode 100644 kdelibs-3.3.2-ppc.patch
delete mode 100644 kdelibs-3.4.0-qtdoc.patch
delete mode 100644 kdelibs-3.4.91-buildroot.patch
delete mode 100644 kdelibs-3.4.92-inttype.patch
delete mode 100644 kdelibs-3.5.0-101956.patch
delete mode 100644 kdelibs-3.5.1-xdg-menu.patch
delete mode 100644 kdelibs-3.5.2-cupsdconf2-group.patch
delete mode 100644 kdelibs-3.5.2-kdebug-kmail-quiet.patch
delete mode 100644 kdelibs-3.5.4-kabc-make.patch
delete mode 100644 kdelibs-3.5.4-kdeprint-utf8.patch
delete mode 100644 kdelibs-3.5.5-kstandarddirs.patch
delete mode 100644 kdelibs-3.5.5-lib_loader-1.2.patch
delete mode 100644 kdelibs-3.5.6-137675.patch
delete mode 100644 kdelibs-3.5.6-lang.patch
delete mode 100644 kdelibs-3.5.6-utempter.patch
delete mode 100644 kdelibs-3.5.7-autostart.patch
delete mode 100644 kdelibs-3.5.7-openssl.patch
delete mode 100644 kdelibs-3.5.8-http-regression.patch
delete mode 100644 kdelibs-3.5.8-kate-vhdl.patch
delete mode 100644 kdelibs-3.5.8-kde#150944.patch
create mode 100644 kdelibs-3.93.0-kde149703.diff
create mode 100644 kdelibs-3.95.0-kde149705.patch
create mode 100644 kdelibs-3.95.0-parallel_devel.patch
diff --git a/.cvsignore b/.cvsignore
index efb3e67..1d36bef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-clog
-kdelibs-3.5.6.tar.bz2
-kdelibs-3.5.7.tar.bz2
-kdelibs-3.5.8.tar.bz2
+kdelibs-3.96.2.tar.bz2
diff --git a/devices.protocol b/devices.protocol
deleted file mode 100644
index a7055e3..0000000
--- a/devices.protocol
+++ /dev/null
@@ -1,18 +0,0 @@
-[Protocol]
-exec=kio_media
-protocol=devices
-input=none
-output=filesystem
-listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
-reading=true
-writing=true
-makedir=true
-deleting=true
-linking=true
-moving=true
-Icon=system
-maxInstances=4
-#TODO DocPath=kioslave/file.html
-Class=:local
-deleteRecursive=true
-fileNameUsedForCopying=Name
diff --git a/kde-3.5-libtool-shlibext.patch b/kde-3.5-libtool-shlibext.patch
deleted file mode 100644
index 3c482b8..0000000
--- a/kde-3.5-libtool-shlibext.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: arts-1.5.4/acinclude.m4
-===================================================================
---- arts-1.5.4.orig/acinclude.m4
-+++ arts-1.5.4/acinclude.m4
-@@ -12040,28 +12040,12 @@ fi
- ])# AC_LTDL_SYS_DLOPEN_DEPLIBS
-
- AC_DEFUN([AC_LTDL_SHLIBEXT],
--[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
-+[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl
- AC_CACHE_CHECK([which extension is used for shared libraries],
- libltdl_cv_shlibext, [dnl
--(
-- last=
-- case "$host_os" in
-- cygwin* | mingw*)
-- last=".dll"
-- ;;
-- *)
-- for spec in $library_names_spec; do
-- last="$spec"
-- done
-- ;;
-- esac
--changequote(, )
-- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
--changequote([, ])
--)
--libltdl_cv_shlibext=`cat conftest`
--rm -f conftest
--])
-+module=yes
-+eval libltdl_cv_shlibext=$shrext
-+ ])
- if test -n "$libltdl_cv_shlibext"; then
- AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
- [Define to the extension used for shared libraries, say, ".so". ])
-Index: arts-1.5.4/libltdl/ltdl.m4
-===================================================================
---- arts-1.5.4.orig/libltdl/ltdl.m4
-+++ arts-1.5.4/libltdl/ltdl.m4
-@@ -118,27 +118,11 @@ fi
- ])# AC_LTDL_SYS_DLOPEN_DEPLIBS
-
- AC_DEFUN([AC_LTDL_SHLIBEXT],
--[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
-+[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl
- AC_CACHE_CHECK([which extension is used for shared libraries],
- libltdl_cv_shlibext, [dnl
--(
-- last=
-- case "$host_os" in
-- cygwin* | mingw*)
-- last=".dll"
-- ;;
-- *)
-- for spec in $library_names_spec; do
-- last="$spec"
-- done
-- ;;
-- esac
--changequote(, )
-- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
--changequote([, ])
--)
--libltdl_cv_shlibext=`cat conftest`
--rm -f conftest
-+module=yes
-+eval libltdl_cv_shlibext=$shrext
- ])
- if test -n "$libltdl_cv_shlibext"; then
- AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
diff --git a/kde.csh b/kde4.csh
similarity index 63%
rename from kde.csh
rename to kde4.csh
index 7278d91..15b92c9 100755
--- a/kde.csh
+++ b/kde4.csh
@@ -4,7 +4,7 @@
## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-## When/if using prelinking, avoids (some) use of kdeinit
+## When/if using prelinking, avoids use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
if ( "$PRELINKING" == "yes" ) then
@@ -12,6 +12,7 @@ if ( -f /etc/sysconfig/prelink ) then
endif
endif
-## if not using IPv6, speeds DNS operations
-# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
-
+if ( ! $?QT_PLUGIN_PATH ) then
+ set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
+ setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+endif
diff --git a/kde.sh b/kde4.sh
similarity index 68%
rename from kde.sh
rename to kde4.sh
index 905ace6..5a8075f 100755
--- a/kde.sh
+++ b/kde4.sh
@@ -10,3 +10,8 @@ if [ -f /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
+fi
diff --git a/kdelibs-3.0.0-ndebug.patch b/kdelibs-3.0.0-ndebug.patch
deleted file mode 100644
index 683a360..0000000
--- a/kdelibs-3.0.0-ndebug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs/kdecore/kdebug.cpp.ndebug Mon Mar 11 16:44:31 2002
-+++ kdelibs/kdecore/kdebug.cpp Mon Mar 11 16:45:19 2002
-@@ -224,7 +224,7 @@
- break;
- }
-
-- short nOutput = kDebug_data->config ? kDebug_data->config->readNumEntry(key, 2) : 2;
-+ short nOutput = kDebug_data->config ? kDebug_data->config->readNumEntry(key, 4) : 4;
-
- // If the application doesn't have a QApplication object it can't use
- // a messagebox.
diff --git a/kdelibs-3.0.4-ksyscoca.patch b/kdelibs-3.0.4-ksyscoca.patch
deleted file mode 100644
index 55c5436..0000000
--- a/kdelibs-3.0.4-ksyscoca.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- kdelibs-3.0.4/kdecore/ksycoca.cpp.ksyscoca 2002-09-09 20:25:56.000000000 -0400
-+++ kdelibs-3.0.4/kdecore/ksycoca.cpp 2002-10-10 12:16:39.000000000 -0400
-@@ -149,9 +149,15 @@
- }
-
- static void delete_ksycoca_self() {
-- delete KSycoca::_self;
-+ if (KSycoca::_checkSelf())
-+ delete KSycoca::_self;
-+
- }
-
-+bool KSycoca::_checkSelf() {
-+ return (_self ? true : false);
-+}
-+
- KSycoca * KSycoca::self()
- {
- if (!_self) {
---- kdelibs-3.0.4/kdecore/ksycoca.h.ksyscoca 2002-09-09 20:25:56.000000000 -0400
-+++ kdelibs-3.0.4/kdecore/ksycoca.h 2002-10-10 11:54:28.000000000 -0400
-@@ -63,6 +63,7 @@
- * Get or create the only instance of KSycoca (read-only)
- */
- static KSycoca *self();
-+ static bool _checkSelf();
-
- virtual ~KSycoca();
-
diff --git a/kdelibs-3.2.3-cups.patch b/kdelibs-3.2.3-cups.patch
deleted file mode 100644
index 97491c8..0000000
--- a/kdelibs-3.2.3-cups.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- kdelibs-3.2.3/kdeprint/kdeprintrc.orig 2004-07-19 12:45:04.575573066 +0200
-+++ kdelibs-3.2.3/kdeprint/kdeprintrc 2004-07-19 12:45:27.141880905 +0200
-@@ -3,3 +3,4 @@
- ViewType=1
- ViewToolBar=true
- ViewPrinterInfos=true
-+PrintSystem=cups
diff --git a/kdelibs-3.3.2-ppc.patch b/kdelibs-3.3.2-ppc.patch
deleted file mode 100644
index 90aabe7..0000000
--- a/kdelibs-3.3.2-ppc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdelibs-3.3.2/kdefx/kcpuinfo.cpp.orig 2004-12-15 11:17:53.549403872 -0500
-+++ kdelibs-3.3.2/kdefx/kcpuinfo.cpp 2004-12-15 11:18:26.312348696 -0500
-@@ -30,6 +30,7 @@
- #include
- #include "kcpuinfo.h"
-
-+#undef HAVE_PPC_ALTIVEC
-
- #if defined(__GNUC__) || defined(__INTEL_COMPILER)
- # define HAVE_GNU_INLINE_ASM
diff --git a/kdelibs-3.4.0-qtdoc.patch b/kdelibs-3.4.0-qtdoc.patch
deleted file mode 100644
index 97bd765..0000000
--- a/kdelibs-3.4.0-qtdoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.4.0/admin/acinclude.m4.in.orig 2005-04-01 19:01:33.000000000 +0200
-+++ kdelibs-3.4.0/admin/acinclude.m4.in 2005-04-01 19:03:15.000000000 +0200
-@@ -5317,7 +5317,7 @@
- kde_qtdir="$with_qt_dir"
- fi
-
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDOC/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
-
- AC_SUBST(QTDOCDIR)
diff --git a/kdelibs-3.4.91-buildroot.patch b/kdelibs-3.4.91-buildroot.patch
deleted file mode 100644
index 8163b86..0000000
--- a/kdelibs-3.4.91-buildroot.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kdelibs-3.4.91/kdecore/Makefile.am.orig 2005-09-27 17:15:22.000000000 +0200
-+++ kdelibs-3.4.91/kdecore/Makefile.am 2005-09-27 17:14:37.000000000 +0200
-@@ -172,14 +172,6 @@
- kgrantpty_LDFLAGS = $(KDE_USE_PIE) $(KDE_RPATH) $(all_libraries)
- kgrantpty_LDADD = ./libkdefakes.la
-
--# kgrantpty needs to be installed setuid root
--install-exec-hook:
-- @(chown 0 $(DESTDIR)$(bindir)/kgrantpty && chmod 4755 $(DESTDIR)$(bindir)/kgrantpty) || echo "Please make kgrantpty setuid root" >&2
-- @echo ""
-- @echo "kgrantpty is by default installed with a set SETUID root bit!"
-- @echo "This is needed for konsole, etc. to ensure that they can't be eavesdropped."
-- @echo ""
--
- DISTCLEANFILES = kde-config.cpp
-
- DOXYGEN_REFERENCES = dcop kdeui kparts kio
---- kdelibs-3.4.91/kio/misc/kpac/Makefile.am.orig 2005-09-27 17:15:39.000000000 +0200
-+++ kdelibs-3.4.91/kio/misc/kpac/Makefile.am 2005-09-27 17:15:58.000000000 +0200
-@@ -24,6 +24,3 @@
-
- proxyscoutdatadir = $(kde_datadir)/proxyscout
- proxyscoutdata_DATA = eventsrc
--
--install-exec-local:
-- @(chown root $(DESTDIR)$(bindir)/kpac_dhcp_helper && chmod 4755 $(DESTDIR)$(bindir)/kpac_dhcp_helper) || echo "Please make kpac_dhcp_helper setuid root"
diff --git a/kdelibs-3.4.92-inttype.patch b/kdelibs-3.4.92-inttype.patch
deleted file mode 100644
index 95c8796..0000000
--- a/kdelibs-3.4.92-inttype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.4.92/kwallet/backend/sha1.cc.orig 2005-10-24 08:01:18.000000000 -0400
-+++ kdelibs-3.4.92/kwallet/backend/sha1.cc 2005-10-24 08:11:28.000000000 -0400
-@@ -27,6 +27,8 @@
- #include /* For uintXX_t on Tru64 */
- #endif
-
-+#include
-+
- #include "sha1.h"
- #include
-
diff --git a/kdelibs-3.5.0-101956.patch b/kdelibs-3.5.0-101956.patch
deleted file mode 100644
index bd7f304..0000000
--- a/kdelibs-3.5.0-101956.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- kdelibs-3.5.0/kioslave/http/http.cc.101956 2005-11-08 16:39:17.000000000 -0600
-+++ kdelibs-3.5.0/kioslave/http/http.cc 2005-12-01 13:23:39.000000000 -0600
-@@ -2103,6 +2103,8 @@
- return false;
- }
-
-+ bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly);
-+
- m_request.fcache = 0;
- m_request.bCachedRead = false;
- m_request.bCachedWrite = false;
-@@ -2114,7 +2116,6 @@
- {
- m_request.fcache = checkCacheEntry( );
-
-- bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly);
- bool bOffline = isOffline(m_request.doProxy ? m_proxyURL : m_request.url);
- if (bOffline && (m_request.cache != KIO::CC_Reload))
- m_request.cache = KIO::CC_CacheOnly;
-@@ -2156,6 +2157,12 @@
- return false;
- }
- }
-+ else if (bCacheOnly)
-+ {
-+ // Instructed to only check cache, but _not_ to use cache. Oops.
-+ error( ERR_DOES_NOT_EXIST, m_request.url.url() );
-+ return false;
-+ }
-
- QString header;
- QString davHeader;
diff --git a/kdelibs-3.5.1-xdg-menu.patch b/kdelibs-3.5.1-xdg-menu.patch
deleted file mode 100644
index 804cdbc..0000000
--- a/kdelibs-3.5.1-xdg-menu.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- kdelibs-3.5.1/kded/applications.menu.orig 2006-02-21 14:30:11.000000000 +0100
-+++ kdelibs-3.5.1/kded/applications.menu 2006-02-21 14:30:16.000000000 +0100
-@@ -31,12 +31,16 @@
- Core
- KDE
-
--
-- X-SuSE-YaST
-+ X-Red-Hat-Base
-
-
-
-
-+
-+
- #
--# ex: sys
-+# ex: lp
- $$
--#Group sys
-+#Group lp
- @@
-
- %%ripcache
---- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp.tn 2006-05-22 15:26:15.000000000 +0200
-+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2006-05-22 15:26:32.000000000 +0200
-@@ -115,7 +115,7 @@
- maxjobsperprinter_ = 0;
- maxjobsperuser_ = 0;
- user_ = "lp";
-- group_ = "sys";
-+ group_ = "lp";
- ripcache_ = "8m";
- filterlimit_ = 0;
- browsing_ = true;
diff --git a/kdelibs-3.5.2-kdebug-kmail-quiet.patch b/kdelibs-3.5.2-kdebug-kmail-quiet.patch
deleted file mode 100644
index 6c60080..0000000
--- a/kdelibs-3.5.2-kdebug-kmail-quiet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.2/kdecore/kdebugrc.orig 2006-05-03 16:12:27.000000000 +0200
-+++ kdelibs-3.5.2/kdecore/kdebugrc 2006-05-03 16:12:35.000000000 +0200
-@@ -82,7 +82,7 @@
-
- # KMail
- [5006]
--InfoOutput=2
-+InfoOutput=4
-
- # KitchenSync (Syncing Algorithm)
- [5250]
diff --git a/kdelibs-3.5.4-kabc-make.patch b/kdelibs-3.5.4-kabc-make.patch
deleted file mode 100644
index 021cd14..0000000
--- a/kdelibs-3.5.4-kabc-make.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdelibs-3.5.4/kabc/Makefile.am.orig 2006-09-29 12:07:44.000000000 +0200
-+++ kdelibs-3.5.4/kabc/Makefile.am 2006-09-29 12:06:01.000000000 +0200
-@@ -55,6 +55,7 @@
- kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- kab2kabc_LDADD = libkabc.la ../kab/libkab.la
- kab2kabc_SOURCES = kab2kabc.cpp
-+kab2kabc_COMPILE_FIRST = addressee.h
-
- autostart_DATA = kab2kabc.desktop
- autostartdir = $(datadir)/autostart
diff --git a/kdelibs-3.5.4-kdeprint-utf8.patch b/kdelibs-3.5.4-kdeprint-utf8.patch
deleted file mode 100644
index ea500ca..0000000
--- a/kdelibs-3.5.4-kdeprint-utf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.4/kdeprint/cups/kmcupsmanager.cpp.orig 2006-10-01 21:55:49.000000000 +0200
-+++ kdelibs-3.5.4/kdeprint/cups/kmcupsmanager.cpp 2006-10-01 21:56:08.000000000 +0200
-@@ -85,7 +85,7 @@
- // change LANG variable so that CUPS is always using
- // english language: translation may only come from the PPD
- // itself, or from KDE.
-- setenv("LANG", "en", 1);
-+ setenv("LANG", "en_US.UTF-8", 1);
- }
-
- KMCupsManager::~KMCupsManager()
diff --git a/kdelibs-3.5.5-kstandarddirs.patch b/kdelibs-3.5.5-kstandarddirs.patch
deleted file mode 100644
index 651973e..0000000
--- a/kdelibs-3.5.5-kstandarddirs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp
---- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp 2005-01-14 21:46:57.964666000 -0800
-+++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp 2005-01-14 21:49:53.043136983 -0800
-@@ -833,6 +833,10 @@
- if ((local || testdir.exists()) && !candidates->contains(path))
- candidates->append(path);
- }
-+ // UGLY HACK - Chris CHeney
-+ if (local && (!strcmp("config", type)))
-+ candidates->append("/etc/kde/");
-+ //
- local = false;
- }
- }
diff --git a/kdelibs-3.5.5-lib_loader-1.2.patch b/kdelibs-3.5.5-lib_loader-1.2.patch
deleted file mode 100644
index bb150cd..0000000
--- a/kdelibs-3.5.5-lib_loader-1.2.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-
- kdecore/Makefile.am | 2 +
- kdecore/klibloader.cpp | 86 +++++++++++++++++++++++++++----------------------
- kdecore/klibloader.h | 2 -
- kinit/kinit.cpp | 8 +---
- 4 files changed, 55 insertions(+), 43 deletions(-)
-
---- kdelibs-3.5.5/kdecore/Makefile.am.orig 2006-10-01 19:33:38.000000000 +0200
-+++ kdelibs-3.5.5/kdecore/Makefile.am 2007-01-05 00:17:27.235678750 +0100
-@@ -115,8 +115,10 @@
- kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
- kqiodevicegzip_p.cpp ktimezones.cpp
-
-+CXXFLAGS += -fexceptions
- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
-+libkdecore_la_LIBADD += -lboost_filesystem -lboost_regex
- libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
- libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
- $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
---- kdelibs-3.5.5/kdecore/klibloader.h.orig 2005-10-10 17:06:03.000000000 +0200
-+++ kdelibs-3.5.5/kdecore/klibloader.h 2007-01-04 23:19:39.868039250 +0100
-@@ -270,7 +270,7 @@
- * wants to open modules.
- * @param name of the library. If it is not a path, the function searches in
- * the "module" and "lib" resources. If there is no extension,
-- * ".la" will be appended.
-+ * ".so*" will be appended.
- * @param instance a KInstance used to get the standard paths
- */
- static QString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
---- kdelibs-3.5.5/kdecore/klibloader.cpp.orig 2006-01-19 17:06:18.000000000 +0000
-+++ kdelibs-3.5.5/kdecore/klibloader.cpp 2007-01-05 00:08:39.215039750 +0000
-@@ -331,43 +331,59 @@
- d = 0L;
- }
-
--static inline QCString makeLibName( const char* name )
-+#include
-+#include
-+#include
-+#include
-+
-+QCString makeSharedLibraryName( char const* name, QString const& dir )
- {
-- QCString libname(name);
-- // only append ".la" if there is no extension
-- // this allows to load non-libtool libraries as well
-- // (mhk, 20000228)
-- int pos = libname.findRev('/');
-- if (pos < 0)
-- pos = 0;
-- if (libname.find('.', pos) < 0)
-- libname += ".la";
-- return libname;
-+ try
-+ {
-+ boost::filesystem::path d( dir.ascii() );
-+ std::string p = d.string() + "/" + name + ".so";
-+ if ( boost::filesystem::exists( p ) )
-+ return p.c_str();
-+ boost::regex re( p + "\\..+", boost::regex::extended );
-+ for ( boost::filesystem::directory_iterator i( d );
-+ i != boost::filesystem::directory_iterator(); ++i )
-+ {
-+ boost::smatch m;
-+ if ( boost::regex_match( i->string(), m, re ) )
-+ return m.str().c_str();
-+ }
-+ }
-+ catch ( boost::filesystem::filesystem_error const& )
-+ {
-+ }
-+ return QCString();
- }
-
--//static
- QString KLibLoader::findLibrary( const char * name, const KInstance * instance )
- {
-- QCString libname = makeLibName( name );
--
-- // only look up the file if it is not an absolute filename
-- // (mhk, 20000228)
-- QString libfile;
-- if (!QDir::isRelativePath(libname))
-- libfile = QFile::decodeName( libname );
-- else
-- {
-- libfile = instance->dirs()->findResource( "module", libname );
-- if ( libfile.isEmpty() )
-- {
-- libfile = instance->dirs()->findResource( "lib", libname );
--#ifndef NDEBUG
-- if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules
-- kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
--#endif
-- }
-- }
-- return libfile;
-+ try
-+ {
-+ if ( boost::filesystem::exists( name ) )
-+ return name;
-+ }
-+ catch ( boost::filesystem::filesystem_error const& )
-+ {
-+ }
-+ QStringList dirs = instance->dirs()->resourceDirs( "module" );
-+ for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
-+ {
-+ QCString p = makeSharedLibraryName( name, *i );
-+ if ( !p.isNull() )
-+ return p;
-+ }
-+ dirs = instance->dirs()->resourceDirs( "lib" );
-+ for ( QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i )
-+ {
-+ QCString p = makeSharedLibraryName( name, *i );
-+ if ( !p.isNull() )
-+ return p;
-+ }
-+ return QString::null;
- }
-
-
-@@ -418,11 +434,7 @@
- QString libfile = findLibrary( name );
- if ( libfile.isEmpty() )
- {
-- const QCString libname = makeLibName( name );
--#ifndef NDEBUG
-- kdDebug(150) << "library=" << name << ": No file named " << libname << " found in paths." << endl;
--#endif
-- d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(libname);
-+ d->errorMessage = i18n("Library files for \"%1\" not found in paths.").arg(name);
- return 0;
- }
-
---- kdelibs-3.5.5/kinit/kinit.cpp.orig 2006-10-01 19:33:32.000000000 +0200
-+++ kdelibs-3.5.5/kinit/kinit.cpp 2007-01-04 23:39:00.780591750 +0100
-@@ -447,7 +447,7 @@
- {
- /* Relative name without '.la' */
- name = _name;
-- lib = name + ".la";
-+ lib = name;
- exec = name;
- libpath = QFile::encodeName(KLibLoader::findLibrary( lib, s_instance ));
- execpath = execpath_avoid_loops( exec, envc, envs, avoid_loops );
-@@ -458,9 +458,7 @@
- name = _name;
- name = name.mid( name.findRev('/') + 1);
- exec = _name;
-- if (lib.right(3) == ".la")
-- libpath = lib;
-- else
-+ if ( libpath.findRev( ".so" ) == -1 )
- execpath = exec;
- }
- if (!args)
-@@ -1807,7 +1805,7 @@
- #ifndef __CYGWIN__
- if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
- {
-- QString konq = locate("lib", "libkonq.la", s_instance);
-+ QString konq = KLibLoader::findLibrary( "libkonq", s_instance );
- if (!konq.isEmpty())
- (void) lt_dlopen(QFile::encodeName(konq).data());
- }
diff --git a/kdelibs-3.5.6-137675.patch b/kdelibs-3.5.6-137675.patch
deleted file mode 100644
index 7d34f34..0000000
--- a/kdelibs-3.5.6-137675.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: kioslave/metainfo/Makefile.am
-===================================================================
---- kioslave/metainfo/Makefile.am (Revision 606834)
-+++ kioslave/metainfo/Makefile.am (Arbeitskopie)
-@@ -2,7 +2,7 @@
- ## Makefile.am of kdebase/kioslave/metainfo
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- METASOURCES = AUTO
-
- kde_module_LTLIBRARIES = kio_metainfo.la
-Index: kioslave/gzip/Makefile.am
-===================================================================
---- kioslave/gzip/Makefile.am (Revision 606834)
-+++ kioslave/gzip/Makefile.am (Arbeitskopie)
-@@ -1,5 +1,5 @@
- INCLUDES = -I$(top_srcdir)/kio $(all_includes)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- METASOURCES = AUTO
-
- kde_module_LTLIBRARIES = kgzipfilter.la
-Index: kio/tests/Makefile.am
-===================================================================
---- kio/tests/Makefile.am (Revision 606834)
-+++ kio/tests/Makefile.am (Arbeitskopie)
-@@ -18,7 +18,7 @@
-
- INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
- LDADD = $(LIB_KIO)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
- kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
-Index: dcop/tests/Makefile.am
-===================================================================
---- dcop/tests/Makefile.am (Revision 606834)
-+++ dcop/tests/Makefile.am (Arbeitskopie)
-@@ -3,7 +3,6 @@
- @echo -e "dcop tests not run.\nRun make tests in the tests directory to make them"
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
-
- METASOURCES = AUTO
-
-@@ -17,7 +16,7 @@
-
- driver_SOURCES = driver.cpp test.stub
- driver_LDADD = $(LIB_KDECORE)
--driver_LDFLAGS = $(KDE_RPATH)
-+driver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- CLEANFILES = batch.generated definitions.generated driver.generated shell.generated
-
-Index: dcop/dcopidl2cpp/Makefile.am
-===================================================================
---- dcop/dcopidl2cpp/Makefile.am (Revision 606834)
-+++ dcop/dcopidl2cpp/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,5 @@
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
-
- ####### Files
-
-@@ -10,7 +9,7 @@
- noinst_HEADERS = main.h
-
- dcopidl2cpp_LDADD = $(LIB_QT)
--dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
-+dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-
- dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
- ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
-Index: dcop/client/Makefile.am
-===================================================================
---- dcop/client/Makefile.am (Revision 606834)
-+++ dcop/client/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,5 @@
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
- DCOP_LIB = ../libDCOP.la
-
- ####### Files
-@@ -9,19 +8,19 @@
-
- dcop_SOURCES = dcop.cpp
- dcop_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcop_LDFLAGS = $(KDE_RPATH)
-+dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopstart_SOURCES = dcopstart.cpp
- dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopstart_LDFLAGS = $(KDE_RPATH)
-+dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopquit_SOURCES = dcopquit.cpp
- dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopquit_LDFLAGS = $(KDE_RPATH)
-+dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopfind_SOURCES = dcopfind.cpp
- dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopfind_LDFLAGS = $(KDE_RPATH)
-+dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- dcopclient_SOURCES = dcopclient.c
- dcopobject_SOURCES = dcopobject.c
-Index: dcop/dcopidl/Makefile.am
-===================================================================
---- dcop/dcopidl/Makefile.am (Revision 606834)
-+++ dcop/dcopidl/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,5 @@
-
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries)
- AM_CPPFLAGS = -DYYDEBUG
-
- ####### Files
-@@ -11,7 +10,7 @@
- noinst_HEADERS = yacc.cc.h
-
- dcopidl_LDADD = $(LIB_QT)
--dcopidl_LDFLAGS = $(KDE_RPATH)
-+dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-
- ####### Build rules
-
diff --git a/kdelibs-3.5.6-lang.patch b/kdelibs-3.5.6-lang.patch
deleted file mode 100644
index 3df3408..0000000
--- a/kdelibs-3.5.6-lang.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kdelibs-3.5.6/kdecore/klocale.cpp.orig 2007-05-22 17:49:31.000000000 +0200
-+++ kdelibs-3.5.6/kdecore/klocale.cpp 2007-05-23 20:37:54.000000000 +0200
-@@ -140,9 +140,11 @@ void KLocale::initLanguageList(KConfig *
- KConfigGroupSaver saver(config, "Locale");
-
- m_country = config->readEntry( "Country" );
-- if ( m_country.isEmpty() )
-- m_country = defaultCountry();
--
-+ if ( m_country.isEmpty() ) {
-+ QString ln, ct, chrset;
-+ splitLocale(QString(::getenv("LANG")), ln, ct, chrset);
-+ m_country = (ct.isEmpty()) ? defaultCountry() : ct.lower();
-+ }
- // Reset the list and add the new languages
- QStringList languageList;
- if ( useEnv )
diff --git a/kdelibs-3.5.6-utempter.patch b/kdelibs-3.5.6-utempter.patch
deleted file mode 100644
index 2969aa9..0000000
--- a/kdelibs-3.5.6-utempter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nur kdelibs-3.5.6.orig/configure.in.in kdelibs-3.5.6/configure.in.in
---- kdelibs-3.5.6.orig/configure.in.in 2006-05-22 20:14:23.000000000 +0200
-+++ kdelibs-3.5.6/configure.in.in 2007-02-05 23:01:44.000000000 +0100
-@@ -395,7 +395,7 @@
- [], with_utempter=check)
- if test "x$with_utempter" != xno; then
- kde_have_utempter=yes
-- AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
-+ AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
- AC_SUBST(LIBUTEMPTER)
- if test "$kde_have_utempter" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
-diff -Nur kdelibs-3.5.6.orig/kdecore/kpty.cpp kdelibs-3.5.6/kdecore/kpty.cpp
---- kdelibs-3.5.6.orig/kdecore/kpty.cpp 2006-05-22 20:14:21.000000000 +0200
-+++ kdelibs-3.5.6/kdecore/kpty.cpp 2007-02-05 23:01:44.000000000 +0100
-@@ -80,6 +80,10 @@
- # include
- #endif
-
-+#ifdef HAVE_UTEMPTER
-+# include
-+#endif
-+
- #ifdef HAVE_TERMIOS_H
- /* for HP-UX (some versions) the extern C is needed, and for other
- platforms it doesn't hurt */
-@@ -138,21 +142,6 @@
- // private functions //
- ///////////////////////
-
--#ifdef HAVE_UTEMPTER
--class KProcess_Utmp : public KProcess
--{
--public:
-- int commSetupDoneC()
-- {
-- dup2(cmdFd, 0);
-- dup2(cmdFd, 1);
-- dup2(cmdFd, 3);
-- return 1;
-- }
-- int cmdFd;
--};
--#endif
--
- #define BASE_CHOWN "kgrantpty"
-
-
-@@ -399,12 +388,8 @@
- void KPty::login(const char *user, const char *remotehost)
- {
- #ifdef HAVE_UTEMPTER
-- KProcess_Utmp utmp;
-- utmp.cmdFd = d->masterFd;
-- utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << "";
-- utmp.start(KProcess::Block);
-+ utempter_add_record (d->masterFd, remotehost);
- Q_UNUSED(user);
-- Q_UNUSED(remotehost);
- #elif defined(USE_LOGIN)
- const char *str_ptr;
- struct utmp l_struct;
-@@ -442,10 +427,7 @@
- void KPty::logout()
- {
- #ifdef HAVE_UTEMPTER
-- KProcess_Utmp utmp;
-- utmp.cmdFd = d->masterFd;
-- utmp << "/usr/sbin/utempter" << "-d" << d->ttyName;
-- utmp.start(KProcess::Block);
-+ utempter_remove_record (d->masterFd);
- #elif defined(USE_LOGIN)
- const char *str_ptr = d->ttyName.data();
- if (!memcmp(str_ptr, "/dev/", 5))
-diff -Nur kdelibs-3.5.6.orig/kdecore/Makefile.am kdelibs-3.5.6/kdecore/Makefile.am
---- kdelibs-3.5.6.orig/kdecore/Makefile.am 2006-10-01 19:33:38.000000000 +0200
-+++ kdelibs-3.5.6/kdecore/Makefile.am 2007-02-05 23:01:44.000000000 +0100
-@@ -115,7 +115,7 @@
- kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
- kqiodevicegzip_p.cpp ktimezones.cpp
-
--libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
- libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
- libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
- libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
diff --git a/kdelibs-3.5.7-autostart.patch b/kdelibs-3.5.7-autostart.patch
deleted file mode 100644
index 535540c..0000000
--- a/kdelibs-3.5.7-autostart.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kdelibs-3.5.7/kinit/autostart.cpp.orig 2007-09-25 11:32:07.000000000 +0200
-+++ kdelibs-3.5.7/kinit/autostart.cpp 2007-09-25 14:14:29.000000000 +0200
-@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
- m_startList = new AutoStartList;
- m_startList->setAutoDelete(true);
- KGlobal::dirs()->addResourceType("autostart", "share/autostart");
-+ QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
-+ if (xdgconf_dirs.isEmpty())
-+ xdgconf_dirs = "/etc/xdg";
-+ QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
-+ for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
-+ KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
- }
-
- AutoStart::~AutoStart()
diff --git a/kdelibs-3.5.7-openssl.patch b/kdelibs-3.5.7-openssl.patch
deleted file mode 100644
index b5511ce..0000000
--- a/kdelibs-3.5.7-openssl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdelibs-3.5.7/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
-+++ kdelibs-3.5.7/kio/kssl/kopenssl.cc 2007-06-20 08:58:25.000000000 -0500
-@@ -329,6 +329,15 @@ KConfig *cfg;
- #ifdef SHLIB_VERSION_NUMBER
- << "libssl.so." SHLIB_VERSION_NUMBER
- #endif
-+ << "libssl.so.0.9.8b"
-+ << "libssl.so.0.9.8a"
-+ << "libssl.so.6"
-+ << "libssl.so.0.9.7e"
-+ << "libssl.so.5"
-+ << "libssl.so.0.9.7a"
-+ << "libssl.so.4"
-+ << "libssl.so.0.9.6b"
-+ << "libssl.so.2"
- << "libssl.so"
- << "libssl.so.0"
- #endif
-@@ -346,6 +355,15 @@ KConfig *cfg;
- #ifdef SHLIB_VERSION_NUMBER
- << "libcrypto.so." SHLIB_VERSION_NUMBER
- #endif
-+ << "libcrypto.so.0.9.8b"
-+ << "libcrypto.so.0.9.8a"
-+ << "libcrypto.so.6"
-+ << "libcrypto.so.0.9.7e"
-+ << "libcrypto.so.5"
-+ << "libcrypto.so.0.9.7a"
-+ << "libcrypto.so.4"
-+ << "libcrypto.so.0.9.6b"
-+ << "libcrypto.so.2"
- << "libcrypto.so"
- << "libcrypto.so.0"
- #endif
diff --git a/kdelibs-3.5.8-http-regression.patch b/kdelibs-3.5.8-http-regression.patch
deleted file mode 100644
index 62d3ba8..0000000
--- a/kdelibs-3.5.8-http-regression.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: kioslave/http/http.cc
-===================================================================
---- kioslave/http/http.cc (Revision 717341)
-+++ kioslave/http/http.cc (Revision 726097)
-@@ -3409,10 +3409,6 @@
-
- } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
-
-- // Send the current response before processing starts or it
-- // might never get sent...
-- forwardHttpResponseHeader();
--
- // Now process the HTTP/1.1 upgrade
- QStringList::Iterator opt = upgradeOffers.begin();
- for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
- mimeType( m_strMimeType );
- }
-
-+ // Do not move send response header before any redirection as it seems
-+ // to screw up some sites. See BR# 150904.
-+ forwardHttpResponseHeader();
-+
- if (m_request.method == HTTP_HEAD)
- return true;
-
-@@ -3830,10 +3830,10 @@
- // Check...
- createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
- if (!m_request.fcache)
-- {
-- m_request.bCachedWrite = false; // Error creating cache entry.
-- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-- }
-+ {
-+ m_request.bCachedWrite = false; // Error creating cache entry.
-+ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-+ }
- m_request.expireDate = expireDate;
- m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
- }
diff --git a/kdelibs-3.5.8-kate-vhdl.patch b/kdelibs-3.5.8-kate-vhdl.patch
deleted file mode 100644
index d8c104c..0000000
--- a/kdelibs-3.5.8-kate-vhdl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdelibs-3.5.8/kate/data/vhdl.xml.orig 2007-10-18 19:34:32.000000000 +0200
-+++ kdelibs-3.5.8/kate/data/vhdl.xml 2007-10-18 19:33:04.000000000 +0200
-@@ -1,6 +1,6 @@
-
-
--
-+
-
-
- - access
diff --git a/kdelibs-3.5.8-kde#150944.patch b/kdelibs-3.5.8-kde#150944.patch
deleted file mode 100644
index f787efa..0000000
--- a/kdelibs-3.5.8-kde#150944.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- branches/KDE/3.5/kdelibs/kdeui/kactionclasses.cpp 2007/08/30 19:30:39 706570
-+++ branches/KDE/3.5/kdelibs/kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528
-@@ -667,8 +667,8 @@
- KToolBar* bar = static_cast( widget );
- int id_ = KAction::getToolButtonID();
- bar->insertCombo( comboItems(), id_, isEditable(),
-- SIGNAL( activated( int ) ), this,
-- SLOT( slotActivated( int ) ), isEnabled(),
-+ SIGNAL( activated( const QString & ) ), this,
-+ SLOT( slotActivated( const QString & ) ), isEnabled(),
- toolTip(), -1, index );
-
- QComboBox *cb = bar->getCombo( id_ );
diff --git a/kdelibs-3.93.0-kde149703.diff b/kdelibs-3.93.0-kde149703.diff
new file mode 100644
index 0000000..dacd7b0
--- /dev/null
+++ b/kdelibs-3.93.0-kde149703.diff
@@ -0,0 +1,12 @@
+diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
+--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp 2007-08-29 23:53:54.000000000 +0200
++++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp 2007-09-10 05:44:50.000000000 +0200
+@@ -133,7 +133,7 @@
+ // appId = pService->storageId();
+
+ const QString type = config.readEntry( "ServiceType" );
+- const QString type2 = config.readEntry( "GenericServiceType" );
++ const QString type2 = config.readEntry( "GenericServiceType", "Application" );
+ int pref = config.readEntry( "Preference", 0 );
+
+ if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden
diff --git a/kdelibs-3.95.0-kde149705.patch b/kdelibs-3.95.0-kde149705.patch
new file mode 100644
index 0000000..8bf8c20
--- /dev/null
+++ b/kdelibs-3.95.0-kde149705.patch
@@ -0,0 +1,39 @@
+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 @@
+ The name of the widget style, for example "keramik" or "plastik". Without quotes.
+ keramik
+
++
++
++ The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.
++
+
+
+
+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())
+ {
diff --git a/kdelibs-3.95.0-parallel_devel.patch b/kdelibs-3.95.0-parallel_devel.patch
new file mode 100644
index 0000000..6e7d1e2
--- /dev/null
+++ b/kdelibs-3.95.0-parallel_devel.patch
@@ -0,0 +1,289 @@
+diff -up kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh.parallel-devel kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh
+--- kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh.parallel-devel 2007-07-26 05:40:17.000000000 -0500
++++ kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh 2007-11-04 15:47:59.000000000 -0600
+@@ -2,9 +2,9 @@
+ # Generates and cleans KConfigXT source code during a API dox build
+ #
+
+-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
++kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
+ if test -z "$kcfg_compiler"; then
+- echo "kconfig_compiler not found!"
++ echo "kconfig_compiler4 not found!"
+ exit 1;
+ fi
+
+diff -up kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt
+--- kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel-devel 2007-10-03 05:49:47.000000000 -0500
++++ kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt 2007-11-04 15:47:59.000000000 -0600
+@@ -8,11 +8,11 @@ add_subdirectory( example )
+ set(kconfig_compiler_SRCS kconfig_compiler.cpp)
+
+
+-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
++kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+
+-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
++target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+
+-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
+
+
+ ########### install files ###############
+diff -up kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel-devel kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl
+--- kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel-devel 2006-10-25 21:25:48.000000000 -0500
++++ kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl 2007-11-04 15:47:59.000000000 -0600
+@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
+
+ $kcfgc = $file . "c";
+
+-$cmd = "./kconfig_compiler $file $kcfgc";
++$cmd = "./kconfig_compiler4 $file $kcfgc";
+
+ #print "CMD $cmd\n";
+
+ if ( system( $cmd ) != 0 ) {
+- print STDERR "Unable to run kconfig_compiler\n";
++ print STDERR "Unable to run kconfig_compiler4\n";
+ exit 1;
+ }
+
+diff -up kdelibs-3.95.0/kdewidgets/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdewidgets/CMakeLists.txt
+--- kdelibs-3.95.0/kdewidgets/CMakeLists.txt.parallel-devel 2007-10-03 05:50:13.000000000 -0500
++++ kdelibs-3.95.0/kdewidgets/CMakeLists.txt 2007-11-04 15:47:59.000000000 -0600
+@@ -16,22 +16,22 @@ include_directories(
+ set(makekdewidgets_SRCS makekdewidgets.cpp )
+
+
+-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
++kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+
+-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
++target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
+
+-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
+
+
+ ########### next target ###############
+
+
+ # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
+-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
++get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
+
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
+ COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
++ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
+
+ set(kdewidgets_PART_SRCS
+ classpreviews.cpp
+diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel 2007-10-23 03:39:11.000000000 -0500
++++ kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake 2007-11-04 15:55:31.000000000 -0600
+@@ -15,10 +15,10 @@
+ # The following variables are defined for the various tools required to
+ # compile KDE software:
+ #
+-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
++# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
+ # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable
+ # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
+-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
++# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
+ #
+ # The following variables point to the location of the KDE libraries,
+ # but shouldn't be used directly:
+@@ -121,7 +121,7 @@
+ # Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
+ #
+ # KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
+-# Use this to add widget description files for the makekdewidgets code generator
++# Use this to add widget description files for the makekdewidgets4 code generator
+ # for Qt Designer plugins.
+ #
+ # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
+@@ -272,24 +272,24 @@ if (_kdeBootStrapping)
+ if (WIN32)
+ set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
+ # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
+- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
++ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
+ set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
+ set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
+- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
++ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
+ else (WIN32)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
+- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
++ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
+ set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
+ set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
+- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
++ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
+ endif (WIN32)
+
+ set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
+
+ # when building kdelibs, make the kcfg rules depend on the binaries...
+- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
++ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+ set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
+- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
++ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
+ set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
+
+ set(KDE4_INSTALLED_VERSION_OK TRUE)
+@@ -342,72 +342,72 @@ else (_kdeBootStrapping)
+ # this file contains all dependencies of all libraries of kdelibs, Alex
+ include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
+
+- find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
+
+- find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
+
+- find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
+
+- find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
+
+- find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
+
+- find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
+
+- find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
+
+- find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
+
+- find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
+
+- find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
+
+- find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
+
+ if (UNIX)
+- find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} )
+
+- find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
+ endif (UNIX)
+
+- find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
+
+- find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
+
+- find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
+
+- find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
+
+- find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
+
+- find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
+
+- find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
+
+- find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
+
+- find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+ set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
+
+ # Can't do that, it's not always compiled.
+@@ -426,8 +426,8 @@ else (_kdeBootStrapping)
+
+ # at first look in LIBEXEC_INSTALL_DIR and no default paths,
+ # if this didn't succeed, the second call makes cmake search again, but in the standard paths
+- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
++ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
+
+ find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
+@@ -435,8 +435,8 @@ else (_kdeBootStrapping)
+ find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
+
+- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
++ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
++ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
+
+ # allow searching cmake modules in all given kde install locations (KDEDIRS based)
+ execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+@@ -585,7 +585,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY
+ "${_CMAKE_INSTALL_DIR}/bin"
+ "${CMAKE_INSTALL_PREFIX}/bin" )
+
+-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
++set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
++ ${CMAKE_SYSTEM_LIBRARY_PATH}
+ "${KDE4_LIB_INSTALL_DIR}"
+ "${_CMAKE_INSTALL_DIR}/lib"
+ "${CMAKE_INSTALL_PREFIX}/lib" )
+@@ -924,9 +925,9 @@ macro (KDE4_PRINT_RESULTS)
+ endif (NOT _kdeBootStrapping)
+
+ if(KDE4_KCFGC_EXECUTABLE)
+- message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
++ message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+ else(KDE4_KCFGC_EXECUTABLE)
+- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
++ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
+ endif(KDE4_KCFGC_EXECUTABLE)
+
+ if(KDE4_AUTOMOC_EXECUTABLE)
+diff -up kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt
+--- kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-devel 2007-10-03 05:50:15.000000000 -0500
++++ kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2007-11-04 15:47:59.000000000 -0600
+@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
+ COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
+
+ # set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
+ qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff --git a/kdelibs.spec b/kdelibs.spec
index 75e4f76..b66d2a0 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,1436 +1,424 @@
-# kdelibs3 review: http://bugzilla.redhat.com/248899
-%define distname "Fedora"
+# TODO:
+# 1. package some noarch bits separately: apidocs.
-%define kde_settings 1
+Summary: K Desktop Environment 4 - Libraries
+Version: 3.96.2
+Release: 1%{?dist}
-%define arts 1
-%define arts_epoch 8
-%define arts_version 1.5.8
-
-%define qt_epoch 1
-%define qt_version 3.3.8
-%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
-%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
-
-%define kde_major_version 3
-
-%define make_cvs 1
-
-%define apidocs 1
-
-Summary: K Desktop Environment - Libraries
-Version: 3.5.8
-Release: 8%{?dist}
-
-%if 0%{?fedora} > 8
-Name: kdelibs3
-Obsoletes: kdelibs < 6:%{version}-%{release}
-Provides: kdelibs = 6:%{version}-%{release}
-%else
+%if 0%{?fedora} > 9
Name: kdelibs
Epoch: 6
-Obsoletes: kdelibs3 = %{version}-%{release}
-Provides: kdelibs3 = %{version}-%{release}
-%endif
-
-License: LGPLv2
-Url: http://www.kde.org/
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
-Source1: kde.sh
-Source2: kde.csh
-Source3: devices.protocol
-
-Patch1: kdelibs-3.5.1-xdg-menu.patch
-Patch2: kdelibs-3.0.0-ndebug.patch
-Patch4: kdelibs-3.0.4-ksyscoca.patch
-Patch5: kdelibs-3.5.7-openssl.patch
-Patch15: kdelibs-3.4.91-buildroot.patch
-Patch32: kdelibs-3.2.3-cups.patch
-Patch33: kdelibs-3.3.2-ppc.patch
-Patch34: kdelibs-3.4.0-qtdoc.patch
-Patch35: kdelibs-3.4.92-inttype.patch
-Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
-Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
-Patch39: kdelibs-3.5.4-kabc-make.patch
-Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
-Patch41: kdelibs-3.5.6-utempter.patch
-Patch43: kdelibs-3.5.6-lang.patch
-Patch45: kdelibs-3.5.7-autostart.patch
-Patch46: kdelibs-3.5.8-kate-vhdl.patch
-
-# use /etc/kde in addition to /usr/share/config, borrowed from debian
-Patch100: kdelibs-3.5.5-kstandarddirs.patch
-# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
-Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
-Patch102: kdelibs-3.5.6-137675.patch
-# kget ignores simultaneous download limit (kde #101956)
-Patch103: kdelibs-3.5.0-101956.patch
-
-## upstream patches
-Patch200: kdelibs-3.5.8-http-regression.patch
-Patch201: kdelibs-3.5.8-kde#150944.patch
-
-%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
-Requires: qt >= %{qt_epoch}:%{qt_ver}
-Requires: hicolor-icon-theme
-%if %{kde_settings}
-Requires: kde-settings >= 3.5
-%endif
-Requires: kde-filesystem
-Requires: redhat-menus
-Requires: shadow-utils
-BuildRequires: sudo
-Requires(hint): sudo
-
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define libkdnssd libkdnssd
-Requires: %{libkdnssd}
-%define BuildRequires: xorg-x11-proto-devel libX11-devel
-%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
-Requires: iceauth
-%endif
-
-Requires(pre): coreutils
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-BuildRequires: gettext
-BuildRequires: pcre-devel
-BuildRequires: cups-devel cups
-BuildRequires: qt-devel qt-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
-BuildRequires: flex >= 2.5.4a-13
-BuildRequires: doxygen
-BuildRequires: libxslt-devel
-BuildRequires: sgml-common
-BuildRequires: openjade
-BuildRequires: jadetex
-BuildRequires: docbook-dtd31-sgml
-BuildRequires: docbook-style-dsssl
-BuildRequires: perl-SGMLSpm
-BuildRequires: docbook-utils
-BuildRequires: zlib-devel
-BuildRequires: libidn-devel
-BuildRequires: audiofile-devel
-BuildRequires: openssl-devel
-BuildRequires: perl
-BuildRequires: gawk
-BuildRequires: byacc
-BuildRequires: libart_lgpl-devel
-BuildRequires: bzip2-devel
-BuildRequires: libtiff-devel
-BuildRequires: libacl-devel libattr-devel
-BuildRequires: aspell-devel
-BuildRequires: krb5-devel
-BuildRequires: openldap-devel
-BuildRequires: db4-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: pkgconfig
-BuildRequires: glibc-kernheaders
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-%define _with_libutempter 1
-BuildRequires: libutempter-devel
+Obsoletes: kdelibs4 < %{version}-%{release}
+Provides: kdelibs4 = %{version}-%{release}
%else
-BuildRequires: utempter
+Name: kdelibs4
%endif
-BuildRequires: findutils
+
+# LGPLv2: everything, except (see below)
+# BSD: kdoctools/
+# GFDL: kdoctools/customization ?
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# for macros.kde4
+BuildRequires: kde-filesystem >= 4
+Requires: dbus-x11
+Requires: hicolor-icon-theme
+# not *strictly* required here, but how better to pull kdebase-runtime in? -- Rex
+Requires: kdebase-runtime
+Requires: oxygen-icon-theme
+Requires: kde-filesystem >= 4
+Requires: kde-settings
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+Requires: shared-mime-info
+
+Source1: kde4.sh
+Source2: kde4.csh
+
+# make -devel packages parallel-installable
+Patch0: kdelibs-3.95.0-parallel_devel.patch
+# fix kde#149703
+Patch1: kdelibs-3.93.0-kde149703.diff
+# fix kde#149705
+Patch2: kdelibs-3.95.0-kde149705.patch
+
+BuildRequires: qt4-devel >= 4.3.0
+Requires: qt4 >= %{_qt4_version}
+Requires: xdg-utils
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+
+BuildRequires: alsa-lib-devel
+BuildRequires: aspell-devel
+BuildRequires: avahi-devel
+BuildRequires: bzip2-devel
+BuildRequires: cmake
+BuildRequires: cups-devel cups
+BuildRequires: enchant-devel
+BuildRequires: gamin-devel
+BuildRequires: gettext-devel
+BuildRequires: giflib-devel
+# busted at least on x86_64
+#BuildRequires: hspell-devel
BuildRequires: jasper-devel
+BuildRequires: krb5-devel
+BuildRequires: libacl-devel libattr-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-
-%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
-Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
-%endif
-
-Provides: crystalsvg-icon-theme = %{version}-%{release}
+BuildRequires: openssl-devel
+BuildRequires: pcre-devel
+BuildRequires: shared-mime-info
+BuildRequires: soprano-devel >= 1.97.1
+BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: zlib-devel
+# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
+%define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
+%{?x_deps:BuildRequires: %{x_deps}}
%description
-Libraries for the K Desktop Environment:
-KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
-kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
+Libraries for the K Desktop Environment 4.
%package devel
Group: Development/Libraries
-Summary: Header files and documentation for compiling KDE applications.
-%if "%{name}" == "kdelibs"
-Obsoletes: kdelibs3-devel < %{version}-%{release}
-Provides: kdelibs3-devel = %{version}-%{release}
-%else
-Obsoletes: kdelibs-devel < 6:%{version}-%{release}
-Provides: kdelibs-devel = 6:%{version}-%{release}
-%endif
+Summary: Header files for compiling KDE 4 applications
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: qt-devel
-Requires: openssl-devel
-%{?arts:Requires: arts-devel}
-%{?libkdnssd:Requires: libkdnssd-devel}
-## those below can/should be omitted from future(f8?) builds -- Rex
-%if 0
-Requires: bzip2-devel
-Requires: libacl-devel
-Requires: libart_lgpl-devel
-Requires: libidn-devel
-Requires: libxslt-devel
-Requires: libjpeg-devel
-Requires: libtiff-devel
-%{?_with_libutempter:Requires: libutempter-devel}
-Requires: pcre-devel
-Requires: zlib-devel
+%if "%{name}" != "kdelibs4"
+Obsoletes: kdelibs4-devel < %{version}-%{release}
+Provides: kdelibs4-devel = %{version}-%{release}
%endif
+Requires: qt4-devel
+Requires: openssl-devel
+Requires: bzip2-devel gamin-devel libacl-devel zlib-devel
+Requires: strigi-devel >= 0.5.7
+%{?x_deps:Requires: %{x_deps}}
%description devel
This package includes the header files you will need to compile
-applications for KDE.
-
-%package apidocs
-Group: Development/Documentation
-Summary: KDE API documentation.
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}
-%if "%{name}" == "kdelibs"
-Provides: kdelibs3-apidocs = %{version}-%{release}
-%else
-Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
-Provides: kdelibs-apidocs = 6:%{version}-%{release}
-%endif
-
-%description apidocs
-This package includes the KDE API documentation in HTML
-format for easy browsing
+applications for KDE 4.
%prep
%setup -q -n kdelibs-%{version}
-%patch1 -p1 -b .xdg-menu
-%patch2 -p1 -b .debug
-%patch4 -p1 -b .ksyscoca
-%patch5 -p1 -b .openssl
-%patch15 -p1 -b .buildroot
-%patch32 -p1 -b .cups
-%patch33 -p1 -b .ppc
-%patch34 -p1 -b .qtdoc
-%patch35 -p1 -b .inttype
-%patch37 -p1 -b .kdebug-kmail-quiet
-%patch38 -p1 -b .cupsdconf2-group
-%patch39 -p1 -b .kabc-make
-%patch40 -p1 -b .kdeprint-utf8
-%{?_with_libutempter:%patch41 -p1 -b .utempter}
-%patch43 -p1 -b .lang
-%patch45 -p1 -b .xdg-autostart
-%patch46 -p1 -b .kate-vhdl
-
-%patch100 -p1 -b .kstandarddirs
-%patch101 -p1 -b .libtool-shlibext
-%patch102 -p0 -b .kde#137675
-
-# upstream patches
-%patch200 -p0 -b .http-regression
-%patch201 -p4 -b .kde#150944
-
-sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
-
-%if %{make_cvs}
- make -f admin/Makefile.common cvs
-%endif
+%patch0 -p1 -b .parallel_devel
+%patch1 -p1 -b .kde149703
+%patch2 -p1 -b .kde149705
%build
-unset QTDIR && . /etc/profile.d/qt.sh
-export QTDOC=%{qtdocdir}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
-if [ -x /etc/profile.d/krb5.sh ]; then
- . /etc/profile.d/krb5.sh
-elif ! echo ${PATH} | grep -q /usr/kerberos/bin ; then
- export PATH=/usr/kerberos/bin:${PATH}
-fi
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-%configure \
- --includedir=%{_includedir}/kde \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- %{!?debug: --disable-debug --disable-warnings --enable-final} \
- %{?debug:--enable-debug --enable-warnings --disable-final} \
- --disable-fast-malloc \
-%if "%{_lib}" == "lib64"
- --enable-libsuffix="64" \
-%endif
- --enable-cups \
- --enable-mitshm \
- --enable-pie \
- --enable-sendfile \
- --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
- --with-alsa \
- --with-aspell \
- --disable-libfam \
- --enable-dnotify \
- --enable-inotify \
- --with-utempter \
- %{!?arts:--without-arts} \
- %{?_with_rgbfile} \
- --with-jasper \
- --with-openexr \
- --with-xinerama
-
-make %{?_smp_mflags}
-
-%if "%{?apidocs}" == "1"
- make %{?_smp_mflags} apidox
-%endif
+# FIXME/TODO: apidocs
+# doc/api/doxygen.sh --doxdatadir=doc/common .
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot} -C %{_target_platform}
-chmod a+x %{buildroot}%{_libdir}/*
-install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
+# see also use-of/patching of XDG_MENU_PREFIX in kdebase
+mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
+ %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
-%if "%{?apidocs}" == "1"
-pushd %{buildroot}%{_docdir}
-ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
-popd
+%if "%{name}" != "kdelibs"
+# remove files which conflict with KDE 3
+rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
+ %{buildroot}%{_kde4_bindir}/kunittestmodrunner
+rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
+ %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
+rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
+rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
%endif
-# Make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
- if [ -d $i -a -L $i/common ]; then
- rm -f $i/common
- ln -sf ../common $i
- fi
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+ case "$i" in
+ libkdeinit4_*.so)
+ ;;
+ *)
+ linktarget=`readlink "$i"`
+ rm -f "$i"
+ ln -sf "../../$linktarget" "kde4/devel/$i"
+ ;;
+ esac
done
popd
-%if "%{name}" == "kdelibs3"
-install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde3.sh
-install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde3.csh
-%else
-install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
-install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
-# menus
+install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
+install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
-mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
-mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
- %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
-%endif
-echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+%post
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
-# Use hicolor-icon-theme rpm/pkg instead (#178319)
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-
-# ghost'd files
-touch $RPM_BUILD_ROOT%{_datadir}/services/ksycoca
-
-# remove references to extraneous/optional libraries in .la files (#170602)
-# fam, libart_lgpl, pcre, libidn, libpng, libjpeg, libdns_sd, libacl/libattr, alsa-lib/asound
-find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
- sed -i \
- -e "s@-lfam@@g" \
- -e "s@%{_libdir}/libfam.la@@g" \
- -e "s@-lart_lgpl_2@@g" \
- -e "s@%{_libdir}/libpcreposix.la@@g" \
- -e "s@-lpcreposix@@g" \
- -e "s@-lpcre@@g" \
- -e "s@-lidn@@g" \
- -e "s@%{_libdir}/libidn.la@@g" \
- -e "s@-lpng@@g" \
- -e "s@-ljpeg@@g" \
- -e "s@%{_libdir}/libjpeg.la@@g" \
- -e "s@-ldns_sd@@g" \
- -e "s@-lacl@@g" \
- -e "s@%{_libdir}/libacl.la@@g" \
- -e "s@/%{_lib}/libacl.la@@g" \
- -e "s@-lattr@@g" \
- -e "s@%{_libdir}/libattr.la@@g" \
- -e "s@/%{_lib}/libattr.la@@g" \
- -e "s@-lasound@@g" \
- -e "s@-lutempter@@g"
-
-# libkdnssd bits
-rm -f %{buildroot}%{_libdir}/libkdnssd.la
-%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
-
-%if "%{name}" != "kdelibs"
-# remove conflicts with kdelibs-4
-pushd %{buildroot}%{_bindir}
-rm -f cupsdconf cupsdoprint imagetops kaddprinterwizard kconf_update kcookiejar \
- kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \
- klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ktradertest \
- make_driver_db_cups make_driver_db_lpr meinproc preparetips \
- khotnewstuff kinstalltheme kcmshell kfile kioexec
-# devel stuff (skip for now)
-#rm -f checkXML kconfig_compiler ksvgtopng kunittestmodrunner makekdewidgets
-popd
-rm -f %{buildroot}%{_datadir}/config/* \
- %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
-
-rm -rf %{buildroot}%{_datadir}/config/colors \
- %{buildroot}%{_datadir}/apps/k* \
- %{buildroot}%{_datadir}/apps/LICENSES \
- %{buildroot}%{_datadir}/apps/proxyscout \
- %{buildroot}%{_datadir}/locale \
- %{buildroot}%{_datadir}/autostart \
- %{buildroot}/etc/xdg \
- %{buildroot}%{_docdir}/HTML \
- %{buildroot}%{_datadir}/emoticons
-%endif
+%postun
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%clean
rm -rf %{buildroot}
-%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
-%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
-%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
-
-
%files
%defattr(-,root,root,-)
-%doc README
+%doc AUTHORS README TODO
%doc COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
-%{_bindir}/artsmessage
-%{_bindir}/cupsdconf
-%{_bindir}/cupsdoprint
-%{_bindir}/dcop
-%{_bindir}/dcopclient
-%{_bindir}/dcopfind
-%{_bindir}/dcopobject
-%{_bindir}/dcopquit
-%{_bindir}/dcopref
-%{_bindir}/dcopserver
-%{_bindir}/dcopserver_shutdown
-%{_bindir}/dcopstart
-%{_bindir}/filesharelist
-%{_bindir}/fileshareset
-%{_bindir}/imagetops
-%{_bindir}/kab2kabc
-%{_bindir}/kaddprinterwizard
-%{_bindir}/kbuildsycoca
-%{_bindir}/kcmshell
-%{_bindir}/kconf_update
-%{_bindir}/kcookiejar
-%{_bindir}/kde-config
-%{_bindir}/kde-menu
-%{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
-%{_bindir}/kdontchangethehostname
-%{_bindir}/kdostartupconfig
-%{_bindir}/kfile
-%{_bindir}/kfmexec
-%{_bindir}/khotnewstuff
-%{_bindir}/kinstalltheme
-%{_bindir}/kio_http_cache_cleaner
-%{_bindir}/kio_uiserver
-%{_bindir}/kioexec
-%{_bindir}/kioslave
-%{_bindir}/klauncher
-%{_bindir}/kmailservice
-%{_bindir}/ksendbugmail
-%{_bindir}/kshell
-%{_bindir}/kstartupconfig
-%{_bindir}/ktelnetservice
-%{_bindir}/ktradertest
-%{_bindir}/kwrapper
-%{_bindir}/lnusertemp
-%{_bindir}/make_driver_db_cups
-%{_bindir}/make_driver_db_lpr
-%{_bindir}/meinproc
-%{_bindir}/preparetips
-%{_bindir}/start_kdeinit
-%{_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{_bindir}/kgrantpty
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/lib*.la
-%{_libdir}/kde3/
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/apps/*
-%exclude %{_datadir}/apps/ksgmltools2/
-%exclude %{_datadir}/apps/kdewidgets/
-%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
-%config(noreplace) %{_datadir}/config/*
-%{_datadir}/icons/crystalsvg/
-%{_datadir}/icons/default.kde
-%{_datadir}/mimelnk/magic
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%ghost %{_datadir}/services/ksycoca
+%{_kde4_bindir}/*
+%exclude %{_kde4_bindir}/kconfig_compiler4
+%{_kde4_appsdir}/*
+# kdewidgets
+%exclude %{_kde4_bindir}/makekdewidgets4
+%exclude %{_kde4_appsdir}/kdewidgets/
+%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
+# ksgmltools2
+%exclude %{_kde4_appsdir}/ksgmltools2/
+%{_kde4_configdir}/*
+%{_datadir}/dbus-1/interfaces/*
+%{_kde4_datadir}/mime/packages/*
+%{_kde4_sharedir}/kde4/services/*
+%{_kde4_sharedir}/kde4/servicetypes/*
+%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
%if "%{name}" == "kdelibs"
-%{_sysconfdir}/xdg/menus/*.menu
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
-%{_datadir}/autostart/*
-%{_datadir}/emoticons/*
-%{_datadir}/locale/all_languages
-%{_docdir}/HTML/en/common
-%{_docdir}/HTML/en/kspell
+%{_kde4_datadir}/locale/all_languages/
%endif
+%{_kde4_docdir}/HTML/en/*
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kde4/
+%exclude %{_kde4_libdir}/kde4/devel/
+%{_kde4_sysconfdir}/xdg/menus/*.menu
+%doc %{_mandir}/man*/*
%files devel
%defattr(-,root,root,-)
-%{_bindir}/checkXML
-%{_bindir}/dcopidl*
-%{_bindir}/kconfig_compiler
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/makekdewidgets
-%{_datadir}/apps/kdewidgets/
-%dir %{_libdir}/kde3/plugins/designer
-%{_libdir}/kde3/plugins/designer/kdewidgets.*
-%{_datadir}/apps/ksgmltools2/
-%{_includedir}/kde/
-%{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%exclude %{_libdir}/libkdeinit_*.so
-
-%if "%{?apidocs}" == "1"
-%files apidocs
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-devel-%{kde_major_version}
-%{_docdir}/HTML/en/kdelibs*
-%endif
+%doc KDE4PORTING.html
+%{_kde4_bindir}/kconfig_compiler4
+%{_kde4_bindir}/makekdewidgets4
+%{_kde4_appsdir}/kdewidgets/
+%dir %{_kde4_libdir}/kde4/plugins/designer
+%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
+%{_kde4_appsdir}/ksgmltools2/
+%{_kde4_includedir}/*
+%{_kde4_libdir}/kde4/devel/
%changelog
-* Tue Oct 30 2007 Rex Dieter - 3.5.8-8
-- Provides: crystalsvg-icon-theme
+* Tue Nov 29 2007 Rex Dieter 3.96.2-1
+- kde-3.96.2
-* Thu Oct 25 2007 Rex Dieter - 3.5.8-7
-- fix application of custom zoom patch (rh#335461)
+* Tue Nov 27 2007 Rex Dieter 3.96.1-1
+- kde-3.96.1
-* Tue Oct 23 2007 Than Ngo - 3.5.8-6
-- Resolves: rh#335461, kpdf and kview lost custom zoom
+* Tue Nov 20 2007 Rex Dieter 3.96.0-4
+- Requires: kdebase-runtime oxygen-icon-theme (where available)
-* Thu Oct 18 2007 Than Ngo - 3.5.8-5
-- bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH
+* Mon Nov 19 2007 Rex Dieter 3.96.0-3
+- Requires: dbus-x11 (#390851)
-* Wed Oct 17 2007 Than Ngo 3.5.8-4
-- apply upstream patch to fix http-regression
+* Mon Nov 19 2007 Rex Dieter 3.96.0-2
+- -devel: (Build)Requires: libXcomposite-devel libXdamage-devel
+ libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel
+ libXv-devel libXxf86misc-devel
+- devel: Requires: strigi-devel >= 0.5.7
+- (Build)Requires: kde-filesystem >= 4
-* Mon Oct 15 2007 Rex Dieter 6:3.5.8-3
-- respin (for openexr-1.6.0)
+* Thu Nov 15 2007 Rex Dieter 3.96.0-1
+- kde-3.96.0
-* Fri Oct 12 2007 Rex Dieter 6:3.5.8-2
-- kde-3.5.8
+* Sat Nov 10 2007 Rex Dieter 3.95.2-2
+- BR: strigi-devel >= 0.5.7, soprano-devel >= 1.97.1
+- License: LGPLv2 (only)
-* Tue Sep 25 2007 Than Ngo - 6:3.5.7-23
-- fix rh#243611, autostart from XDG_CONFIG_DIRS
+* Fri Nov 09 2007 Rex Dieter 3.95.2-1
+- kde-3.95.2
-* Sat Sep 09 2007 Kevin Kofler 6:3.5.7-22
-- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
- (allows using the old /opt/kde4 versions for now)
+* Tue Nov 06 2007 Rex Dieter 3.95.0-2
+- fix parallel_devel patch (typo in KDE4_KPARTS_LIBRARY)
-* Wed Aug 22 2007 Rex Dieter 6:3.5.7-21
-- vcard30 patch (kde#115219,rh#253496)
-- -devel: restore awol Requires (< f8 only) (#253801)
-- License: LGPLv2
+* Sun Nov 04 2007 Rex Dieter 3.95.0-1
+- kde-3.95.0 (kde4 dev platform rc1)
-* Wed Aug 15 2007 Rex Dieter 6:3.5.7-20
-- CVE-2007-3820, CVE-2007-4224, CVE-2007-4225
-- clarify licensing
+* Thu Oct 18 2007 Kevin Kofler 3.94.0-2
+- drop optional BR hspell-devel again due to broken x86_64 static library
-* Tue Aug 14 2007 Rex Dieter 6:3.5.7-19
-- ConsoleKit-related patch (#244065)
+* Thu Oct 18 2007 Kevin Kofler 3.94.0-1
+- update to 3.94.0
+- BR soprano-devel >= 1.95.0
+- don't rename js to kjs after installation, fixed upstream
+- update parallel-devel patch
+- drop kde#149704 patch, fixed upstream
+- drop colorscheme-hack patch
+- backport upstream fix for unversioned kpty library (rev 724528)
+- add new BRs hspell-devel and jasper-devel
+- 3.94.0 generates some manpages, add them to the file list
-* Sun Aug 12 2007 Florian La Roche 6:3.5.7-18
-- fix apidocs subpackage requires
+* Thu Oct 4 2007 Kevin Kofler 3.93.0-11
+- don't make this the default kdelibs on F9 yet
+- retry ppc64 build (#300571)
-* Mon Aug 06 2007 Than Ngo - 6:3.5.7-17
-- cleanup
+* Fri Sep 21 2007 Kevin Kofler 3.93.0-10
+- ExcludeArch: ppc64 (#300571)
-* Fri Aug 03 2007 Rex Dieter - 6:3.5.7-16
-- undo kdelibs3 rename (for now, anyway)
+* Thu Sep 20 2007 Rex Dieter 3.93.0-9
+- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
+- update sources
+- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch
+
+* Fri Sep 14 2007 Kevin Kofler 3.93.0-8
+- rename js to kjs because of file conflict (kde#149840)
+
+* Thu Sep 13 2007 Kevin Kofler 3.93.0-7
+- actually install kde4.sh and kde4.csh
+- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
+ (workaround for #244065 no longer needed, fixed in 3.93.0)
+
+* Thu Sep 13 2007 Kevin Kofler 3.93.0-6
+- set QT_PLUGIN_PATH in kde4.sh and kde4.csh
+
+* Wed Sep 12 2007 Kevin Kofler 3.93.0-5
+- fix strange coloring due to incomplete changes to KColorScheme
+
+* Mon Sep 10 2007 Kevin Kofler 3.93.0-4
+- use upstream fix (by David Faure) for kde#149704
+
+* Mon Sep 10 2007 Kevin Kofler 3.93.0-3
+- fix kde#149703, kde#149704, kde#149705
+
+* Sun Sep 9 2007 Kevin Kofler 3.93.0-2
+- remove files which conflict with KDE 3
+- rename kconfig_compiler and makekdewidgets to *4
+- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
+- drop Conflicts: kdelibs-devel
+
+* Sun Sep 9 2007 Kevin Kofler 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop kdeprint soversion conflict patch (fixed upstream)
+- remove icon-related code, pics/ is now in kdebase-runtime
+- BR strigi-devel >= 0.5.5 due to API changes
+- package hicolor presence_* icons which are not in hicolor-icon-theme
+- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)
+
+* Tue Aug 14 2007 Rex Dieter 3.92.0-4
+- -devel: omit most (hopefully) extraneous Requires:
+- use macros.kde4
+- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
+- License clarification
+
+* Fri Aug 03 2007 Rex Dieter 3.92.0-3
+- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
-- License: LGPLv2+
-
-* Fri Jul 20 2007 Rex Dieter - 6:3.5.7-15
-- Obsoletes/Provides: kdelibs-apidocs (kdelibs3)
-
-* Fri Jul 20 2007 Rex Dieter - 6:3.5.7-14
-- toggle kdelibs3 (f8+)
-
-* Wed Jul 18 2007 Rex Dieter - 6:3.5.7-13
-- build fails against cups-1.3 (#248717)
-- incorporate kdelibs3 bits (not enabled... yet)
-
-* Wed Jul 18 2007 Rex Dieter - 6:3.5.7-10
-- +Requires: kde-filesystem
-
-* Mon Jul 09 2007 Rex Dieter - 6:3.5.7-9
-- omit ICEauthority patch (kde#147454, rh#243560, rh#247455)
-
-* Wed Jun 20 2007 Rex Dieter - 6:3.5.7-8
-- rework previously botched openssl patch
-
-* Wed Jun 20 2007 Rex Dieter - 6:3.5.7-7
-- -devel: Provides: kdelibs3-devel = ...
-- openssl patch update (portability)
-- drop deprecated ssl-krb5 patch
-
-* Sat Jun 16 2007 Rex Dieter - 6:3.5.7-6
-- Provides: kdelibs3 = %%version-%%release
-
-* Sat Jun 16 2007 Rex Dieter - 6:3.5.7-5
-- -devel: +Requires: libutempter-devel
-
-* Fri Jun 15 2007 Rex Dieter - 6:3.5.7-4
-- omit lib_loader patch (doesn't apply cleanly)
-
-* Fri Jun 15 2007 Rex Dieter - 6:3.5.7-3
-- include experimental libtool patches
-
-* Mon Jun 11 2007 Rex Dieter - 6:3.5.7-2
-- kdesu: sudo support (kde bug #20914), Requires(hint): sudo
-
-* Wed Jun 06 2007 Than Ngo - 6:3.5.7-0.1.fc7
-- 3.5.7
-
-* Thu May 24 2007 Than Ngo 6:3.5.6-10.fc7
-- don't change permission .ICEauthority by sudo KDE programs
-- apply patch to fix locale issue
-- apply upstream patch to fix kde#146105
-
-* Thu May 16 2007 Rex Dieter - 6:3.5.6-9
-- make qtdocdir handling robust
-- kde_settings=1
-- Req: -desktop-backgrounds-basic
-
-* Wed May 16 2007 Than Ngo - 3.5.6-8.fc7
-- add correct qt-version to build kde apidocs ,bz#239947
-- disable kde_settings
-
-* Thu May 14 2007 Rex Dieter - 6:3.5.6-7
-- BR: +keyutils-libs-devel (until krb5 is fixed, bug #240220)
-
-* Thu May 14 2007 Rex Dieter - 6:3.5.6-6
-- kde.sh: fix typo/thinko
-
-* Thu May 14 2007 Rex Dieter - 6:3.5.6-5
-- %%changelog: prune pre-kde3 entries
-- %%ghost %%{_datadir}/services/ksycoca
-- omit extraneous .la file references (#178733)
-- BR: jasper-devel OpenEXR-devel
-- xdg-menu compat symlinks (to help transition to using XDG_MENU_PREFIX)
-- fix kde#126812.patch to be non-empty
-- cleanup kde.(sh|csh)
-- Requires: +kde-settings -redhat-artwork
-- make apidocs build optional (default on)
-- use FHS-friendly /etc/kde (#238136)
-
-* Mon Mar 26 2007 Than Ngo - 6:3.5.6-3.fc7
-- apply upstream patch to fix build issue with qt-3.3.8
-- apply upstream patch to to fix crash on particular 404 url
- in embedded HTML viewer
-
-* Tue Feb 27 2007 Than Ngo - 6:3.5.6-2.fc7
-- cleanup specfile
-
-* Mon Feb 05 2007 Than Ngo - 6:3.5.6-1.fc7
-- 3.5.6
-- apply patch to fix #225420, CVE-2007-0537 Konqueror improper
- HTML comment rendering, thanks to Dirk Müller, KDE security team
-
-* Tue Nov 14 2006 Than Ngo - 6:3.5.5-1.fc7
-- rebuild
-
-* Fri Oct 27 2006 Than Ngo 6:3.5.5-0.2
-- add missing api docs
-
-* Wed Oct 25 2006 Than Ngo 6:3.5.5-0.1
-- update to 3.5.5
-
-* Sun Oct 01 2006 Than Ngo 6:3.5.4-10
-- fix utf8 issue in kdeprint
-- fix #178320,#198828, follow menu-spec
-- upstream patches,
- fix #106748, Evaluate scripts in