[SCM] qtcreator packaging branch, master, updated. debian/3.2.0+dfsg-1-4-g4132a25
Adam Majer
adamm at moszumanska.debian.org
Wed Sep 3 23:33:27 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=4132a25
The following commit has been merged in the master branch:
commit 4132a25df60c335dad39a6cac80d914763dc5782
Author: Adam Majer <adamm at zombino.com>
Date: Wed Sep 3 14:05:53 2014 -0500
Move function bodies from header to cpp file in CppTools plugin
from discussion at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224
Comment #10:
"""
Before r214208 the body of
"virtual QByteArray CppTools::Internal::CppModelManager::definedMacros()"
(and the other two virtual functions) that call ensureUpdated() were removed:
_ZN8CppTools8Internal15CppModelManager13definedMacrosEv/6495
(virtual QByteArray CppTools::Internal::CppModelManager::definedMacros())
@0x7f601c207520 Type: function Body removed by
symtab_remove_unreachable_nodes Visibility: external public weak comdat
comdat_group:_ZN8CppTools8Internal15CppModelManager13definedMacrosEv
one_only virtual
Now these virtual function bodies are kept:
_ZN8CppTools8Internal15CppModelManager13definedMacrosEv/6495 (virtual
QByteArray CppTools::Internal::CppModelManager::definedMacros())
@0x7f67c0347520
Type: function definition analyzed
Visibility: externally_visible public weak comdat
comdat_group:_ZN8CppTools8Internal15CppModelManager13definedMacrosEv
one_only virtual
previous sharing asm name: 12475
Address is taken.
References:
Referring:
_ZN9CppEditor8Internal27CppCodeModelInspectorDialog7refreshEv/6819 (addr) (speculative)
Availability: available
First run: 0
Function flags: body
Called by:
Calls: _ZN8CppTools8Internal15CppModelManager13ensureUpdatedEv/10759
(1.00 per call) (can throw external)
"""
Moving these functions to no longer be inline fixes the issue about
visible or non-visible private symbols.
---
debian/changelog | 4 ++
debian/patches/from_header_to_body.diff | 66 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 71 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 148d5d2..43aa92f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtcreator (3.2.0+dfsg-2) UNRELEASED; urgency=medium
* Make qtcreator recommend qttranslations5-l10n (Closes: 759685).
Thanks Bernhard Übelacker for the detailed bug report!
+ [ Adam Majer ]
+ * Move some functions bodies from headers to .cpp files. This fixes a
+ FTBFS bug with latest GCC (closes: 759862)
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 29 Aug 2014 12:15:09 -0300
qtcreator (3.2.0+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/from_header_to_body.diff b/debian/patches/from_header_to_body.diff
new file mode 100644
index 0000000..d66ea19
--- /dev/null
+++ b/debian/patches/from_header_to_body.diff
@@ -0,0 +1,66 @@
+Index: qtcreator/src/plugins/cpptools/cppmodelmanager.cpp
+===================================================================
+--- qtcreator.orig/src/plugins/cpptools/cppmodelmanager.cpp 2014-08-18 02:52:02.000000000 -0500
++++ qtcreator/src/plugins/cpptools/cppmodelmanager.cpp 2014-09-03 12:28:09.844798669 -0500
+@@ -919,6 +919,24 @@
+ return m_indexingSupporter ? m_indexingSupporter : m_internalIndexingSupport;
+ }
+
++QStringList CppModelManager::projectFiles()
++{
++ ensureUpdated();
++ return m_projectFiles;
++}
++
++ProjectPart::HeaderPaths CppModelManager::headerPaths()
++{
++ ensureUpdated();
++ return m_headerPaths;
++}
++
++QByteArray CppModelManager::definedMacros()
++{
++ ensureUpdated();
++ return m_definedMacros;
++}
++
+ void CppModelManager::enableGarbageCollector(bool enable)
+ {
+ m_delayedGcTimer->stop();
+Index: qtcreator/src/plugins/cpptools/cppmodelmanager.h
+===================================================================
+--- qtcreator.orig/src/plugins/cpptools/cppmodelmanager.h 2014-08-18 02:52:02.000000000 -0500
++++ qtcreator/src/plugins/cpptools/cppmodelmanager.h 2014-09-03 12:28:28.360799389 -0500
+@@ -122,17 +122,8 @@
+ virtual void setIndexingSupport(CppIndexingSupport *indexingSupport);
+ virtual CppIndexingSupport *indexingSupport();
+
+- QStringList projectFiles()
+- {
+- ensureUpdated();
+- return m_projectFiles;
+- }
+-
+- ProjectPart::HeaderPaths headerPaths()
+- {
+- ensureUpdated();
+- return m_headerPaths;
+- }
++ QStringList projectFiles();
++ ProjectPart::HeaderPaths headerPaths();
+
+ // Use this *only* for auto tests
+ void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths)
+@@ -140,11 +131,7 @@
+ m_headerPaths = headerPaths;
+ }
+
+- QByteArray definedMacros()
+- {
+- ensureUpdated();
+- return m_definedMacros;
+- }
++ QByteArray definedMacros();
+
+ void enableGarbageCollector(bool enable);
+
diff --git a/debian/patches/series b/debian/patches/series
index ec331ee..0f60dff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ rpath_nonlinux.diff
# Debian patches.
botan_system_lib.diff
+from_header_to_body.diff
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list