Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Mon Nov 22 23:35:39 CET 2010. -------- --- KDE/kdelibs4/kdelibs4-apidocs.changes 2010-11-18 16:08:07.000000000 +0100 +++ kdelibs4/kdelibs4-apidocs.changes 2010-11-22 23:32:37.541813000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 19 17:13:14 CET 2010 - dmueller@suse.de + +- update to 4.5.80 + * KDE 4.6 Beta1 + * no upstream changelog available. + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 Old: ---- 4_5_BRANCH.diff kdelibs-4.5.3-bko246652.patch kdelibs-4.5.3.tar.bz2 nepomuk-final.diff New: ---- 4_6_BRANCH.diff enable-final-fixes.diff kdelibs-4.5.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4-apidocs (Version 4.5.3) +# spec file for package kdelibs4-apidocs (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,15 +25,15 @@ Group: System/GUI/KDE Summary: KDE 4 API documentation Url: http://www.kde.org -Version: 4.5.3 -Release: 3 +Version: 4.5.80 +Release: 1 Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 Source1: baselibs.conf Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.5.3) +# spec file for package kdelibs4 (Version 4.5.80) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,14 +21,14 @@ BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme BuildRequires: libQtWebKit-devel libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip BuildRequires: bison flex libqca2-devel libsoprano-devel pcre-devel phonon-devel shared-mime-info -BuildRequires: kde4-filesystem pkg-config strigi strigi-devel update-desktop-files +BuildRequires: grantlee-devel kde4-filesystem pkg-config strigi strigi-devel update-desktop-files BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel -BuildRequires: libattica-devel shared-desktop-ontologies-devel soprano-backend-redland +BuildRequires: libattica-devel shared-desktop-ontologies-devel 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: xz-devel +BuildRequires: libudev-devel xz-devel BuildRequires: libpolkit-qt-1-devel %else BuildRequires: lzma-devel @@ -43,8 +43,8 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.5.3 -Release: 3 +Version: 4.5.80 +Release: 1 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -57,7 +57,7 @@ Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_5_BRANCH.diff +Patch0: 4_6_BRANCH.diff Patch1: kde3-applications.diff Patch2: default-useragent.diff Patch3: add-suse-translations.diff @@ -73,8 +73,7 @@ Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff Patch25: ksuseinstall_11.2.diff -Patch26: nepomuk-final.diff -Patch27: kdelibs-4.5.3-bko246652.patch +Patch26: enable-final-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %if 0%{?opensuse_bs} @@ -86,9 +85,12 @@ %if %suse_version == 1120 Requires: %{name}-branding = 11.2 %endif -%if %suse_version > 1120 +%if %suse_version == 1130 Requires: %{name}-branding = 11.3 %endif +%if %suse_version > 1130 +Requires: %{name}-branding = 11.4 +%endif %description This package contains the basic packages of the K Desktop Environment. @@ -112,9 +114,13 @@ %if %suse_version == 1120 Provides: %{name}-branding = 11.2 %endif -%if %suse_version > 1120 +%if %suse_version == 1130 Provides: %{name}-branding = 11.3 %endif +%if %suse_version > 1130 +Provides: %{name}-branding = 11.4 +%endif + Conflicts: otherproviders(%{name}-branding) Supplements: packageand(kdelibs4:branding-upstream) @@ -149,7 +155,6 @@ %patch25 %endif %patch26 -%patch27 # # define KDE version exactly # @@ -181,7 +186,8 @@ %create_exclude_filelist install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged - mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4 + mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu \ + $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4 rm $RPM_BUILD_ROOT/usr/share/man/man1/checkXML.1 mv $RPM_BUILD_ROOT/usr/share/man/man7/kdeoptions.7 \ $RPM_BUILD_ROOT/usr/share/man/man7/kde4options.7 @@ -265,6 +271,7 @@ Summary: KDE Base Libraries Requires: kde4-filesystem >= %_kde_platform_version Requires: libkdecore4 = %version +%requires_ge libpolkit-qt-1-0 %description -n kdelibs4-core This package contains the basic packages of the K Desktop Environment. @@ -286,6 +293,7 @@ %exclude %_kde4_libdir/libkdefakes.so.* %exclude %_kde4_libdir/libkpty.so.* %exclude %_kde4_bindir/kconfig_compiler +%exclude /usr/share/locale/all_languages %dir %_kde4_libdir/kde4 %dir %_kde4_sharedir/servicetypes %config %_kde_config_dir/kdebug.areas @@ -322,7 +330,6 @@ Group: System/GUI/KDE Summary: KDE Base Libraries %requires_ge libqt4-x11 -Requires: hal %description -n libkde4 This package contains the basic packages of the K Desktop Environment. @@ -355,7 +362,6 @@ %_kde4_libdir/libkdewebkit.so.* %_kde4_libdir/libkdnssd.so.* %_kde4_libdir/libkfile.so.* -%_kde4_libdir/libkfile.so.* %_kde4_libdir/libkhtml.so.* %_kde4_libdir/libkimproxy.so.* %_kde4_libdir/libkio.so.* @@ -376,6 +382,7 @@ %_kde4_libdir/libkutils.so.* %_kde4_libdir/libnepomukquery.so.* %_kde4_libdir/libnepomuk.so.* +%_kde4_libdir/libnepomukutils.so.* %_kde4_libdir/libplasma.so.* %_kde4_libdir/libsolid.so.* %_kde4_libdir/libthreadweaver.so.* @@ -384,6 +391,7 @@ %_kde4_libdir/libkemoticons.so.* %_kde4_libdir/libkidletime.so.* %_kde4_libdir/libkprintutils.so.* +/usr/share/locale/all_languages %package -n libkde4-devel License: LGPLv2.1+ @@ -474,6 +482,8 @@ %_kde4_mandir/man*/* /usr/share/mime/packages/kde.xml %exclude %_kde4_libdir/kde4/plugins/script/libkrossqtsplugin.so +%_kde4_applicationsdir/kmailservice.desktop +%_kde4_applicationsdir/ktelnetservice.desktop # IMPORTANT: When this is obsolete, do not just remove this, but create # a separate package (for backwards compatibility). ++++++ 4_5_BRANCH.diff -> 4_6_BRANCH.diff ++++++ --- KDE/kdelibs4/4_5_BRANCH.diff 2010-11-11 16:26:25.000000000 +0100 +++ kdelibs4/4_6_BRANCH.diff 2010-11-22 21:46:28.000000000 +0100 @@ -1,25 +1,8 @@ +package: kdelibs-4.5.80.tar.bz2 +kdemod: kdelibs --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1185156 -+svn di between //tags/KDE/4.5.2/kdelibs and //branches/KDE/4.5/kdelibs - -Index: doc/kded4/man-kded4.8.docbook ------------------------------------------------------------------------- -r1195598 | mueller | 2010-11-11 16:24:29 +0100 (Do, 11. Nov 2010) | 2 Zeilen - -gcc 4.6 build fix - ------------------------------------------------------------------------- -Index: kjs/collector.h -=================================================================== ---- kjs/collector.h (Revision 1195597) -+++ kjs/collector.h (Revision 1195598) -@@ -27,6 +27,7 @@ - - #include <wtf/HashCountedSet.h> - #include <cstring> -+#include <cstddef> - - #define KJS_MEM_LIMIT 500000 - ++current HEAD: 1199829 ++svn di between //trunk/KDE/kdelibs@1149349 and //trunk/KDE/kdelibs + string(REGEX REPLACE "POLKITQT_VERSION_STRING \" ++++++ add-suse-translations.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,12 +1,14 @@ ---- kdecore/localization/klocale.cpp -+++ kdecore/localization/klocale.cpp -@@ -360,6 +360,9 @@ - catalogNames.append(KCatalogName("kdeqt")); - catalogNames.append(KCatalogName("solid_qt")); - catalogNames.append(KCatalogName("kdecalendarsystems")); -+ catalogNames.append(KCatalogName("desktop_translations")); -+ catalogNames.append(KCatalogName("kde4-openSUSE")); -+ catalogNames.append(KCatalogName("kde4-SLE")); - numberOfSysCatalogs = catalogNames.size() - numberOfCatalogs; +Index: kdecore/localization/klocale_kde.cpp +=================================================================== +--- kdecore/localization/klocale_kde.cpp.orig ++++ kdecore/localization/klocale_kde.cpp +@@ -257,6 +257,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"))); ++ m_catalogNames.append(KCatalogName(QString::fromLatin1("desktop_translations"))); ++ m_catalogNames.append(KCatalogName(QString::fromLatin1("kde4-openSUSE"))); ++ m_catalogNames.append(KCatalogName(QString::fromLatin1("kde4-SLE"))); + m_numberOfSysCatalogs = m_catalogNames.size() - numberOfCatalogs; updateCatalogs(); // evaluate this for all languages ++++++ clever-menu.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,18 +1,22 @@ +Index: kdecore/services/kservice.cpp +=================================================================== --- kdecore/services/kservice.cpp.orig +++ kdecore/services/kservice.cpp -@@ -702,6 +702,12 @@ QString KService::untranslatedGenericNam +@@ -717,6 +717,12 @@ QString KService::untranslatedGenericNam return v.isValid() ? v.toString() : QString(); } + +bool KService::SuSEunimportant() const { -+ QVariant v = property("X-SuSE-Unimportant", QVariant::Bool); ++ QVariant v = property(QString::fromLatin1("X-SuSE-Unimportant"), QVariant::Bool); + return v.isValid() && v.toBool(); +} + QString KService::parentApp() const { Q_D(const KService); - QMap<QString,QVariant>::ConstIterator it = d->m_mapProps.find( "X-KDE-ParentApp" ); + QMap<QString,QVariant>::ConstIterator it = d->m_mapProps.find(QLatin1String("X-KDE-ParentApp")); +Index: kdecore/services/kservicegroup.cpp +=================================================================== --- kdecore/services/kservicegroup.cpp.orig +++ kdecore/services/kservicegroup.cpp @@ -29,7 +29,7 @@ @@ -31,8 +35,8 @@ + if (directoryEntryPath.startsWith(QDir::homePath())) + m_bShortMenu = false; + else -+ m_bShortMenu = config.readEntry( "X-SuSE-AutoShortMenu", true ); -+ m_bGeneralDescription = config.readEntry( "X-SuSE-GeneralDescription", false ); ++ m_bShortMenu = config.readEntry( QString::fromLatin1("X-SuSE-AutoShortMenu"), true ); ++ m_bGeneralDescription = config.readEntry( QString::fromLatin1("X-SuSE-GeneralDescription"), false ); m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" ); suppressGenericNames = config.readEntry( "X-KDE-SuppressGenericNames", QStringList() ); // d->sortOrder = config.readEntry("SortOrder", QStringList()); @@ -40,9 +44,9 @@ { if (m_childCount == -1) { -+ KConfig cfg("kdeglobals"); -+ KConfigGroup global = cfg.group("KDE"); -+ bool showUnimportant = global.readEntry("showUnimportant", false); ++ KConfig cfg(QString::fromLatin1("kdeglobals")); ++ KConfigGroup global = cfg.group(QString::fromLatin1("KDE")); ++ bool showUnimportant = global.readEntry(QString::fromLatin1("showUnimportant"), false); + m_childCount = 0; @@ -183,6 +187,8 @@ const KService::Ptr service = KService::Ptr::staticCast( (*it2).value() ); if (service->menuId() == item) { +Index: kdecore/services/kservicegroup.h +=================================================================== --- kdecore/services/kservicegroup.h.orig +++ kdecore/services/kservicegroup.h @@ -22,6 +22,7 @@ @@ -219,6 +225,8 @@ * options for groupEntries and serviceEntries */ enum EntriesOption +Index: kdecore/services/kservicegroup_p.h +=================================================================== --- kdecore/services/kservicegroup_p.h.orig +++ kdecore/services/kservicegroup_p.h @@ -31,7 +31,8 @@ public: @@ -254,6 +262,8 @@ bool m_bShowEmptyMenu : 1; bool m_bShowInlineHeader : 1; bool m_bInlineAlias : 1; +Index: kdecore/services/kservice.h +=================================================================== --- kdecore/services/kservice.h.orig +++ kdecore/services/kservice.h @@ -333,6 +333,12 @@ public: ++++++ default-useragent.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,13 +1,11 @@ -Index: kio/kio/kprotocolmanager.cpp -=================================================================== ---- kio/kio/kprotocolmanager.cpp.orig +--- kio/kio/kprotocolmanager.cpp +++ kio/kio/kprotocolmanager.cpp -@@ -77,7 +77,7 @@ KProtocolManagerPrivate::~KProtocolManag - - // DEFAULT USERAGENT STRING - #define CFG_DEFAULT_UAGENT(X) \ --QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \ -+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) SUSE") \ - .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE) +@@ -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 ++++++ desktop-translations.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,25 +1,26 @@ -Index: kdecore/config/kconfig.cpp +Subject: Read .desktop file translations from .mo files if not present +From: Lubos Lunak +Fate: #300461 +Patch-upstream: no +Relates: kdelibs3/desktop-translations.diff + +Index: kdecore/services/kservicegroup.cpp =================================================================== ---- kdecore/config/kconfig.cpp.orig -+++ kdecore/config/kconfig.cpp -@@ -754,6 +754,17 @@ QString KConfigPrivate::lookupData(const - return entryMap.getEntry(group, key, QString(), flags, expand); - } +--- kdecore/services/kservicegroup.cpp.orig ++++ kdecore/services/kservicegroup.cpp +@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS -+QByteArray KConfigPrivate::lookupExactData(const QByteArray& group, const char* key, -+ KEntryMap::SearchFlags flags) const -+{ -+ if (bReadDefaults) -+ flags |= KEntryMap::SearchDefaults; -+ const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags); -+ if (it == entryMap.constEnd()) -+ return QByteArray(); -+ return it->mValue; -+} -+ - void KConfig::virtual_hook(int /*id*/, void* /*data*/) - { - /* nothing */ + const KConfigGroup config = desktopFile.desktopGroup(); + +- m_strCaption = config.readEntry( "Name" ); +- m_strIcon = config.readEntry( "Icon" ); +- m_strComment = config.readEntry( "Comment" ); ++ m_strCaption = desktopFile.readName(); ++ m_strIcon = desktopFile.readIcon(); ++ m_strComment = desktopFile.readComment(); + deleted = config.readEntry("Hidden", false ); + m_bNoDisplay = desktopFile.noDisplay(); + if (directoryEntryPath.startsWith(QDir::homePath())) Index: kdecore/config/kconfigdata.h =================================================================== --- kdecore/config/kconfigdata.h.orig @@ -44,55 +45,6 @@ Iterator findEntry(const QByteArray& group, const QByteArray& key = QByteArray(), SearchFlags flags = SearchFlags()) { -Index: kdecore/config/kconfiggroup.cpp -=================================================================== ---- kdecore/config/kconfiggroup.cpp.orig -+++ kdecore/config/kconfiggroup.cpp -@@ -1238,6 +1238,16 @@ bool KConfigGroup::hasKey(const char *ke - return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); - } - -+bool KConfigGroup::hasTranslatedKey(const char* key) const -+{ -+ Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); -+ -+ KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; -+ if ( config()->readDefaults() ) -+ flags |= KEntryMap::SearchDefaults; -+ return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull(); -+} -+ - bool KConfigGroup::hasKey(const QString &key) const - { - return hasKey(key.toUtf8().constData()); -Index: kdecore/config/kconfiggroup.h -=================================================================== ---- kdecore/config/kconfiggroup.h.orig -+++ kdecore/config/kconfiggroup.h -@@ -617,6 +617,11 @@ public: - */ - QMap<QString, QString> entryMap() const; - -+ /** -+ * @internal -+ */ -+ bool hasTranslatedKey( const char *pKey ) const; -+ - protected: - bool hasGroupImpl(const QByteArray &group) const; - KConfigGroup groupImpl(const QByteArray &b); -Index: kdecore/config/kconfig_p.h -=================================================================== ---- kdecore/config/kconfig_p.h.orig -+++ kdecore/config/kconfig_p.h -@@ -53,6 +53,7 @@ public: - QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags, - bool* expand) const; - QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; -+ QByteArray lookupExactData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; - - void putData(const QByteArray& group, const char* key, const QByteArray& value, - KConfigBase::WriteConfigFlags flags, bool expand=false); Index: kdecore/config/kdesktopfile.cpp =================================================================== --- kdecore/config/kdesktopfile.cpp.orig @@ -106,26 +58,21 @@ class KDesktopFilePrivate : public KConfigPrivate { -@@ -176,6 +178,34 @@ bool KDesktopFile::isAuthorizedDesktopFi +@@ -179,6 +181,29 @@ bool KDesktopFile::isAuthorizedDesktopFi return false; } +QString KDesktopFile::translatedEntry(const char* key) const +{ + Q_D(const KDesktopFile); -+ return translatedEntry( d->desktopGroup, key ); -+} -+ -+QString KDesktopFile::translatedEntry(const KConfigGroup& group, const char* key) const -+{ -+ if (group.hasTranslatedKey(key)) -+ return group.readEntry(key); ++ if (d->desktopGroup.hasTranslatedKey(key)) ++ return d->desktopGroup.readEntry(key); + -+ if (group.hasKey(key)) { -+ QString value = group.readEntryUntranslated(key); ++ if (d->desktopGroup.hasKey(key)) { ++ QString value = d->desktopGroup.readEntryUntranslated(key); + QString fName = fileName(); -+ fName = fName.mid(fName.lastIndexOf('/')+1); -+ QString po_lookup_key = QString::fromLatin1(key) + "(" + fName + "): " + value; ++ fName = fName.mid(fName.lastIndexOf(QLatin1Char('/'))+1); ++ QString po_lookup_key = QString::fromLatin1(key) + QString::fromLatin1("(") + fName + QString::fromLatin1("): ") + value; + QString po_value; + KGlobal::locale()->translateRaw(po_lookup_key.toUtf8().data(), NULL, &po_value); + @@ -141,7 +88,7 @@ QString KDesktopFile::readType() const { Q_D(const KDesktopFile); -@@ -190,20 +220,17 @@ QString KDesktopFile::readIcon() const +@@ -193,20 +218,17 @@ QString KDesktopFile::readIcon() const QString KDesktopFile::readName() const { @@ -169,19 +116,7 @@ =================================================================== --- kdecore/config/kdesktopfile.h.orig +++ kdecore/config/kdesktopfile.h -@@ -243,6 +243,11 @@ public: - - const char *resource() const; - -+ /** -+ * @internal SUSE addition -+ */ -+ QString translatedEntry(const KConfigGroup& group, const char*) const; -+ - protected: - /** Virtual hook, used to add new "virtual" functions while maintaining - binary compatibility. Unused in this class. -@@ -250,6 +255,8 @@ protected: +@@ -250,6 +250,8 @@ protected: // virtual void virtual_hook( int id, void* data ); private: @@ -190,33 +125,74 @@ Q_DISABLE_COPY(KDesktopFile) Q_DECLARE_PRIVATE(KDesktopFile) -Index: kdecore/services/kservice.cpp +Index: kdecore/config/kconfiggroup.h =================================================================== ---- kdecore/services/kservice.cpp.orig -+++ kdecore/services/kservice.cpp -@@ -330,7 +330,7 @@ void KServicePrivate::parseActions(const - << "has no Name or no Exec key"; - } else { - m_actions.append(KServiceAction(group, -- cg.readEntry("Name"), -+ config->translatedEntry(cg,"Name"), - cg.readEntry("Icon"), - cg.readEntry("Exec"), - cg.readEntry("NoDisplay", false))); -Index: kdecore/services/kservicegroup.cpp +--- kdecore/config/kconfiggroup.h.orig ++++ kdecore/config/kconfiggroup.h +@@ -617,6 +617,11 @@ public: + */ + QMap<QString, QString> entryMap() const; + ++ /** ++ * @internal ++ */ ++ bool hasTranslatedKey( const char *pKey ) const; ++ + protected: + bool hasGroupImpl(const QByteArray &group) const; + KConfigGroup groupImpl(const QByteArray &b); +Index: kdecore/config/kconfig.cpp =================================================================== ---- kdecore/services/kservicegroup.cpp.orig -+++ kdecore/services/kservicegroup.cpp -@@ -56,9 +56,9 @@ void KServiceGroupPrivate::load(const QS +--- kdecore/config/kconfig.cpp.orig ++++ kdecore/config/kconfig.cpp +@@ -749,6 +749,17 @@ QString KConfigPrivate::lookupData(const + return entryMap.getEntry(group, key, QString(), flags, expand); + } - const KConfigGroup config = desktopFile.desktopGroup(); ++QByteArray KConfigPrivate::lookupExactData(const QByteArray& group, const char* key, ++ KEntryMap::SearchFlags flags) const ++{ ++ if (bReadDefaults) ++ flags |= KEntryMap::SearchDefaults; ++ const KEntryMapConstIterator it = entryMap.findExactEntry(group, key, flags); ++ if (it == entryMap.constEnd()) ++ return QByteArray(); ++ return it->mValue; ++} ++ + void KConfig::virtual_hook(int /*id*/, void* /*data*/) + { + /* nothing */ +Index: kdecore/config/kconfig_p.h +=================================================================== +--- kdecore/config/kconfig_p.h.orig ++++ kdecore/config/kconfig_p.h +@@ -53,6 +53,7 @@ public: + QString lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags, + bool* expand) const; + QByteArray lookupData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; ++ QByteArray lookupExactData(const QByteArray& group, const char* key, KEntryMap::SearchFlags flags) const; -- m_strCaption = config.readEntry( "Name" ); -- m_strIcon = config.readEntry( "Icon" ); -- m_strComment = config.readEntry( "Comment" ); -+ m_strCaption = desktopFile.readName(); -+ m_strIcon = desktopFile.readIcon(); -+ m_strComment = desktopFile.readComment(); - deleted = config.readEntry("Hidden", false ); - m_bNoDisplay = desktopFile.noDisplay(); - if (directoryEntryPath.startsWith(QDir::homePath())) + void putData(const QByteArray& group, const char* key, const QByteArray& value, + KConfigBase::WriteConfigFlags flags, bool expand=false); +Index: kdecore/config/kconfiggroup.cpp +=================================================================== +--- kdecore/config/kconfiggroup.cpp.orig ++++ kdecore/config/kconfiggroup.cpp +@@ -1239,6 +1239,16 @@ bool KConfigGroup::hasKey(const char *ke + return !config()->d_func()->lookupData(d->fullName(), key, flags).isNull(); + } + ++bool KConfigGroup::hasTranslatedKey(const char* key) const ++{ ++ Q_ASSERT_X(isValid(), "KConfigGroup::hasTranslatedKey", "accessing an invalid group"); ++ ++ KEntryMap::SearchFlags flags = KEntryMap::SearchLocalized; ++ if ( config()->readDefaults() ) ++ flags |= KEntryMap::SearchDefaults; ++ return !config()->d_func()->lookupExactData(d->fullName(), key, flags).isNull(); ++} ++ + bool KConfigGroup::hasKey(const QString &key) const + { + return hasKey(key.toUtf8().constData()); ++++++ enable-final-fixes.diff ++++++ Index: kio/kssl/kcm/displaycertdialog_p.h =================================================================== --- kio/kssl/kcm/displaycertdialog_p.h (revision 1198898) +++ kio/kssl/kcm/displaycertdialog_p.h (working copy) @@ -17,6 +17,9 @@ 02110-1301, USA. */ +#ifndef DISPLAYCERTDIALOG_P_H +#define DISPLAYCERTDIALOG_P_H + #include "ui_displaycert.h" #include <QtNetwork/QSslCertificate> @@ -36,4 +39,5 @@ Ui::DisplayCert m_ui; QList<QSslCertificate> m_certs; int m_index; -}; \ No newline at end of file +}; +#endif // DISPLAYCERTDIALOG_P_H ++++++ flash-player-non-oss.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,15 +1,8 @@ ---- khtml/html/html_objectimpl.cpp.sav 2010-06-08 14:22:55.000000000 +0200 -+++ khtml/html/html_objectimpl.cpp 2010-06-11 14:47:25.829189290 +0200 -@@ -38,6 +38,8 @@ - #include <kmessagebox.h> - #include <kmimetype.h> - -+#include <ksuseinstall.h> -+#include <ktoolinvocation.h> - - #include "xml/dom_docimpl.h" - #include "css/cssstyleselector.h" -@@ -601,14 +603,33 @@ void HTMLObjectBaseElementImpl::slotPart +Index: khtml/html/html_objectimpl.cpp +=================================================================== +--- khtml/html/html_objectimpl.cpp.orig ++++ khtml/html/html_objectimpl.cpp +@@ -590,14 +590,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(); @@ -17,7 +10,7 @@ - i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, shortURL), + + int res; -+ if (mime->name() == "application/x-shockwave-flash") ++ if (mimeName.startsWith("Shockwave Flash", Qt::CaseInsensitive)) + { + res = KMessageBox::questionYesNo( part->view(), + i18n("No plugin found for '%1'.\nDo you want to download one from %2?", mimeName, "openSUSE"), @@ -25,10 +18,9 @@ - if (res == KMessageBox::Yes) + if (res == KMessageBox::Yes) + { -+ if( KSUSEInstall::installCapabilities( QStringList() << "flash-player", KSUSEInstall::FullInstallRequired, part->view())) -+ { -+ KToolInvocation::kdeinitExecWait("nspluginscan"); -+ } ++ // Open YMP file ++ KUrl ymp_flash("http://download.opensuse.org/YaST/flash-player.ymp"); ++ ext->openUrlRequest(ymp_flash); + return; + } + } @@ -49,23 +41,3 @@ } } } ---- khtml/CMakeLists.txt.sav 2010-06-08 14:23:04.000000000 +0200 -+++ khtml/CMakeLists.txt 2010-06-11 13:39:05.035122837 +0200 -@@ -441,6 +441,8 @@ include_directories( ${KDE4_PHONON_INCLU - include_directories( ${CMAKE_BINARY_DIR}/kio/kssl ) - include_directories( ${KDE4_KJS_INCLUDES} ${CMAKE_SOURCE_DIR}/kimgio ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor) - -+include_directories( ${CMAKE_SOURCE_DIR}/suseinstall ) -+ - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/misc - ${CMAKE_CURRENT_SOURCE_DIR}/dom -@@ -537,6 +539,8 @@ kde4_add_library(khtml SHARED ${khtml_LI - target_link_libraries(khtml ${KDE4_KPARTS_LIBS} ktexteditor kjs ${KDE4_PHONON_LIBS} ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES}) - target_link_libraries(khtml LINK_INTERFACE_LIBRARIES kparts kjs kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) - -+target_link_libraries(khtml ksuseinstall) -+ - set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} - SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} - ) ++++++ hotplug-kde3.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,13 +1,13 @@ Index: kdecore/services/kservice.cpp =================================================================== ---- kdecore/services/kservice.cpp.orig -+++ kdecore/services/kservice.cpp -@@ -104,6 +104,8 @@ void KServicePrivate::init( const KDeskt +--- 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 @@ m_bValid = false; return;*/ - m_strType = "Application"; -+ if( entryPath.contains( "/konqueror/servicemenus" )) -+ m_strType = "Service"; // workaround for bnc#378338, KDE3 entries there miss Type= - } else if ( m_strType != "Application" && m_strType != "Service" ) - { + m_strType = QString::fromLatin1("Application"); ++ if( entryPath.contains( QLatin1String("/konqueror/servicemenus") )) ++ m_strType = QLatin1String("Service"); // workaround for bnc#378338, KDE3 entries there miss Type= + } else if (m_strType != QLatin1String("Application") && m_strType != QLatin1String("Service")) { kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath + << " has Type=" << m_strType ++++++ kde3-applications.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,31 +1,31 @@ ---- kdecore/services/kservice.cpp -+++ kdecore/services/kservice.cpp -@@ -62,6 +62,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 @@ { const QString entryPath = q->entryPath(); bool absPath = !QDir::isRelativePath(entryPath); -+ bool kde3application = config->fileName().startsWith("/opt/kde3/share/applications/kde/") -+ || config->fileName().startsWith("/opt/kde3/share/autostart/"); ++ bool kde3application = config->fileName().startsWith(QLatin1String("/opt/kde3/share/applications/kde/")) ++ || config->fileName().startsWith(QLatin1String("/opt/kde3/share/autostart/")); // TODO: it makes sense to have a KConstConfigGroup I guess const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup(); -@@ -89,6 +91,8 @@ +@@ -91,6 +93,8 @@ if (i != -1) m_strName = m_strName.left(i); } + if (kde3application) -+ m_strName += "/KDE3"; ++ m_strName += QLatin1String("/KDE3"); m_strType = config->readType(); - entryMap.remove("Type"); -@@ -112,6 +116,18 @@ + entryMap.remove(QLatin1String("Type")); +@@ -113,6 +117,18 @@ // 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() ); -+ if (kde3application && !m_strExec.startsWith("/")) -+ m_strExec = "/opt/kde3/bin/"+m_strExec; -+ else if (desktopGroup.readEntry("X-KDE-SubstituteUID"), false) { -+ int space = m_strExec.indexOf(" "); ++ if (kde3application && !m_strExec.startsWith(QLatin1String("/"))) ++ m_strExec = QLatin1String("/opt/kde3/bin/")+m_strExec; ++ else if (desktopGroup.readEntry(QLatin1String("X-KDE-SubstituteUID")), false) { ++ int space = m_strExec.indexOf(QLatin1String(" ")); + if (space==-1) + m_strExec = KStandardDirs::findExe(m_strExec); + else { @@ -34,36 +34,35 @@ + } + } + - entryMap.remove("Exec"); + entryMap.remove(QLatin1String("Exec")); - if ( m_strType == "Application" ) { -@@ -215,6 +231,9 @@ - m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); - entryMap.remove("InitialPreference"); + if (m_strType == QLatin1String("Application")) { +@@ -215,6 +231,8 @@ + m_initialPreference = desktopGroup.readEntry( "InitialPreference", 1 ); + entryMap.remove(QLatin1String("InitialPreference")); + if (kde3application) + m_initialPreference = 1; -+ + // Assign the "initial preference" to each mimetype/servicetype // (and to set such preferences in memory from kbuildsycoca) - m_serviceTypes.reserve(lstServiceTypes.size()); -@@ -255,6 +274,8 @@ +@@ -256,6 +274,8 @@ m_DBUSStartusType = KService::DBusNone; m_strDesktopEntryName = _name.toLower(); + if (kde3application) -+ m_strDesktopEntryName = "kde-" + m_strDesktopEntryName; ++ m_strDesktopEntryName = QLatin1String("kde-") + m_strDesktopEntryName; m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true); - entryMap.remove("AllowDefault"); -@@ -274,7 +295,9 @@ + entryMap.remove(QLatin1String("AllowDefault")); +@@ -275,7 +295,9 @@ // qDebug("Path = %s", entryPath.toLatin1().constData()); QMap<QString,QString>::ConstIterator it = entryMap.constBegin(); for( ; it != entryMap.constEnd();++it) { - const QString key = it.key(); + QString key = it.key(); -+ if (kde3application && key=="OnlyShowIn" && QVariant(*it)=="KDE;") -+ key = "NotShowIn"; ++ if (kde3application && key==QLatin1String("OnlyShowIn") && QVariant(*it)==QLatin1String("KDE;")) ++ key = QLatin1String("NotShowIn"); // do not store other translations like Name[fr]; kbuildsycoca will rerun if we change languages anyway - if (!key.contains('[')) { + if (!key.contains(QLatin1Char('['))) { //kDebug(servicesDebugArea()) << " Key =" << key << " Data =" << *it; ++++++ kdelibs-4.5.3.tar.bz2 -> kdelibs-4.5.80.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.5.3.tar.bz2 kdelibs4/kdelibs-4.5.80.tar.bz2 differ: char 11, line 1 ++++++ ksuseinstall.diff ++++++ ++++ 1885 lines (skipped) ++++ between KDE/kdelibs4/ksuseinstall.diff ++++ and kdelibs4/ksuseinstall.diff ++++++ ksuseinstall_11.2.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -1,11 +1,13 @@ ---- suseinstall/ksuseinstall.cpp.v1 2010-06-01 14:49:29.000000000 +0200 -+++ suseinstall/ksuseinstall.cpp 2010-06-01 14:52:40.000000000 +0200 +Index: suseinstall/ksuseinstall.cpp +=================================================================== +--- suseinstall/ksuseinstall.cpp.orig ++++ suseinstall/ksuseinstall.cpp @@ -329,7 +329,7 @@ bool KSUSEInstall::tryAddRepositories( b - proc << "--attach" << QString::number( parent->window()->winId()); - proc << "--" << "yast2" << "repositories"; - // Only 11.3 and newer have the extra argument that makes all enabled repos also be refreshed (bnc#608562) --#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED -+//#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED - #ifdef HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED - proc << "refresh-enabled"; - #endif + proc << "--attach" << QString::number( parent->window()->winId()); + proc << "--" << "yast2" << "repositories"; + // Only 11.3 and newer have the extra argument that makes all enabled repos also be refreshed (bnc#608562) +-#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED ++//#define HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED + #ifdef HAVE_YAST2_REPOSITORIES_REFRESH_ENABLED + proc << "refresh-enabled"; + #endif ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.VVs2zK/_old 2010-11-22 23:32:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VVs2zK/_new 2010-11-22 23:32:50.000000000 +0100 @@ -32,9 +32,9 @@ /** --- plasma/corona.cpp +++ plasma/corona.cpp -@@ -192,7 +192,9 @@ +@@ -195,7 +195,9 @@ - if (pluginName.isEmpty()) { + if (pluginName.isEmpty() || pluginName == "default") { // default to the desktop containment - pluginName = "desktop"; + KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); @@ -45,7 +45,7 @@ bool loadingNull = pluginName == "null"; --- plasma/private/containment_p.h +++ plasma/private/containment_p.h -@@ -53,6 +53,7 @@ +@@ -60,6 +60,7 @@ type(Containment::NoContainmentType), showDropZoneDelayTimer(0), drawWallpaper(true), @@ -53,14 +53,14 @@ dropZoneStarted(false) { } -@@ -164,6 +165,7 @@ +@@ -183,6 +184,7 @@ QHash<KJob*, KMenu*> dropMenus; QTimer *showDropZoneDelayTimer; bool drawWallpaper : 1; + bool showToolBox : 1; bool dropZoneStarted : 1; - }; - + + enum ContainmentActionsSource { --- plasma/theme.cpp +++ plasma/theme.cpp @@ -60,7 +60,6 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org