Hello community, here is the log from the commit of package kdelibs3 checked in at Sun Aug 6 21:52:42 CEST 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-07-28 14:43:23.000000000 +0200 +++ kdelibs3/kdelibs3.changes 2006-08-04 15:21:36.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 4 15:19:31 CEST 2006 - stbinner@suse.de + +- #define KDELIBS_SUSE in kdeversion.h +- patch kfile for better beagle:/ support +- fix new X.org font paths for testkhtml + +------------------------------------------------------------------- New: ---- fix-fonts-path.diff kdeversion.diff kfile-beagle.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.SOGv6u/_old 2006-08-06 21:52:22.000000000 +0200 +++ /var/tmp/diff_new_pack.SOGv6u/_new 2006-08-06 21:52:22.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.4 -Release: 1 +Release: 2 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.SOGv6u/_old 2006-08-06 21:52:22.000000000 +0200 +++ /var/tmp/diff_new_pack.SOGv6u/_new 2006-08-06 21:52:22.000000000 +0200 @@ -21,7 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.4 -Release: 1 +Release: 2 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -40,6 +40,7 @@ Source11: 10888-bt.tar.gz Source12: mimetype-icons.tar.bz2 Patch0: 3_5_BRANCH.diff +Patch1: kdeversion.diff Patch2: admin.diff Patch3: show-distribution.diff Patch5: applications.menu-fallback.diff @@ -93,6 +94,7 @@ Patch108: patch-mimetype-iconnames.diff Patch109: fix-kerberos-printing.diff Patch110: printpreview.patch +Patch111: kfile-beagle.diff %description This package contains kdelibs, one of the basic packages of the K @@ -184,6 +186,7 @@ echo %suse_version %setup -q -n kdelibs-%{version} #%patch0 +%patch1 %patch3 %patch5 %patch7 @@ -252,6 +255,7 @@ %patch108 %patch109 %patch110 +%patch111 tar xfvj %SOURCE12 # # define KDE version exactly @@ -732,6 +736,10 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Fri Aug 04 2006 - stbinner@suse.de +- #define KDELIBS_SUSE in kdeversion.h +- patch kfile for better beagle:/ support +- fix new X.org font paths for testkhtml * Sun Jul 23 2006 - coolo@suse.de - update to KDE 3.5.4: * several katepart, khtml and kjs fixes ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.SOGv6u/_old 2006-08-06 21:52:22.000000000 +0200 +++ /var/tmp/diff_new_pack.SOGv6u/_new 2006-08-06 21:52:22.000000000 +0200 @@ -16,12 +16,13 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.4 -Release: 1 +Release: 2 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 #Patch0: 3_5_BRANCH.diff Patch2: disable-hidden-visibility.diff +Patch3: fix-fonts-path.diff %description Test suite building out of kdelibs sources a large set of tests @@ -37,6 +38,7 @@ # testkhtml uses internal symbols, disable hidden visibility #%patch0 %patch2 +%patch3 . /etc/opt/kde3/common_options update_admin --unsermake ++++++ fix-fonts-path.diff ++++++ --- khtml/test_regression.cpp 2006/08/03 08:13:54 1.1 +++ khtml/test_regression.cpp 2006/08/03 08:19:08 @@ -480,7 +480,7 @@ xvfb = fork(); if ( !xvfb ) { char buffer[2000]; - sprintf( buffer, "%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:unscaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/misc,/usr/share/fonts/X11/75dpi:unscaled,/usr/share/fonts/X11/Type1," + sprintf( buffer, "%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:unscaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/Type1," "/usr/lib/X11/fonts/75dpi:unscaled,/usr/lib/X11/fonts/misc:unscaled,/usr/lib/X11/fonts/Type1", (const char *)baseDir ); execl( xvfbPath8.data(), xvfbPath8.data(), "-once", "-dpi", "100", "-screen", "0", "1024x768x16", "-ac", "-fp", buffer, ":47", (char*)NULL ); ++++++ kdeversion.diff ++++++ --- kdecore/kdeversion.h 2006/08/03 09:08:33 1.1 +++ kdecore/kdeversion.h 2006/08/03 09:08:58 @@ -33,6 +33,8 @@ #define KDE_IS_VERSION(a,b,c) ( KDE_VERSION >= KDE_MAKE_VERSION(a,b,c) ) +#define KDELIBS_SUSE + /** * Namespace for general KDE functions. */ ++++++ kfile-beagle.diff ++++++ --- kio/kfile/kurlbar.cpp 2006/08/04 11:51:57 1.1 +++ kio/kfile/kurlbar.cpp 2006/08/04 12:07:57 @@ -605,8 +605,13 @@ if ( !url.isValid() || !KProtocolInfo::isKnownProtocol( url )) return; // nothing we could do. + QString description = config->readEntry( QString("Description_") + number ); + + if (description.isEmpty() && url.protocol()=="beagle") + description = i18n("Desktop Search"); + insertItem( url, - config->readEntry( QString("Description_") + number ), + description, applicationLocal, config->readEntry( QString("Icon_") + number ), static_castKIcon::Group( --- kio/kfile/kfiledialog.cpp 2006/08/04 12:18:44 1.1 +++ kio/kfile/kfiledialog.cpp 2006/08/04 12:59:03 @@ -1165,6 +1165,12 @@ d->pathCombo->setURL( url ); } + if (url.protocol()=="beagle" && url.path()=="/") { + d->pathCombo->setEditText("beagle:/<"+i18n("search term")+">"); + d->pathCombo->lineEdit()->setSelection(8,255); + d->pathCombo->setFocus(); + } + locationEdit->blockSignals( true ); locationEdit->setCurrentItem( 0 ); if ( d->keepLocation ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...