commit kdevplatform for openSUSE:Factory
Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Thu Feb 25 02:30:39 CET 2010. -------- --- KDE/kdevplatform/kdevplatform.changes 2010-01-29 13:39:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2010-02-12 22:14:24.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 12 21:14:06 UTC 2010 - tittiatcoke@gmail.com + +- update to 0.9.98 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevplatform-0.9.97.tar.bz2 New: ---- kdevplatform-0.9.98.tar.bz2 plugins-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.pjWWQc/_old 2010-02-25 02:30:35.000000000 +0100 +++ /var/tmp/diff_new_pack.pjWWQc/_new 2010-02-25 02:30:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdevplatform (Version 0.9.97) +# spec file for package kdevplatform (Version 0.9.98) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,10 @@ Group: Development/Tools/IDE Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org -Version: 0.9.97 -Release: 2 +Version: 0.9.98 +Release: 1 Source0: kdevplatform-%version.tar.bz2 +Patch1: plugins-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: libkdevplatform0 = %{version} @@ -54,6 +55,7 @@ %prep %setup -q +%patch1 -p0 %build %cmake_kde4 -d build @@ -63,8 +65,6 @@ cd build %makeinstall %kde_post_install - # file conflict with kdelibs4 - rm $RPM_BUILD_ROOT/%_kde_share_dir/apps/cmake/modules/FindKDevPlatform.cmake %post -p /sbin/ldconfig @@ -176,7 +176,7 @@ %_kde4_modules/kdevprojectmanagerview.so %_kde4_modules/kdevquickopen.so %_kde4_modules/kdevsnippet.so -%_kde4_modules/kdevsourceformatter.so +#%_kde4_modules/kdevsourceformatter.so %_kde4_modules/kdevstandardoutputview.so %_kde4_modules/kdevsubversion.so %_kde4_modules/kdevdocumentswitcher.so @@ -190,6 +190,7 @@ %_kde_share_dir/apps/kdevquickopen %_kde_share_dir/apps/kdevsourceformatter %_kde_share_dir/apps/kdevstandardoutputview +%_kde_share_dir/apps/kdevsnippet %_kde_share_dir/services/kcm_kdev_bgsettings.desktop %_kde_share_dir/services/kcm_kdev_ccsettings.desktop %_kde_share_dir/services/kcm_kdev_envsettings.desktop @@ -208,7 +209,7 @@ %_kde_share_dir/services/kdevprojectmanagerview.desktop %_kde_share_dir/services/kdevquickopen.desktop %_kde_share_dir/services/kdevsnippet.desktop -%_kde_share_dir/services/kdevsourceformatter.desktop +#%_kde_share_dir/services/kdevsourceformatter.desktop %_kde_share_dir/services/kdevstandardoutputview.desktop %_kde_share_dir/services/kdevsubversion.desktop %_kde_share_dir/servicetypes/kdevelopplugin.desktop ++++++ kdevplatform-0.9.97.tar.bz2 -> kdevplatform-0.9.98.tar.bz2 ++++++ ++++ 20048 lines of diff (skipped) ++++++ plugins-fix.diff ++++++ --- language/duchain/topducontext.h 2009/12/13 15:29:13 1062022 +++ language/duchain/topducontext.h 2010/02/12 14:31:48 1089142 @@ -225,7 +225,10 @@ ///Additional update-flags that have a special meaning during updating, but are not set stored into a top-context Recursive = 64, //Request the given features on all recursively imported contexts. Only the features are applied recursively (including AST) ForceUpdate = 128, //Enforce updating the top-context - ForceUpdateRecursive = ForceUpdate | 256 //Enforce updating the top-context and all its imports + ForceUpdateRecursive = ForceUpdate | 256, //Enforce updating the top-context and all its imports + + ///You can define own language-dependent features behind this flag + LastFeature = 512 }; ///Returns the currently active features of this top-context. The features will include AST if ast() is valid. --- language/backgroundparser/backgroundparser.cpp 2009/12/13 15:29:52 1062024 +++ language/backgroundparser/backgroundparser.cpp 2010/02/12 14:34:26 1089144 @@ -557,6 +557,12 @@ return d->m_documents.contains(url) || d->m_delayedParseJobs.contains(url); } +int BackgroundParser::queuedCount() const +{ + QMutexLocker lock(&d->m_mutex); + return d->m_documents.count() + d->m_delayedParseJobs.count(); +} + void BackgroundParser::setNeededPriority(int priority) { QMutexLocker lock(&d->m_mutex); --- language/backgroundparser/backgroundparser.h 2009/12/08 13:31:07 1060286 +++ language/backgroundparser/backgroundparser.h 2010/02/12 14:34:26 1089144 @@ -196,7 +196,10 @@ ///Returns true if the given url is queued for parsing bool isQueued(KUrl url) const; - + + ///Returns the number of currently active or queued jobs + int queuedCount() const; + protected: void loadSettings(bool projectIsLoaded); void saveSettings(bool projectIsLoaded); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de