Hello community, here is the log from the commit of package kdelibs3 checked in at Fri May 19 02:04:16 CEST 2006. -------- --- KDE/kdelibs3/kdelibs3-devel-doc.changes 2006-03-07 12:22:01.000000000 +0100 +++ kdelibs3/kdelibs3-devel-doc.changes 2006-03-20 13:32:01.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 20 13:31:55 CET 2006 - stbinner@suse.de + +- update to KDE 3.5.2 + +------------------------------------------------------------------- --- KDE/kdelibs3/kdelibs3.changes 2006-05-17 17:31:52.000000000 +0200 +++ kdelibs3/kdelibs3.changes 2006-05-18 10:36:29.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 15 16:49:14 CEST 2006 - stbinner@suse.de + +- update to KDE 3.5.2 and 3_5_BRANCH.diff + * fixes to Kate + * khtml: fixes and performance improvements + * kjs: fixes and performance improvements + +------------------------------------------------------------------- @@ -4 +12 @@ -- fix kerberos handling in kprinter (#154334) +- fix kerberos handling in kprinter (#154334) --- KDE/kdelibs3/testkhtml.changes 2006-02-28 13:13:03.000000000 +0100 +++ kdelibs3/testkhtml.changes 2006-03-20 13:31:47.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 20 13:31:43 CET 2006 - stbinner@suse.de + +- update to KDE 3.5.2 + +------------------------------------------------------------------- Old: ---- 04_startup_phases_kdelibs.patch 3_5_BRANCH-r518199.diff 3_5_BRANCH-r521012.diff 3_5_BRANCH-r522108.diff 3_5_BRANCH-r523122.diff 3_5_BRANCH-r526455.diff 3_5_BRANCH-r536436.diff colordialog.diff fix-kdirwatch-crash.diff fix-khtml-pixmap-leak.patch fix-kurllabel-regression.diff fix-non-utf8-title.diff kdelibs-3.5.1.tar.bz2 kdelibs_kpropertiesdialog_acls.diff kdesu-lc_all.diff kioslave_file_avoid_overwrite.diff kmessagebox-with-kinstance.diff krun-pass-windows.diff New: ---- kdelibs-3.5.2.tar.bz2 kdelibs3-gcc-4.1-miscompile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.cqNqRU/_old 2006-05-19 02:03:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cqNqRU/_new 2006-05-19 02:03:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs3-devel-doc (Version 3.5.1) +# spec file for package kdelibs3-devel-doc (Version 3.5.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation -Version: 3.5.1 -Release: 50 +Version: 3.5.2 +Release: 5 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc @@ -79,7 +79,6 @@ if test "$exitc" != 0; then exit $exitc fi - rm -rf $RPM_BUILD_ROOT/opt/kde3/share/apps/ksgmltools2/customization/xx ln -s $KDEDOCDIR/index.html $RPM_BUILD_ROOT/usr/share/doc/KDE3-API/index.html rm -rf ${RPM_BUILD_ROOT}/opt/kde3/share/apps mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/kdelibs @@ -101,6 +100,8 @@ /opt/kde3/share/doc %changelog -n kdelibs3-devel-doc +* Mon Mar 20 2006 - stbinner@suse.de +- update to KDE 3.5.2 * Tue Mar 07 2006 - coolo@suse.de - require qt3-devel-doc * Wed Mar 01 2006 - coolo@suse.de ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.cqNqRU/_old 2006-05-19 02:03:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cqNqRU/_new 2006-05-19 02:03:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs3 (Version 3.5.1) +# spec file for package kdelibs3 (Version 3.5.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries -Version: 3.5.1 -Release: 50 +Version: 3.5.2 +Release: 5 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -75,34 +75,18 @@ Patch65: integrate-global-pixmaps-new.diff Patch66: integrate-global-pixmaps-10.1.diff Patch70: ktip-icon-hack.diff -Patch71: 04_startup_phases_kdelibs.patch Patch80: CATALOG.kdelibs3.diff Patch81: xml-catalog.diff -Patch82: fix-non-utf8-title.diff -Patch84: fix-kurllabel-regression.diff +Patch83: kdelibs3-gcc-4.1-miscompile.diff Patch85: desktop-translations.diff Patch86: use-xauthlocalhostname.diff -Patch87: colordialog.diff Patch88: mozilla-sliders.patch Patch89: kdeprint-utf8.diff Patch90: kimproxy-warning.diff -Patch91: krun-pass-windows.diff -Patch92: kdelibs_kpropertiesdialog_acls.diff -Patch93: kioslave_file_avoid_overwrite.diff -Patch94: 3_5_BRANCH-r518199.diff Patch95: kdelibs_http_offline_mode.diff -Patch96: fix-khtml-pixmap-leak.patch Patch97: autostart-spec.diff -Patch98: 3_5_BRANCH-r522108.diff -Patch99: 3_5_BRANCH-r523122.diff -Patch100: kmessagebox-with-kinstance.diff -Patch101: kdesu-lc_all.diff -Patch102: 3_5_BRANCH-r521012.diff -Patch103: 3_5_BRANCH-r526455.diff -Patch104: fix-kdirwatch-crash.diff Patch105: kdelibs3-hicolor-scalable-sizes.patch Patch106: use-mediamanager.diff -Patch107: 3_5_BRANCH-r536436.diff Patch108: patch-mimetype-iconnames.diff Patch109: fix-kerberos-printing.diff @@ -238,9 +222,6 @@ %patch64 %endif %endif -%if %suse_version > 1000 -%patch71 -p1 -%endif %patch70 rm -rf admin bunzip2 -cd %{SOURCE8} | tar xfv - --exclude=.cvsignore --exclude=CVS @@ -248,31 +229,18 @@ %patch2 %patch80 -p 1 %patch81 -%patch82 -%patch84 +%if %suse_version > 1000 +%patch83 +%endif %patch85 %patch86 -%patch87 %patch88 %patch89 %patch90 -%patch91 -%patch92 -%patch93 -%patch94 %patch95 -%patch96 %patch97 -%patch98 -%patch99 -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 %patch105 -p 1 %patch106 -%patch107 %patch108 %patch109 tar xfvj %SOURCE12 @@ -758,6 +726,11 @@ * Wed May 17 2006 - dmueller@suse.de - fix kerberos handling in kprinter (#154334) * Mon May 15 2006 - stbinner@suse.de +- update to KDE 3.5.2 and 3_5_BRANCH.diff + * fixes to Kate + * khtml: fixes and performance improvements + * kjs: fixes and performance improvements +* Mon May 15 2006 - stbinner@suse.de - complete OpenDocument mime type icons (#166917) * Tue May 02 2006 - coolo@suse.de - only show kresources in KDE (#170681) ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.cqNqRU/_old 2006-05-19 02:03:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cqNqRU/_new 2006-05-19 02:03:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package testkhtml (Version 3.5.1) +# spec file for package testkhtml (Version 3.5.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ URL: http://www.kde.org License: Other License(s), see package, BSD Group: System/GUI/KDE -Version: 3.5.1 -Release: 50 +Version: 3.5.2 +Release: 5 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 @@ -72,6 +72,8 @@ /opt/kde3/share/apps/khtmltests %changelog -n testkhtml +* Mon Mar 20 2006 - stbinner@suse.de +- update to KDE 3.5.2 * Fri Jan 27 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sat Jan 21 2006 - coolo@suse.de ++++++ 3_5_BRANCH.diff ++++++ ++++ 29157 lines (skipped) ++++ between KDE/kdelibs3/3_5_BRANCH.diff ++++ and kdelibs3/3_5_BRANCH.diff ++++++ admin.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/cvs.sh new/admin/cvs.sh --- old/admin/cvs.sh 2006-01-19 17:04:32.000000000 +0100 +++ new/admin/cvs.sh 2006-03-20 13:33:48.000000000 +0100 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.1\"" + VERSION="\"3.5.2\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/depcomp new/admin/depcomp --- old/admin/depcomp 2005-07-06 23:21:25.000000000 +0200 +++ new/admin/depcomp 2006-03-20 13:33:48.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-05-14.22 +scriptversion=2005-07-09.11 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -467,7 +467,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/install-sh new/admin/install-sh --- old/admin/install-sh 2005-07-06 23:21:25.000000000 +0200 +++ new/admin/install-sh 2006-03-20 13:33:48.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2005-11-07.23 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -58,7 +58,21 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -chmodcmd="$chmodprog 0755" +posix_glob= +posix_mkdir= + +# Symbolic mode for testing mkdir with directories. +# It is the same as 755, but also tests that "u+" works. +test_mode=u=rwx,g=rx,o=rx,u+wx + +# Desired mode of installed file. +mode=0755 + +# Desired mode of newly created intermediate directories. +# It is empty if not known yet. +intermediate_mode= + +chmodcmd=$chmodprog chowncmd= chgrpcmd= stripcmd= @@ -111,7 +125,7 @@ --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" + -m) mode=$2 shift shift continue;; @@ -164,6 +178,8 @@ exit 0 fi +test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15 + for src do # Protect names starting with `-'. @@ -173,15 +189,11 @@ if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -208,53 +220,122 @@ echo "$0: $dstarg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + obsolete_mkdir_used=false - # Make sure that the destination directory exists. + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + posix_mkdir=false + if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then + posix_mkdir=true + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null + fi ;; + esac - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS + if + $posix_mkdir && { - pathcomp= + # With -d, create the new directory with the user-specified mode. + # Otherwise, create it using the same intermediate mode that + # mkdir -p would use when creating intermediate directories. + # POSIX says that this mode is "$(umask -S),u+wx", so use that + # if umask -S works. + + if test -n "$dir_arg"; then + mkdir_mode=$mode + else + case $intermediate_mode in + '') + if umask_S=`(umask -S) 2>/dev/null`; then + intermediate_mode=$umask_S,u+wx + else + intermediate_mode=$test_mode + fi ;; + esac + mkdir_mode=$intermediate_mode + fi + + $mkdirprog -m "$mkdir_mode" -p -- "$dstdir" + } + then : + else - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 + # mkdir does not conform to POSIX, or it failed possibly due to + # a race condition. Create the directory the slow way, step by + # step, checking for races as we go. + + case $dstdir in + /*) pathcomp=/ ;; + -*) pathcomp=./ ;; + *) pathcomp= ;; + esac + + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac + + oIFS=$IFS + IFS=/ + $posix_glob && set -f + set fnord $dstdir shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done + $posix_glob && set +f + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # Don't fail if two instances are running concurrently. + test -d "$pathcomp" || exit 1 + fi + pathcomp=$pathcomp/ + done + obsolete_mkdir_used=true + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -262,7 +343,6 @@ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. $doit $cpprog "$src" "$dsttmp" && @@ -276,10 +356,10 @@ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } && # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ || { # The rename failed, perhaps because mv can't rename something else # to itself, or perhaps because mv is so ancient that it does not @@ -291,11 +371,12 @@ # reasons. In this case, the final cleanup might fail but the new # file should still install successfully. { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 } else @@ -304,16 +385,13 @@ } && # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + $doit $mvcmd "$dsttmp" "$dst" } - } - fi || { (exit 1); exit 1; } -done + } || exit 1 -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} + trap '' 0 + fi +done # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/missing new/admin/missing --- old/admin/missing 2005-07-06 23:21:25.000000000 +0200 +++ new/admin/missing 2006-03-20 13:33:48.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake@gnu.org>." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 + file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + fi touch $file ;; ++++++ desktop-translations.diff ++++++ --- /var/tmp/diff_new_pack.cqNqRU/_old 2006-05-19 02:03:54.000000000 +0200 +++ /var/tmp/diff_new_pack.cqNqRU/_new 2006-05-19 02:03:54.000000000 +0200 @@ -1,43 +1,3 @@ ---- kio/kfile/kpropertiesdialog.cpp (Revision 505306) -+++ kio/kfile/kpropertiesdialog.cpp (Revision 505307) -@@ -3103,12 +3103,10 @@ KDesktopPropsPlugin::KDesktopPropsPlugin - return; - f.close(); - -- KSimpleConfig config( path ); -- config.setDollarExpansion( false ); -- config.setDesktopGroup(); -- QString nameStr = config.readEntry( "Name" ); -- QString genNameStr = config.readEntry( "GenericName" ); -- QString commentStr = config.readEntry( "Comment" ); -+ KDesktopFile config( path ); -+ QString nameStr = config.readName(); -+ QString genNameStr = config.readGenericName(); -+ QString commentStr = config.readComment(); - QString commandStr = config.readPathEntry( "Exec" ); - if (commandStr.left(12) == "ksystraycmd ") - { -@@ -3951,16 +3949,15 @@ KApplicationPropsPlugin::KApplicationPro - return; - f.close(); - -- KSimpleConfig config( path ); -- config.setDesktopGroup(); -- QString commentStr = config.readEntry( "Comment" ); -- QString genNameStr = config.readEntry( "GenericName" ); -+ KDesktopFile config( path ); -+ QString commentStr = config.readComment(); -+ QString genNameStr = config.readGenericName(); - - QStringList selectedTypes = config.readListEntry( "ServiceTypes" ); - // For compatibility with KDE 1.x - selectedTypes += config.readListEntry( "MimeType", ';' ); - -- QString nameStr = config.readEntry( QString::fromLatin1("Name") ); -+ QString nameStr = config.readName(); - if ( nameStr.isEmpty() || d->m_kdesktopMode ) { - // We'll use the file name if no name is specified - // because we _need_ a Name for a valid file. Index: kio/kio/kmimetype.cpp =================================================================== --- kio/kio/kmimetype.cpp (Revision 506454) ++++++ kdelibs-3.5.1.tar.bz2 -> kdelibs-3.5.2.tar.bz2 ++++++ KDE/kdelibs3/kdelibs-3.5.1.tar.bz2 kdelibs3/kdelibs-3.5.2.tar.bz2 differ: char 11, line 1 ++++++ kdelibs3-gcc-4.1-miscompile.diff ++++++ Index: kdecore/kwinmodule.cpp =================================================================== --- kdecore/kwinmodule.cpp (revision 502575) +++ kdecore/kwinmodule.cpp (working copy) @@ -393,7 +393,9 @@ QRect KWinModule::workArea( const QValue if ( strut.bottom > 0 ) r.setBottom( r.bottom() - (int) strut.bottom ); - a = a.intersect(r); + QRect tmp; + tmp = a.intersect(r); + a = tmp; } return a; } ++++++ smooth-scrolling.diff ++++++ --- /var/tmp/diff_new_pack.cqNqRU/_old 2006-05-19 02:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.cqNqRU/_new 2006-05-19 02:03:56.000000000 +0200 @@ -5,7 +5,7 @@ @@ -147,6 +147,9 @@ public: KHTMLViewPrivate() - : underMouse( 0 ), underMouseNonShared( 0 ) + : underMouse( 0 ), underMouseNonShared( 0 ), visibleWidgets( 107 ) +#ifndef NO_SMOOTH_SCROLL_HACK + , dx(0), dy(0), ddx(0), ddy(0), rdx(0), rdy(0), scrolling(false) +#endif ++++++ use-xauthlocalhostname.diff ++++++ --- /var/tmp/diff_new_pack.cqNqRU/_old 2006-05-19 02:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.cqNqRU/_new 2006-05-19 02:03:56.000000000 +0200 @@ -176,19 +176,19 @@ QCString line = fgets(buf, 1024, xFile); if (line.length()) line.truncate(line.length()-1); // Strip LF. -@@ -155,10 +157,19 @@ void KHostName::changeX() - continue; - +@@ -159,12 +159,17 @@ QCString newNetId = newName+netId.mid(i); -+ QCString oldNetId = netId.left(i); - -- cmd = "xauth remove "+KProcess::quote(netId); -- system(QFile::encodeName(cmd)); -- cmd = "xauth add "; + QCString oldNetId = netId.left(i); + +- if(oldNetId != oldName) +- continue; + if(oldNetId != oldName + && (!xauthlocalhostname || strcmp(xauthlocalhostname, oldNetId.data()) != 0)) + continue; -+ + +- cmd = "xauth remove "+KProcess::quote(netId); +- system(QFile::encodeName(cmd)); +- cmd = "xauth add "; + // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it + if (!xauthlocalhostname || oldNetId != xauthlocalhostname) + { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...