[SCM] KDevelop packaging branch, master, updated. debian/4.2.3-1-2-gcb89ead

[Pino Toscano]

The following commit has been merged in the master branch:
commit cb89ead3656238b9e0361bf11a63a72b8a5bf403
Author: Pino Toscano <pino at debian.org>
Date:   Thu Mar 15 15:09:38 2012 +0100

    add patch okteta_optional_structures_tool.diff
    
    Detect whether the Okteta structure tool is compiled, and if it is not do not use it in the Okteta plugin;
    this fixes compilation on architectures with no structures tool, i.e. big endian ones.
---
 debian/changelog                                   |    5 ++
 .../patches/okteta_optional_structures_tool.diff   |   49 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85622a9..d4249ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kdevelop (4:4.2.3-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Detect whether the Okteta structure tool is compiled, and if it is not
+    do not use it in the Okteta plugin; this fixes compilation on architectures
+    with no structures tool, i.e. big endian ones.
+    (patch okteta_optional_structures_tool.diff)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 15 Mar 2012 13:21:17 +0100
 
diff --git a/debian/patches/okteta_optional_structures_tool.diff b/debian/patches/okteta_optional_structures_tool.diff
new file mode 100644
index 0000000..aa4a3c8
--- /dev/null
+++ b/debian/patches/okteta_optional_structures_tool.diff
@@ -0,0 +1,49 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Do not use the structures tool if not compiled in Okteta.
+ Currently, the structures plugin of Okteta is compiled only on little endian
+ architectures; this plugin uses it assuming it is always compiled.
+ Check at cmake time whether the structures tool is available in the found
+ kasten headers, and if it is not then disable the usage of the structures
+ tool.
+Last-Update: 2012-03-15
+Forwarded: no
+
+--- a/utils/okteta/oktetaplugin.cpp
++++ b/utils/okteta/oktetaplugin.cpp
+@@ -43,8 +43,10 @@
+ #include <bytetabletoolfactory.h>
+ #include <bookmarkstoolviewfactory.h>
+ #include <bookmarkstoolfactory.h>
++#ifndef OKTETA_NO_STRUCTURES_TOOL
+ #include <structurestoolviewfactory.h>
+ #include <structurestoolfactory.h>
++#endif
+ // KDev
+ #include <project/projectmodel.h>
+ #include <interfaces/icore.h>
+@@ -94,7 +96,9 @@
+     addTool( uiController, new Kasten::ByteTableToolViewFactory(), new Kasten::ByteTableToolFactory() );
+     addTool( uiController, new Kasten::InfoToolViewFactory(), new Kasten::InfoToolFactory() );
+     addTool( uiController, new Kasten::PodDecoderToolViewFactory(), new Kasten::PodDecoderToolFactory() );
++#ifndef OKTETA_NO_STRUCTURES_TOOL
+     addTool( uiController, new Kasten::StructuresToolViewFactory(), new Kasten::StructuresToolFactory() );
++#endif
+     addTool( uiController, new Kasten::BookmarksToolViewFactory, new Kasten::BookmarksToolFactory() );
+ 
+     KDevelop::IDocumentController* documentController = core()->documentController();
+--- a/utils/okteta/CMakeLists.txt
++++ b/utils/okteta/CMakeLists.txt
+@@ -1,9 +1,13 @@
+ project( okteta )
+ 
++find_file(KASTEN_STRUCTTOOL_H structtool.h PATHS ${LIBKASTEN_INCLUDE_DIR} NO_DEFAULT_PATH)
+ 
+ include_directories( ${okteta_SOURCE_DIR} ${okteta_BINARY_DIR} )
+ 
+ # add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9038 )
++if(NOT KASTEN_STRUCTTOOL_H)
++    add_definitions(-DOKTETA_NO_STRUCTURES_TOOL)
++endif()
+ 
+ include_directories(
+   ${LIBKASTEN_INCLUDE_DIR}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3d7680d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+okteta_optional_structures_tool.diff

-- 
KDevelop packaging