Hello community,
here is the log from the commit of package kdevplatform for openSUSE:Factory
checked in at Mon May 2 16:25:10 CEST 2011.
--------
--- KDE/kdevplatform/kdevplatform.changes 2011-01-24 15:32:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2011-04-28 15:58:03.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Apr 28 13:45:20 UTC 2011 - idoenmez@novell.com
+
+- Add kdevplatform-1.2.0-gcc46.patch to fix compilation with gcc 4.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kdevplatform-1.2.0-gcc46.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevplatform.spec ++++++
--- /var/tmp/diff_new_pack.xW9cad/_old 2011-05-02 16:24:25.000000000 +0200
+++ /var/tmp/diff_new_pack.xW9cad/_new 2011-05-02 16:24:25.000000000 +0200
@@ -30,8 +30,10 @@
Summary: Base Package for Integrated Development Environments
Url: http://www.kdevelop.org
Version: 1.2.0
-Release: 1
+Release: 5
Source0: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM kdevplatform-1.2.0-gcc46.patch idoenmez@suse.de -- Fix gcc 4.6 compilation, bko#267833
+Patch1: kdevplatform-1.2.0-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Requires: libkdevplatform0 = %{version}
@@ -62,6 +64,7 @@
%lang_package
%prep
%setup -q
+%patch1 -p1
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
++++++ kdevplatform-1.2.0-gcc46.patch ++++++
From 5cc9c74380831bc4445a76c6d4a08642a0919554 Mon Sep 17 00:00:00 2001
From: Luca Mattiello
Date: Sun, 6 Mar 2011 21:59:59 +0100
Subject: [PATCH] Fix compilation errors due to mutable references.
---
language/duchain/repositories/itemrepository.h | 8 ++++----
language/util/basicsetrepository.h | 2 +-
language/util/setrepository.cpp | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/language/duchain/repositories/itemrepository.h b/language/duchain/repositories/itemrepository.h
index c0f6cc7..859fe87 100644
--- a/language/duchain/repositories/itemrepository.h
+++ b/language/duchain/repositories/itemrepository.h
@@ -199,7 +199,7 @@ templatemutex());
if(!m_repository) {
- m_repository = new ItemRepositoryType(m_name, &m_registry, m_version, const_cast(this));
+ m_repository = new ItemRepositoryType(m_name, m_registry, m_version, const_cast(this));
if(m_shareMutex)
(*this)->setMutex(m_shareMutex()->repositoryMutex());
(*this)->setUnloadingEnabled(unloadingEnabled);
@@ -236,7 +236,7 @@ struct RepositoryManager : public AbstractRepositoryManager{
QString m_name;
int m_version;
- mutable ItemRepositoryRegistry& m_registry;
+ mutable ItemRepositoryRegistry* m_registry;
AbstractRepositoryManager* (*m_shareMutex)();
};
diff --git a/language/util/basicsetrepository.h b/language/util/basicsetrepository.h
index c2861b9..60cbf37 100644
--- a/language/util/basicsetrepository.h
+++ b/language/util/basicsetrepository.h
@@ -129,7 +129,7 @@ public:
SetNodeData data;
uint m_hash;
- mutable SetDataRepository& repository;
+ mutable SetDataRepository* repository;
mutable BasicSetRepository* setRepository; //May be zero when no notifications are wanted
mutable bool m_created;
};
diff --git a/language/util/setrepository.cpp b/language/util/setrepository.cpp
index 2e152f1..fe45b70 100644
--- a/language/util/setrepository.cpp
+++ b/language/util/setrepository.cpp
@@ -176,7 +176,7 @@ void SetNodeDataRequest::destroy(SetNodeData* data, KDevelop::AbstractItemReposi
}
}
-SetNodeDataRequest::SetNodeDataRequest(const SetNodeData* _data, SetDataRepository& _repository, BasicSetRepository* _setRepository) : data(*_data), m_hash(_data->hash()), repository(_repository), setRepository(_setRepository), m_created(false) {
+SetNodeDataRequest::SetNodeDataRequest(const SetNodeData* _data, SetDataRepository& _repository, BasicSetRepository* _setRepository) : data(*_data), m_hash(_data->hash()), repository(&_repository), setRepository(_setRepository), m_created(false) {
ifDebug( SetRepositoryAlgorithms alg(repository); alg.check(_data) );
}
@@ -184,9 +184,9 @@ SetNodeDataRequest::~SetNodeDataRequest() {
//Eventually increase the reference-count of direct children
if(m_created) {
if(data.leftNode)
- ++repository.dynamicItemFromIndex(data.leftNode)->m_refCount;
+ ++repository->dynamicItemFromIndex(data.leftNode)->m_refCount;
if(data.rightNode)
- ++repository.dynamicItemFromIndex(data.rightNode)->m_refCount;
+ ++repository->dynamicItemFromIndex(data.rightNode)->m_refCount;
}
}
@@ -205,8 +205,8 @@ void SetNodeDataRequest::createItem(SetNodeData* item) const {
//Make sure we split at the correct split position
if(item->hasSlaves()) {
uint split = splitPositionForRange(data.start, data.end);
- const SetNodeData* left = repository.itemFromIndex(item->leftNode);
- const SetNodeData* right = repository.itemFromIndex(item->rightNode);
+ const SetNodeData* left = repository->itemFromIndex(item->leftNode);
+ const SetNodeData* right = repository->itemFromIndex(item->rightNode);
Q_ASSERT(split >= left->end && split <= right->start);
}
#endif
--
1.7.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org