Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Fri Jul 22 15:09:13 CEST 2011.
-------- --- KDE/kdelibs4/kdelibs4-apidocs.changes 2011-07-01 11:26:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4-apidocs.changes 2011-07-21 14:50:34.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 21 12:48:40 UTC 2011 - idon...@novell.com + +- Update to 4.6.95 + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 Old: ---- 4_6_BRANCH.diff kdelibs-4.6.5.tar.bz2 ksuseinstall_11.2.diff no_kbookmark_write_error.diff New: ---- kdelibs-4.6.95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -25,7 +25,7 @@ Group: System/GUI/KDE Summary: KDE 4 API documentation Url: http://www.kde.org -Version: 4.6.5 +Version: 4.6.95 Release: 1 Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 @@ -33,7 +33,6 @@ Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_6_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -47,7 +46,6 @@ %prep %setup -q -n kdelibs-%version -%patch0 %build export QTDOCDIR=`pkg-config --variable=docdir Qt` ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -27,14 +27,9 @@ BuildRequires: docbook-xsl-stylesheets docbook_4 libdbusmenu-qt-devel BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel BuildRequires: libgssglue-devel -%if 0%{?suse_version} > 1110 BuildRequires: libudev-devel xz-devel BuildRequires: libpolkit-qt-1-devel -%else -BuildRequires: lzma-devel -BuildRequires: libpolkit-qt-devel -%endif -%if 0%{?suse_version} > 1130 +%if %suse_version > 1130 BuildRequires: utempter-devel %else BuildRequires: utempter @@ -43,7 +38,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.6.5 +Version: 4.6.95 Release: 1 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -57,7 +52,6 @@ Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_6_BRANCH.diff Patch1: kde3-applications.diff Patch2: default-useragent.diff Patch3: add-suse-translations.diff @@ -72,29 +66,22 @@ Patch18: plasma-libs.diff Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff -Patch25: ksuseinstall_11.2.diff -Patch28: no_kbookmark_write_error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %if 0%{?opensuse_bs} %define debug_package_requires %name = %version-%release libqt4-debuginfo %endif -%if %suse_version == 1110 -Requires: %{name}-branding = 11.1 -%endif -%if %suse_version == 1120 -Requires: %{name}-branding = 11.2 -%endif %if %suse_version == 1130 Requires: %{name}-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Requires: %{name}-branding = 11.4 %endif -%if 0%{?suse_version} > 1120 +%if %suse_version > 1140 +Requires: %{name}-branding = 12.1 +%endif Requires: udisks Requires: upower -%endif Requires(post): shared-mime-info Requires(postun): shared-mime-info @@ -114,18 +101,15 @@ Summary: KDE Base Libraries License: LGPLv2.1+ Group: System/GUI/KDE -%if %suse_version == 1110 -Provides: %{name}-branding = 11.1 -%endif -%if %suse_version == 1120 -Provides: %{name}-branding = 11.2 -%endif %if %suse_version == 1130 Provides: %{name}-branding = 11.3 %endif -%if %suse_version > 1130 +%if %suse_version == 1140 Provides: %{name}-branding = 11.4 %endif +%if %suse_version > 1140 +Provides: %{name}-branding = 12.1 +%endif Conflicts: otherproviders(%{name}-branding) Supplements: packageand(kdelibs4:branding-upstream) @@ -142,7 +126,6 @@ %prep %setup -q -n kdelibs-%version -%patch0 %patch1 %patch2 %patch3 @@ -157,10 +140,6 @@ %patch18 %patch20 %patch24 -%if %suse_version < 1130 -%patch25 -%endif -%patch28 -p1 # # define KDE version exactly # @@ -176,7 +155,10 @@ -DCONFIG_INSTALL_DIR=%{_kde_config_dir} \ -DDATA_INSTALL_DIR=%{_kde_share_dir}/apps \ -DKCFG_INSTALL_DIR=%{_kde_share_dir}/config.kcfg \ - -DMIME_INSTALL_DIR=/nogo -DKDE4_ENABLE_FINAL=1 \ + -DMIME_INSTALL_DIR=/nogo \ +%if 0 + -DKDE4_ENABLE_FINAL=1 \ +%endif -DTEMPLATES_INSTALL_DIR=%{_kde_share_dir}/templates \ -DHTML_INSTALL_DIR=%{_kde_html_dir} \ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=/etc" @@ -203,7 +185,6 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/panel.desktop install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/ktip.desktop install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/kdesktop.desktop - install -m 0644 %SOURCE3 $RPM_BUILD_ROOT//usr/share/kde4/apps/katepart/syntax/ycp.xml install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/etc/ mkdir -p $RPM_BUILD_ROOT/%_libdir/kconf_update_bin %kde_post_install @@ -396,11 +377,12 @@ %_kde4_libdir/libplasma.so.* %_kde4_libdir/libsolid.so.* %_kde4_libdir/libthreadweaver.so.* -%_kde4_libdir/libkatepartinterfaces.so.* %_kde4_libdir/libkcmutils.so.* %_kde4_libdir/libkemoticons.so.* %_kde4_libdir/libkidletime.so.* %_kde4_libdir/libkprintutils.so.* +%_kde4_libdir/libkdeclarative.so.* +%_kde4_libdir/libkactivities.so.* /usr/share/locale/all_languages %package -n libkde4-devel @@ -412,11 +394,7 @@ Requires: libkde4 = %version libkdecore4-devel = %version Requires: libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel Requires: libQtWebKit-devel -%if %suse_version > 1110 Requires: libpolkit-qt-1-devel -%else -Requires: libpolkit-qt-devel -%endif Requires: libqt4-devel Requires: giflib-devel alsa-devel cups-devel Requires: avahi-compat-mDNSResponder-devel @@ -488,7 +466,6 @@ %_kde4_iconsdir/hicolor/*/actions/presence_offline.* %_kde4_iconsdir/hicolor/*/actions/presence_online.* %_kde4_iconsdir/hicolor/*/actions/presence_unknown.* -%_kde4_iconsdir/hicolor/scalable/apps/ktexteditorautobrace.* %_kde4_mandir/man*/* /usr/share/mime/packages/kde.xml %exclude %_kde4_libdir/kde4/plugins/script/libkrossqtsplugin.so @@ -502,12 +479,8 @@ License: X11 Group: Development/Libraries/KDE Summary: On-demand installation of packages -%if 0%{?suse_version} >= 1130 # see ksuseinstall_11.2.diff Requires: yast2-packager >= 2.19.7 zypper -%else -Requires: yast2-packager zypper -%endif %requires_ge libqt4-x11 Recommends: ptools ++++++ add-suse-translations.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kdecore/localization/klocale_kde.cpp.orig +++ kdecore/localization/klocale_kde.cpp -@@ -257,6 +257,9 @@ void KLocalePrivate::initMainCatalogs() +@@ -319,6 +319,9 @@ void KLocalePrivate::initMainCatalogs() m_catalogNames.append(KCatalogName(QString::fromLatin1("kdeqt"))); m_catalogNames.append(KCatalogName(QString::fromLatin1("solid_qt"))); m_catalogNames.append(KCatalogName(QString::fromLatin1("kdecalendarsystems"))); ++++++ clever-menu.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -717,6 +717,12 @@ QString KService::untranslatedGenericNam +@@ -739,6 +739,12 @@ QString KService::untranslatedGenericNam return v.isValid() ? v.toString() : QString(); } @@ -266,7 +266,7 @@ =================================================================== --- kdecore/services/kservice.h.orig +++ kdecore/services/kservice.h -@@ -333,6 +333,12 @@ public: +@@ -350,6 +350,12 @@ public: bool noDisplay() const; /** ++++++ default-useragent.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -1,11 +1,10 @@ --- kio/kio/kprotocolmanager.cpp +++ kio/kio/kprotocolmanager.cpp -@@ -87,7 +87,7 @@ - QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \ - X % QL1S(") KHTML/") % \ - QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \ --QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko)") -+QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko) SUSE") - - #define PRIVATE_DATA \ - KProtocolManagerPrivate *d = kProtocolManagerPrivate +@@ -645,6 +645,7 @@ + d->useragent += QString::number(KDE::versionMajor()); + d->useragent += QL1C('.'); + d->useragent += QString::number(KDE::versionMinor()); ++ d->useragent += QL1S(" SUSE"); + } + else + { ++++++ desktop-translations.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -58,7 +58,7 @@ class KDesktopFilePrivate : public KConfigPrivate { -@@ -179,6 +181,29 @@ bool KDesktopFile::isAuthorizedDesktopFi +@@ -174,6 +176,29 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } @@ -88,7 +88,7 @@ QString KDesktopFile::readType() const { Q_D(const KDesktopFile); -@@ -193,20 +218,17 @@ QString KDesktopFile::readIcon() const +@@ -188,20 +213,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { @@ -129,7 +129,7 @@ =================================================================== --- kdecore/config/kconfiggroup.h.orig +++ kdecore/config/kconfiggroup.h -@@ -617,6 +617,11 @@ public: +@@ -621,6 +621,11 @@ public: */ QMap<QString, QString> entryMap() const; @@ -145,7 +145,7 @@ =================================================================== --- kdecore/config/kconfig.cpp.orig +++ kdecore/config/kconfig.cpp -@@ -749,6 +749,17 @@ QString KConfigPrivate::lookupData(const +@@ -881,6 +881,17 @@ QString KConfigPrivate::lookupData(const return entryMap.getEntry(group, key, QString(), flags, expand); } @@ -179,7 +179,7 @@ =================================================================== --- kdecore/config/kconfiggroup.cpp.orig +++ kdecore/config/kconfiggroup.cpp -@@ -1239,6 +1239,16 @@ bool KConfigGroup::hasKey(const char *ke +@@ -1159,6 +1159,16 @@ bool KConfigGroup::hasKey(const char *ke return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); } ++++++ flash-player-non-oss.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- khtml/html/html_objectimpl.cpp.orig +++ khtml/html/html_objectimpl.cpp -@@ -590,14 +590,32 @@ void HTMLObjectBaseElementImpl::slotPart +@@ -606,14 +606,32 @@ void HTMLObjectBaseElementImpl::slotPart // Prepare the URL to show in the question (host only if http, to make it short) KUrl pluginPageURL(embed->pluginPage); QString shortURL = pluginPageURL.protocol() == "http" ? pluginPageURL.host() : pluginPageURL.prettyUrl(); ++++++ hotplug-kde3.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -1,8 +1,8 @@ Index: kdecore/services/kservice.cpp =================================================================== ---- kdecore/services/kservice.cpp 2010-11-19 22:23:06.671000015 +0100 -+++ kdecore/services/kservice.cpp 2010-11-19 22:25:37.760000017 +0100 -@@ -106,6 +106,8 @@ +--- kdecore/services/kservice.cpp.orig ++++ kdecore/services/kservice.cpp +@@ -106,6 +106,8 @@ void KServicePrivate::init( const KDeskt m_bValid = false; return;*/ m_strType = QString::fromLatin1("Application"); ++++++ ignore-inline-menu.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kded/vfolder_menu.cpp.orig +++ kded/vfolder_menu.cpp -@@ -1450,6 +1450,7 @@ static QString parseAttribute( const QDo +@@ -1448,6 +1448,7 @@ static QString parseAttribute( const QDo else kDebug()<<" Error in parsing show_empty attribute :"<<str; } @@ -10,7 +10,7 @@ if ( e.hasAttribute( "inline" ) ) { QString str = e.attribute( "inline" ); -@@ -1488,6 +1489,7 @@ static QString parseAttribute( const QDo +@@ -1486,6 +1487,7 @@ static QString parseAttribute( const QDo else kDebug()<<" Error in parsing inline_alias attribute :"<<str; } ++++++ kde3-applications.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdecore/services/kservice.cpp 2010-11-05 11:48:29.000000000 +0100 -+++ kdecore/services/kservice.cpp 2010-11-19 22:21:52.252000017 +0100 -@@ -64,6 +64,8 @@ +Index: kdecore/services/kservice.cpp +=================================================================== +--- kdecore/services/kservice.cpp.orig ++++ kdecore/services/kservice.cpp +@@ -64,6 +64,8 @@ void KServicePrivate::init( const KDeskt { const QString entryPath = q->entryPath(); bool absPath = !QDir::isRelativePath(entryPath); @@ -9,7 +11,7 @@ // TODO: it makes sense to have a KConstConfigGroup I guess const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup(); -@@ -91,6 +93,8 @@ +@@ -91,6 +93,8 @@ void KServicePrivate::init( const KDeskt if (i != -1) m_strName = m_strName.left(i); } @@ -18,7 +20,7 @@ m_strType = config->readType(); entryMap.remove(QLatin1String("Type")); -@@ -113,6 +117,18 @@ +@@ -113,6 +117,18 @@ void KServicePrivate::init( const KDeskt // NOT readPathEntry, it is not XDG-compliant. Path entries written by // KDE4 will be still treated as such, though. m_strExec = desktopGroup.readEntry( "Exec", QString() ); @@ -37,7 +39,7 @@ entryMap.remove(QLatin1String("Exec")); if (m_strType == QLatin1String("Application")) { -@@ -215,6 +231,8 @@ +@@ -215,6 +231,8 @@ void KServicePrivate::init( const KDeskt m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); entryMap.remove(QLatin1String("InitialPreference")); @@ -46,7 +48,7 @@ // Assign the "initial preference" to each mimetype/servicetype // (and to set such preferences in memory from kbuildsycoca) -@@ -256,6 +274,8 @@ +@@ -256,6 +274,8 @@ void KServicePrivate::init( const KDeskt m_DBUSStartusType = KService::DBusNone; m_strDesktopEntryName = _name.toLower(); @@ -55,7 +57,7 @@ m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true); entryMap.remove(QLatin1String("AllowDefault")); -@@ -275,7 +295,9 @@ +@@ -275,7 +295,9 @@ void KServicePrivate::init( const KDeskt // qDebug("Path = %s", entryPath.toLatin1().constData()); QMap<QString,QString>::ConstIterator it = entryMap.constBegin(); for( ; it != entryMap.constEnd();++it) { ++++++ kdebug-areas-update.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kdecore/kdebug.areas.orig +++ kdecore/kdebug.areas -@@ -710,6 +710,8 @@ +@@ -729,6 +729,8 @@ 100200 kfs ++++++ kdelibs-4.6.5.tar.bz2 -> kdelibs-4.6.95.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.6.5.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.6.95.tar.bz2 differ: char 11, line 1 ++++++ kjs-mark-register-stack.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kjs/collector.cpp.orig +++ kjs/collector.cpp -@@ -532,6 +532,9 @@ static inline void* currentThreadStackBa +@@ -524,6 +524,9 @@ static inline void* currentThreadStackBa return stackBase; } @@ -12,7 +12,7 @@ void Collector::markCurrentThreadConservatively() { -@@ -551,6 +554,11 @@ void Collector::markCurrentThreadConserv +@@ -543,6 +546,11 @@ void Collector::markCurrentThreadConserv void* stackBase = currentThreadStackBase(); markStackObjectsConservatively(stackPointer, stackBase); ++++++ ksuseinstall.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -1,6 +1,8 @@ ---- CMakeLists.txt +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -274,6 +274,7 @@ +@@ -284,6 +284,7 @@ check_library_exists(socket connect "" H add_subdirectory( cmake ) add_subdirectory( kdecore ) add_subdirectory( kdeui ) @@ -8,25 +10,29 @@ if (UNIX) add_subdirectory( kpty ) add_subdirectory( kdesu ) ---- kio/CMakeLists.txt +Index: kio/CMakeLists.txt +=================================================================== +--- kio/CMakeLists.txt.orig +++ kio/CMakeLists.txt -@@ -37,6 +37,7 @@ +@@ -45,6 +45,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/kfile ${CMAKE_CURRENT_BINARY_DIR} # e.g. for observer_stub.h ${KDE4_KDEUI_INCLUDES} + ${CMAKE_SOURCE_DIR}/suseinstall ${KDE4_KDECORE_INCLUDES}/ - ${STRIGI_INCLUDE_DIR} - ${SOPRANO_INCLUDE_DIR} -@@ -308,6 +309,7 @@ + ${ZLIB_INCLUDE_DIR} + +@@ -335,6 +336,7 @@ if(NOT KIO_NO_NEPOMUK) endif(NOT KIO_NO_NEPOMUK) - target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_LIBRARIES} ${KIO_EXTRA_LIBS}) + target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_LIBRARIES} ${KIO_EXTRA_LIBS}) target_link_libraries(kio LINK_INTERFACE_LIBRARIES kdeui kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ) +target_link_libraries(kio ksuseinstall) if(ACL_FOUND) target_link_libraries(kio ${ACL_LIBS}) ---- kio/kio/krun.cpp +Index: kio/kio/krun.cpp +=================================================================== +--- kio/kio/krun.cpp.orig +++ kio/kio/krun.cpp @@ -83,6 +83,8 @@ #include <kwindowsystem.h> @@ -37,7 +43,7 @@ KRun::KRunPrivate::KRunPrivate(KRun *parent) : q(parent), m_showingDialog(false) -@@ -171,6 +173,7 @@ +@@ -171,6 +173,7 @@ bool KRun::runUrl(const KUrl& u, const Q KUrl::List lst; lst.append(u); @@ -45,7 +51,9 @@ KService::Ptr offer = KMimeTypeTrader::self()->preferredService(_mimetype); if (!offer) { ---- suseinstall/CMakeLists.txt +Index: suseinstall/CMakeLists.txt +=================================================================== +--- /dev/null +++ suseinstall/CMakeLists.txt @@ -0,0 +1,27 @@ +#cmake_minimum_required( VERSION 2.6 ) @@ -75,7 +83,9 @@ + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + ) + ---- suseinstall/kbuildsycocaprogressdialog.cpp +Index: suseinstall/kbuildsycocaprogressdialog.cpp +=================================================================== +--- /dev/null +++ suseinstall/kbuildsycocaprogressdialog.cpp @@ -0,0 +1,110 @@ +/* This file is part of the KDE project @@ -188,7 +198,9 @@ +} + +#include "kbuildsycocaprogressdialog.moc" ---- suseinstall/kbuildsycocaprogressdialog.h +Index: suseinstall/kbuildsycocaprogressdialog.h +=================================================================== +--- /dev/null +++ suseinstall/kbuildsycocaprogressdialog.h @@ -0,0 +1,60 @@ +/* This file is part of the KDE project @@ -251,7 +263,9 @@ +} + +#endif ---- suseinstall/ksuseinstall.cpp +Index: suseinstall/ksuseinstall.cpp +=================================================================== +--- /dev/null +++ suseinstall/ksuseinstall.cpp @@ -0,0 +1,579 @@ +/***************************************************************************** @@ -833,7 +847,9 @@ + { + description->setText( descriptions[ list->indexOfTopLevelItem( list->currentItem()) ] ); + } ---- suseinstall/ksuseinstall_export.h +Index: suseinstall/ksuseinstall_export.h +=================================================================== +--- /dev/null +++ suseinstall/ksuseinstall_export.h @@ -0,0 +1,40 @@ +/***************************************************************************** @@ -876,7 +892,9 @@ +#endif + +#endif ---- suseinstall/ksuseinstall.h +Index: suseinstall/ksuseinstall.h +=================================================================== +--- /dev/null +++ suseinstall/ksuseinstall.h @@ -0,0 +1,93 @@ +/***************************************************************************** ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -1,19 +1,44 @@ ---- plasma/corona.cpp -+++ plasma/corona.cpp -@@ -196,7 +196,9 @@ - - if (pluginName.isEmpty() || pluginName == "default") { - // default to the desktop containment -- pluginName = "desktop"; -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); -+ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); -+ pluginName = group.readEntry("containment", "desktop"); - } +Index: plasma/containment.cpp +=================================================================== +--- plasma/containment.cpp.orig ++++ plasma/containment.cpp +@@ -144,6 +144,18 @@ Containment::Containment(const QString & + setHasConfigurationInterface(false); + } + ++Containment::Containment(QObject *parent, const QVariantList &args, bool showToolBox) ++ : Applet(parent, args), ++ d(new ContainmentPrivate(this)) ++{ ++ // WARNING: do not access config() OR globalConfig() in this method! ++ // that requires a scene, which is not available at this point ++ setPos(0, 0); ++ setBackgroundHints(NoBackground); ++ setHasConfigurationInterface(false); ++ d->showToolBox=showToolBox; ++} ++ + Containment::~Containment() + { + delete d; +Index: plasma/containment.h +=================================================================== +--- plasma/containment.h.orig ++++ plasma/containment.h +@@ -128,6 +128,8 @@ class PLASMA_EXPORT Containment : public + */ + Containment(QObject *parent, const QVariantList &args); + ++ Containment(QObject *parent, const QVariantList &args, bool showToolBox); ++ + ~Containment(); - bool loadingNull = pluginName == "null"; ---- plasma/private/containment_p.h + /** +Index: plasma/private/containment_p.h +=================================================================== +--- plasma/private/containment_p.h.orig +++ plasma/private/containment_p.h -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ public: type(Containment::NoContainmentType), showDropZoneDelayTimer(0), drawWallpaper(true), @@ -21,7 +46,7 @@ dropZoneStarted(false), containmentActionsSource(Global) { -@@ -184,6 +185,7 @@ +@@ -185,6 +186,7 @@ public: QHash<KJob*, KMenu*> dropMenus; QTimer *showDropZoneDelayTimer; bool drawWallpaper : 1; @@ -29,9 +54,11 @@ bool dropZoneStarted : 1; enum ContainmentActionsSource { ---- plasma/theme.cpp +Index: plasma/theme.cpp +=================================================================== +--- plasma/theme.cpp.orig +++ plasma/theme.cpp -@@ -78,7 +78,6 @@ +@@ -80,7 +80,6 @@ public: colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)), buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)), viewColorScheme(QPalette::Active, KColorScheme::View, KSharedConfigPtr(0)), @@ -39,18 +66,18 @@ defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX), defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH), defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT), -@@ -94,6 +93,10 @@ +@@ -97,6 +96,10 @@ public: ThemeConfig config; cacheTheme = config.cacheTheme(); -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); -+ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); -+ defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); ++ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); ++ defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); + #ifdef Q_WS_X11 Display *dpy = QX11Info::display(); int screen = DefaultScreen(dpy); -@@ -508,7 +511,10 @@ +@@ -532,7 +535,10 @@ void ThemePrivate::processWallpaperSetti cg = config(); } @@ -62,7 +89,7 @@ defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); -@@ -761,6 +767,10 @@ +@@ -784,6 +790,10 @@ QString Theme::wallpaperPath(const QSize } } ++++++ windeco-color.diff ++++++ --- /var/tmp/diff_new_pack.h01LiI/_old 2011-07-22 15:08:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h01LiI/_new 2011-07-22 15:08:09.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdeui/kernel/kglobalsettings.cpp +Index: kdeui/kernel/kglobalsettings.cpp +=================================================================== +--- kdeui/kernel/kglobalsettings.cpp.orig +++ kdeui/kernel/kglobalsettings.cpp -@@ -327,7 +327,7 @@ +@@ -344,7 +344,7 @@ QColor KGlobalSettings::activeTitleColor return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); #else KConfigGroup g( KGlobal::config(), "WM" ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
