don't use %%kde4_bindir in scriptets

make KDE_IS_PRELINKED conditional (again)
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
2007-09-20 14:41:16 +00:00 · 2007-09-20 14:39:45 +00:00 · 2007-09-20 14:24:32 +00:00 · 2007-09-13 22:11:52 +00:00 · 2007-09-13 08:04:47 +00:00 · 2007-09-13 04:50:36 +00:00
35 changed files with 791 additions and 2170 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,3 +1,3 @@
 clog
-kdelibs-3.5.6.tar.bz2
-kdelibs-3.5.7.tar.bz2
+kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2
--- a/1
+++ b/1
@ -0,0 +1 @@
+devel
--- a/devices.protocol
+++ b/devices.protocol
@ -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
--- a/kde-3.5-libtool-shlibext.patch
+++ b/kde-3.5-libtool-shlibext.patch
@ -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",
--- a/kde.csh
+++ b/kde.csh
@ -1,17 +0,0 @@
-## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
-## for possible entries here
-
-#  When/if using prelinking, avoids (some) use of kdeinit
-if ( -f /etc/sysconfig/prelink ) then
-   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-   if ( "$PRELINKING" == "yes" )  then
-      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-   endif
-endif
-
-# if not using IP6, speeds DNS operations
-# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 
-
-# Make sure KDEDIRS is set
-if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-
--- a/kde4.csh
+++ b/kde4.csh
@ -0,0 +1,18 @@
+## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
+## for possible entries here
+
+## Make sure KDEDIRS is set
+if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
+
+## 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
+     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
+endif
--- a/kde4.sh
+++ b/kde4.sh
@ -1,6 +1,9 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here

+## Make sure KDEDIRS is set
+[ -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
@ -8,8 +11,7 @@ if [ -f /etc/sysconfig/prelink ]; then
  fi
 fi

-## IPV6 support
-#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
-## Make sure KDEDIRS is set
-[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
+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
--- a/kdelibs-3.0.0-ndebug.patch
+++ b/kdelibs-3.0.0-ndebug.patch
@ -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.
--- a/kdelibs-3.0.4-ksyscoca.patch
+++ b/kdelibs-3.0.4-ksyscoca.patch
@ -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();
- 
--- a/kdelibs-3.2.3-cups.patch
+++ b/kdelibs-3.2.3-cups.patch
@ -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
--- a/kdelibs-3.3.2-ppc.patch
+++ b/kdelibs-3.3.2-ppc.patch
@ -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 <config.h>
- #include "kcpuinfo.h"
- 
-+#undef HAVE_PPC_ALTIVEC
- 
- #if defined(__GNUC__) || defined(__INTEL_COMPILER)
- #  define HAVE_GNU_INLINE_ASM
--- a/kdelibs-3.4.0-qtdoc.patch
+++ b/kdelibs-3.4.0-qtdoc.patch
@ -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)
--- a/kdelibs-3.4.91-buildroot.patch
+++ b/kdelibs-3.4.91-buildroot.patch
@ -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"
--- a/kdelibs-3.4.92-inttype.patch
+++ b/kdelibs-3.4.92-inttype.patch
@ -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 <sys/bitypes.h> /* For uintXX_t on Tru64 */
- #endif
- 
-+#include <inttypes.h>
-+
- #include "sha1.h"
- #include <string.h>
- 
--- a/kdelibs-3.5.0-101956.patch
+++ b/kdelibs-3.5.0-101956.patch
@ -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;
--- a/kdelibs-3.5.1-xdg-menu.patch
+++ b/kdelibs-3.5.1-xdg-menu.patch
@ -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 @@
- 					<Category>Core</Category>
- 					<Not><Category>KDE</Category></Not>
- 				</And>
-				<!-- Don't list SUSE's YaST in here -->
-				<Category>X-SuSE-YaST</Category>
-+				<Category>X-Red-Hat-Base</Category>
- 			</Not>
- 		</Include>
- 	</Menu>
-        <Menu>
-+                <Name>System Settings</Name>
-+                <MergeFile>system-settings.menu</MergeFile>
-+       </Menu>
-+
-+       <Menu>
-                 <Name>Development</Name>
-                 <Directory>kde-development.directory</Directory>
-                 <Menu>
--- a/kdelibs-3.5.2-cupsdconf2-group.patch
+++ b/kdelibs-3.5.2-cupsdconf2-group.patch
@ -1,25 +0,0 @@
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template.tn	2006-05-22 14:51:46.000000000 +0200
-+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template	2006-05-22 15:27:27.000000000 +0200
-@@ -275,9 +275,9 @@
- # must be <b>sys</b>, however you can configure things for another
- # group as needed.</p>
- # <p>
-# <i>ex</i>: sys</p>
-+# <i>ex</i>: lp</p>
- $$
-#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;
--- a/kdelibs-3.5.2-kdebug-kmail-quiet.patch
+++ b/kdelibs-3.5.2-kdebug-kmail-quiet.patch
@ -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]
--- a/kdelibs-3.5.4-kabc-make.patch
+++ b/kdelibs-3.5.4-kabc-make.patch
@ -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
--- a/kdelibs-3.5.4-kdeprint-utf8.patch
+++ b/kdelibs-3.5.4-kdeprint-utf8.patch
@ -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()
--- a/kdelibs-3.5.5-kstandarddirs.patch
+++ b/kdelibs-3.5.5-kstandarddirs.patch
@ -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;
-             }
-         }
--- a/kdelibs-3.5.5-lib_loader-1.2.patch
+++ b/kdelibs-3.5.5-lib_loader-1.2.patch
@ -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 <boost/filesystem/exception.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/path.hpp>
-+#include <boost/regex.hpp>
-+
-+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());
-    }
--- a/kdelibs-3.5.6-137675.patch
+++ b/kdelibs-3.5.6-137675.patch
@ -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
- 
--- a/kdelibs-3.5.6-lang.patch
+++ b/kdelibs-3.5.6-lang.patch
@ -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 )
--- a/kdelibs-3.5.6-utempter.patch
+++ b/kdelibs-3.5.6-utempter.patch
@ -1,113 +0,0 @@
-diff -Nur kdelibs-3.5.6.orig/configure.in kdelibs-3.5.6/configure.in
--- kdelibs-3.5.6.orig/configure.in	2007-01-24 09:52:48.000000000 +0100
-+++ kdelibs-3.5.6/configure.in	2007-02-05 23:01:44.000000000 +0100
-@@ -399,7 +399,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/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 <utmp.h>
- #endif
- 
-+#ifdef HAVE_UTEMPTER
-+# include <utempter.h>
-+#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 -Nur kdelibs-3.5.6.orig/kdecore/Makefile.in kdelibs-3.5.6/kdecore/Makefile.in
--- kdelibs-3.5.6.orig/kdecore/Makefile.in	2007-01-24 09:54:07.000000000 +0100
-+++ kdelibs-3.5.6/kdecore/Makefile.in	2007-02-05 23:04:12.000000000 +0100
-@@ -787,9 +787,9 @@
- 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
- 	kqiodevicegzip_p.cpp ktimezones.cpp ksycoca_skel.cpp kappdcopiface_skel.cpp kdebugdcopiface_skel.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
- #>+ 1
-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
-+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_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 \
--- a/kdelibs-3.5.7-cups13.patch
+++ b/kdelibs-3.5.7-cups13.patch
@ -1,82 +0,0 @@
--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2006-10-01 12:33:43.000000000 -0500
-+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-19 15:12:48.000000000 -0500
-@@ -108,7 +108,8 @@ cupsGetConf(void)
-       * See if we should retry the current digest password...
-       */
- 
-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0 ||
-           digest_tries > 1 || !pwdstring[0])
-       {
-        /*
-@@ -116,7 +117,7 @@ cupsGetConf(void)
- 	*/
- 
- 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
-        	 cups_server->hostname);
-+        	 cupsServer());
- 
-         if ((password = cupsGetPassword(prompt)) == NULL)
- 	  break;
-@@ -135,7 +136,8 @@ cupsGetConf(void)
-       * Got a password; encode it for the server...
-       */
- 
-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0)
-       {
-        /*
- 	* Basic authentication...
-@@ -334,7 +336,8 @@ cupsPutConf(const char *name)		/* I - Na
-       * See if we should retry the current digest password...
-       */
- 
-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0 ||
-           digest_tries > 1 || !pwdstring[0])
-       {
-        /*
-@@ -342,7 +345,7 @@ cupsPutConf(const char *name)		/* I - Na
- 	*/
- 
- 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
-        	 cups_server->hostname);
-+        	 cupsServer());
- 
-         if ((password = cupsGetPassword(prompt)) == NULL)
- 	  break;
-@@ -361,7 +364,8 @@ cupsPutConf(const char *name)		/* I - Na
-       * Got a password; encode it for the server...
-       */
- 
-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
-+		  "Basic", 5) == 0)
-       {
-        /*
- 	* Basic authentication...
--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-01-15 05:34:19.000000000 -0600
-+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:15:09.000000000 -0500
-@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
- 		return false;
- 	}
- 
-#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
-+    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
- 	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
- #endif
- 
-@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
- 	}
- 
- 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
-#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
-+    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
- 	cups_authstring = HTTP->authstring;
- #endif
- 	httpClose(HTTP);
--- a/kdelibs-3.5.7-kde#146105.patch
+++ b/kdelibs-3.5.7-kde#146105.patch
@ -1,36 +0,0 @@
-Index: kdecore/kcmdlineargs.cpp
-===================================================================
--- kdecore/kcmdlineargs.cpp	(Revision 669593)
-+++ kdecore/kcmdlineargs.cpp	(Revision 669594)
-@@ -1248,21 +1248,22 @@
- 
- KURL KCmdLineArgs::makeURL(const char *_urlArg)
- {
-   QString urlArg = QFile::decodeName(_urlArg);
-   if (!QDir::isRelativePath(urlArg))
-   {
-+   const QString urlArg = QFile::decodeName(_urlArg);
-+   QFileInfo fileInfo(urlArg);
-+   if (!fileInfo.isRelative()) { // i.e. starts with '/', on unix
-       KURL result;
-       result.setPath(urlArg);
-       return result; // Absolute path.
-    }
- 
-   if ( !KURL::isRelativeURL(urlArg) )
-     return KURL(urlArg); // Argument is a URL
-+   if ( KURL::isRelativeURL(urlArg) || fileInfo.exists() ) {
-+      KURL result;
-+      result.setPath( cwd()+'/'+urlArg );
-+      result.cleanPath();
-+      return result;  // Relative path
-+   }
- 
-   KURL result;
-   result.setPath( cwd()+"/"+urlArg );
-   result.cleanPath();
-   return result;  // Relative path
-+   return KURL(urlArg); // Argument is a URL
- }
- 
- void
--- a/kdelibs-3.5.7-openssl.patch
+++ b/kdelibs-3.5.7-openssl.patch
@ -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
--- a/kdelibs-3.93.0-colorscheme-hack.diff
+++ b/kdelibs-3.93.0-colorscheme-hack.diff
@ -0,0 +1,27 @@
+diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
+--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
+@@ -114,8 +114,8 @@
+     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
+ 
+     // apply state adjustments
+-    if (state != QPalette::Active) {
+-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
+     }
+ 
+     // calculated backgrounds
+@@ -238,11 +238,7 @@
+             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
+             break;
+         case Selection:
+-            // inactiver/disabled uses Window colors instead, ala gtk
+-            if (state == QPalette::Active)
+-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
+-            else
+-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
+             break;
+         case Tooltip:
+             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);
--- a/kdelibs-3.93.0-kde149703.diff
+++ 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
--- a/kdelibs-3.93.0-kde149704.diff
+++ b/kdelibs-3.93.0-kde149704.diff
@ -0,0 +1,71 @@
+Index: xmlgui/kxmlguiclient.cpp
+===================================================================
+--- xmlgui/kxmlguiclient.cpp	(revision 709581)
+++ xmlgui/kxmlguiclient.cpp	(working copy)
+@@ -785,11 +785,11 @@
+     allDocuments.append( d );
+   }
+ 
+-  QList<DocStruct>::Iterator best = allDocuments.end();
+  QList<DocStruct>::const_iterator best = allDocuments.end();
+   uint bestVersion = 0;
+ 
+-  QList<DocStruct>::Iterator docIt = allDocuments.begin();
+-  QList<DocStruct>::Iterator docEnd = allDocuments.end();
+  QList<DocStruct>::const_iterator docIt = allDocuments.begin();
+  const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
+   for (; docIt != docEnd; ++docIt )
+   {
+     QString versionStr = findVersionNumber( (*docIt).data );
+@@ -814,19 +814,19 @@
+   {
+     if ( best != allDocuments.begin() )
+     {
+-      QList<DocStruct>::Iterator local = allDocuments.begin();
+      QList<DocStruct>::iterator local = allDocuments.begin();
+      if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
+ 
+-      // load the local document and extract the action properties
+-      QDomDocument document;
+-      document.setContent( (*local).data );
+        // load the local document and extract the action properties
+        QDomDocument document;
+        document.setContent( (*local).data );
+ 
+-      ActionPropertiesMap properties = extractActionProperties( document );
+        ActionPropertiesMap properties = extractActionProperties( document );
+ 
+-      // in case the document has a ActionProperties section
+-      // we must not delete it but copy over the global doc
+-      // to the local and insert the ActionProperties section
+-      if ( !properties.isEmpty() )
+-      {
+        // in case the document has a ActionProperties section
+        // we must not delete it but copy over the global doc
+        // to the local and insert the ActionProperties section
+        if ( !properties.isEmpty() ) {
+           // now load the global one with the higher version number
+           // into memory
+           document.setContent( (*best).data );
+@@ -845,14 +845,14 @@
+             f.write( utf8data.constData(), utf8data.length() );
+             f.close();
+           }
+        }
+        else
+        {
+          QString f = (*local).file;
+          QString backup = f + QLatin1String( ".backup" );
+          QFile::rename( f, backup );
+        }
+       }
+-      else
+-      {
+-        QString f = (*local).file;
+-        QString backup = f + QLatin1String( ".backup" );
+-        QDir dir;
+-        dir.rename( f, backup );
+-      }
+     }
+     doc = (*best).data;
+     return (*best).file;
--- a/kdelibs-3.93.0-kde149705.diff
+++ b/kdelibs-3.93.0-kde149705.diff
@ -0,0 +1,38 @@
+diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
+--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
+@@ -504,7 +504,7 @@
+         return *_theme;
+ 
+     KConfigGroup cg(KGlobal::config(), "Icons");
+-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
+     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
+ /*    if (_theme->isEmpty())
+     {
+diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
+--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
+@@ -856,7 +856,7 @@
+ #ifdef Q_WS_X11
+     KConfigGroup pConfig (KGlobal::config(), "General");
+     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
+-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
+ 
+     if (kde_overrideStyle.isEmpty()) {
+         // ### add check whether we already use the correct style to return then
+diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
+--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.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-3.93.0-parallel-devel.diff
+++ b/kdelibs-3.93.0-parallel-devel.diff
@ -0,0 +1,303 @@
+diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake	2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2007-09-09 09:38:58.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
+ # 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:
+@@ -125,7 +125,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)
+@@ -265,24 +265,24 @@
+    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)
+@@ -321,83 +321,83 @@
+    # 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_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+    set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_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} )
+ 
+-   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+    set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
+ 
+    if (UNIX)
+-      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.
+-   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+    #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
+ 
+    # Can't do that, it's not always compiled. See FindKMetaData.cmake
+-   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
+    #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
+ 
+    get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
+@@ -408,8 +408,8 @@
+ 
+    # 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 )
+@@ -417,8 +417,8 @@
+    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)
+@@ -569,7 +569,8 @@
+                               "${_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" )
+@@ -908,9 +909,9 @@
+    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 -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
+--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh	2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2007-09-09 09:09:44.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 -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
+--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl	2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2007-09-09 09:11:00.000000000 +0200
+@@ -15,12 +15,12 @@
+ 
+ $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 -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
+--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2007-09-09 09:11:24.000000000 +0200
+@@ -8,11 +8,11 @@
+ 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 -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
+--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2007-09-09 09:17:02.000000000 +0200
+@@ -8,7 +8,7 @@
+    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 -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
+--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt	2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt	2007-09-09 09:19:15.000000000 +0200
+@@ -16,22 +16,22 @@
+ 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.spec
+++ b/kdelibs.spec
--- a/2
+++ b/2
@ -1 +1 @@
-50ed644f2ec91963570fe2b155652957  kdelibs-3.5.7.tar.bz2
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2
Author	SHA1	Message	Date
Rex Dieter	74d9d25af9	don't use %%kde4_bindir in scriptets	2007-09-20 14:41:16 +00:00
Rex Dieter	34636c1dbe	make KDE_IS_PRELINKED conditional (again)	2007-09-20 14:39:45 +00:00
Rex Dieter	d3176b4968	* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.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	2007-09-20 14:24:32 +00:00
Kevin Kofler	0ac5f387ae	rename js to kjs because of file conflict (kde#149840)	2007-09-13 22:11:52 +00:00
Kevin Kofler	ef77584645	- 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)	2007-09-13 08:04:47 +00:00
Kevin Kofler	63b57aa8e0	set QT_PLUGIN_PATH in kde4.sh and kde4.csh	2007-09-13 04:50:36 +00:00
Kevin Kofler	d005c4b966	fix strange coloring due to incomplete changes to KColorScheme: KColorScheme was in a state of transition when Beta 2 was released, so disabled text isn't handled properly. This hack restores the August 27 behavior (while keeping the August 29 API).	2007-09-12 09:51:29 +00:00
Kevin Kofler	e9bdb5224f	use upstream fix (by David Faure) for kde#149704	2007-09-10 18:21:37 +00:00
Kevin Kofler	8554c6109e	fix kde#149703, kde#149704, kde#149705	2007-09-10 06:00:08 +00:00
Kevin Kofler	3873dd2018	- 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	2007-09-09 11:55:58 +00:00
Kevin Kofler	16b6d23d99	- 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)	2007-09-09 06:34:13 +00:00
Rex Dieter	c4334edadb	* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4 - -devel: omit most (hopefully) extraneous Requires: - use macros.kde4 - -devel: Conflicts: kdelibs-devel (in %_bindir,%_libdir) - License clarification	2007-08-16 16:05:09 +00:00
Rex Dieter	ee3ec1bef4	omit prefix!=/usr bits.	2007-08-14 17:45:48 +00:00
Rex Dieter	230fd666eb	* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 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 - Requires: shared-mime-info	2007-08-03 18:19:59 +00:00
Rex Dieter	15d4673a10	omit needless -DSYSCONF_INSTALL_DIR comment patch1, purpose?	2007-07-30 18:07:34 +00:00
Than Ngo	413d4c1a4b	- fix conlict with kde3 - add -DSYSCONF_INSTALL_DIR	2007-07-30 15:45:29 +00:00
Rex Dieter	769cd04c59	move Version:/Release: before Obsoletes/Provides so that %%version-%%release is properly define	2007-07-29 22:57:30 +00:00
Rex Dieter	e5687f258c	omit crystalsvg icon reference, no longer included	2007-07-29 20:48:04 +00:00
Rex Dieter	823a57e412	s/openexr/OpenEXR/	2007-07-29 19:57:24 +00:00
Rex Dieter	b779d9c9d5	+kde4.(sh\|csh) +BR: enchant-devel openexr-devel	2007-07-29 19:46:14 +00:00
Rex Dieter	5587f8ec8d	update description update kde4home patch (thanks Kevin!)	2007-07-29 19:03:40 +00:00
Rex Dieter	8e54035bd1	s/alpha/beta/	2007-07-29 02:29:06 +00:00
Rex Dieter	b3927d5808	Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1 - kde-3.92.0 (kde4-beta1) build not tested, curently missing (at least) strigi >= 0.5.3	2007-07-29 00:44:09 +00:00
Rex Dieter	85d618923f	sync w/kde-redhat pkg updates	2007-07-24 23:31:16 +00:00
Than Ngo	f8a6df6981	kdelibs alpha2	2007-07-24 13:03:58 +00:00