[kdevelop] A version of the patch which actually applies.
Kevin Kofler
kkofler at fedoraproject.org
Sat Dec 24 00:20:46 UTC 2011
commit 2b5b6c095015fbca60f9bfa1c20a557f570482c1
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Dec 24 01:20:30 2011 +0100
A version of the patch which actually applies.
cumulative patch from:
http://commits.kde.org/kdevelop/2d77d88856c78bd34690cae57042e7a314f446bf
http://commits.kde.org/kdevelop/14e0929d07b51b7bbccf802ef0a8502c9266140e
http://commits.kde.org/kdevelop/7b20bf4845ea5f85cb7ac8d24d30971f9b862d1d
http://commits.kde.org/kdevelop/1a0aeb55ff099d31fd6fe4f7e02c70f8c5f122ea
(The last is the fix, the others are minor CMake fixes on top of which the fix
applies.)
kdevelop-4.2.3-okteta08.patch | 314 +++++++++++++++--------------------------
kdevelop.spec | 9 +-
2 files changed, 124 insertions(+), 199 deletions(-)
---
diff --git a/kdevelop-4.2.3-okteta08.patch b/kdevelop-4.2.3-okteta08.patch
index 08e228e..6ac0812 100644
--- a/kdevelop-4.2.3-okteta08.patch
+++ b/kdevelop-4.2.3-okteta08.patch
@@ -1,18 +1,7 @@
-commit 1a0aeb55ff099d31fd6fe4f7e02c70f8c5f122ea
-Author: Friedrich W. H. Kossebau <kossebau at kde.org>
-Date: Wed Dec 14 21:56:45 2011 +0100
-
- Changes: compile Okteta plugin also with libs from Okteta 0.8
-
- REVIEW: 103397
-
- (backport of 453745b96b76aaa3615954603878acfcc694e382)
-
-diff --git a/cmake/modules/FindLibKasten.cmake b/cmake/modules/FindLibKasten.cmake
-index 573782b..087eedc 100644
---- a/cmake/modules/FindLibKasten.cmake
-+++ b/cmake/modules/FindLibKasten.cmake
-@@ -1,89 +1,162 @@
+diff -ur kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake
+--- kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake 2011-12-24 01:07:30.000000000 +0100
+@@ -1,73 +1,162 @@
-# - Find Kasten library
+# - Find Kasten libraries, v0 or v1
#
@@ -20,7 +9,8 @@ index 573782b..087eedc 100644
# LIBKASTEN_FOUND - whether the libkasten libraries were found
+# LIBKASTEN_VERSION - version of the libkasten libraries found
# LIBKASTEN_LIBRARIES - the libkasten libraries
- # LIBKASTEN_INCLUDE_DIRS - the include paths of the libkasten libraries
+-# LIBKASTEN_INCLUDE_DIR - the include path of the libkasten libraries
++# LIBKASTEN_INCLUDE_DIRS - the include paths of the libkasten libraries
-if( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
@@ -28,7 +18,8 @@ index 573782b..087eedc 100644
# Already in cache, be silent
set( Kasten_FIND_QUIETLY TRUE )
-endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
--
++endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES AND LIBKASTEN_VERSION )
+
-
-find_library( LIBKASTENCORE_LIBRARY
- NAMES
@@ -61,7 +52,7 @@ index 573782b..087eedc 100644
-)
-
-
--find_path( LIBKASTEN_NORMAL_INCLUDE_DIR
+-find_path( LIBKASTEN_INCLUDE_DIR
- NAMES
- abstractmodel.h
- PATH_SUFFIXES
@@ -71,29 +62,11 @@ index 573782b..087eedc 100644
- ${KDE4_INCLUDE_DIR}
-)
-
--find_path( LIBKASTEN_CAMELCASE_INCLUDE_DIR
-- NAMES
-- Kasten/AbstractModel
-- PATH_SUFFIXES
-- KDE
-- HINTS
-- ${INCLUDE_INSTALL_DIR}
-- ${KDE4_INCLUDE_DIR}
--)
--
--set( LIBKASTEN_INCLUDE_DIRS
-- ${LIBKASTEN_NORMAL_INCLUDE_DIR}
-- ${LIBKASTEN_CAMELCASE_INCLUDE_DIR}
--)
--
--
--if( LIBKASTEN_INCLUDE_DIRS AND LIBKASTEN_LIBRARIES )
+-if( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
- set( LIBKASTEN_FOUND TRUE )
--else( LIBKASTEN_INCLUDE_DIRS AND LIBKASTEN_LIBRARIES )
+-else( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
- set( LIBKASTEN_FOUND FALSE )
--endif( LIBKASTEN_INCLUDE_DIRS AND LIBKASTEN_LIBRARIES )
-+endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES AND LIBKASTEN_VERSION )
-+
+-endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
+if( LIBKASTEN_FIND_VERSION EQUAL 1 )
+ find_library( KASTEN1_CORE_LIB
+ NAMES
@@ -243,17 +216,16 @@ index 573782b..087eedc 100644
+ endif( LibKasten_FIND_REQUIRED )
endif( LIBKASTEN_FOUND )
--mark_as_advanced( LIBKASTEN_INCLUDE_DIRS LIBKASTEN_LIBRARIES )
+-mark_as_advanced( LIBKASTEN_INCLUDE_DIR LIBKASTEN_LIBRARIES )
+mark_as_advanced(
+ LIBKASTEN_INCLUDE_DIRS
+ LIBKASTEN_LIBRARIES
+ LIBKASTEN_VERSION
+)
-diff --git a/cmake/modules/FindLibOkteta.cmake b/cmake/modules/FindLibOkteta.cmake
-index 6371c11..fb807e8 100644
---- a/cmake/modules/FindLibOkteta.cmake
-+++ b/cmake/modules/FindLibOkteta.cmake
-@@ -1,80 +1,146 @@
+diff -ur kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake
+--- kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake 2011-12-24 01:07:55.000000000 +0100
+@@ -1,64 +1,146 @@
-# - Find Okteta library
+# - Find Okteta libraries, v0 or v1
#
@@ -261,25 +233,18 @@ index 6371c11..fb807e8 100644
# LIBOKTETA_FOUND - whether the libokteta libraries were found
+# LIBOKTETA_VERSION - version of the libokteta libraries found
# LIBOKTETA_LIBRARIES - the libokteta libraries
- # LIBOKTETA_INCLUDE_DIRS - the include paths of the libokteta libraries
+-# LIBOKTETA_INCLUDE_DIR - the include path of the libokteta libraries
++# LIBOKTETA_INCLUDE_DIRS - the include paths of the libokteta libraries
--if( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES )
+-if( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
+if( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES AND LIBOKTETA_VERSION )
# Already in cache, be silent
set( Okteta_FIND_QUIETLY TRUE )
--endif( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES )
+-endif( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
+endif( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES AND LIBOKTETA_VERSION )
-+if( LIBOKTETA_FIND_VERSION EQUAL 1 )
-+ find_library( LIBOKTETACORE1_LIBRARY
-+ NAMES
-+ okteta1core
-+ HINTS
-+ ${LIB_INSTALL_DIR}
-+ ${KDE4_LIB_DIR}
-+ )
-
+-
-find_library( LIBOKTETACORE_LIBRARY
- NAMES
- oktetacore
@@ -287,14 +252,7 @@ index 6371c11..fb807e8 100644
- ${LIB_INSTALL_DIR}
- ${KDE4_LIB_DIR}
-)
-+ find_library( LIBOKTETAGUI1_LIBRARY
-+ NAMES
-+ okteta1gui
-+ HINTS
-+ ${LIB_INSTALL_DIR}
-+ ${KDE4_LIB_DIR}
-+ )
-
+-
-find_library( LIBOKTETAGUI_LIBRARY
- NAMES
- oktetagui
@@ -302,11 +260,46 @@ index 6371c11..fb807e8 100644
- ${LIB_INSTALL_DIR}
- ${KDE4_LIB_DIR}
-)
-
+-
-set( LIBOKTETA_LIBRARIES
- ${LIBOKTETACORE_LIBRARY}
- ${LIBOKTETAGUI_LIBRARY}
-)
+-
+-
+-find_path( LIBOKTETA_INCLUDE_DIR
+- NAMES
+- abstractbytearraymodel.h
+- PATH_SUFFIXES
+- okteta
+- HINTS
+- ${INCLUDE_INSTALL_DIR}
+- ${KDE4_INCLUDE_DIR}
+-)
+-
+-if( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
+- set( LIBOKTETA_FOUND TRUE )
+-else( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
+- set( LIBOKTETA_FOUND FALSE )
+-endif( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
++if( LIBOKTETA_FIND_VERSION EQUAL 1 )
++ find_library( LIBOKTETACORE1_LIBRARY
++ NAMES
++ okteta1core
++ HINTS
++ ${LIB_INSTALL_DIR}
++ ${KDE4_LIB_DIR}
++ )
++
++ find_library( LIBOKTETAGUI1_LIBRARY
++ NAMES
++ okteta1gui
++ HINTS
++ ${LIB_INSTALL_DIR}
++ ${KDE4_LIB_DIR}
++ )
++
++
+ find_path( LIBOKTETA1_NORMAL_INCLUDE_DIR
+ NAMES
+ abstractbytearraymodel.h
@@ -316,7 +309,7 @@ index 6371c11..fb807e8 100644
+ ${INCLUDE_INSTALL_DIR}
+ ${KDE4_INCLUDE_DIR}
+ )
-
++
+ find_path( LIBOKTETA1_CAMELCASE_INCLUDE_DIR
+ NAMES
+ Okteta1/AbstractByteArrayModel
@@ -326,36 +319,14 @@ index 6371c11..fb807e8 100644
+ ${INCLUDE_INSTALL_DIR}
+ ${KDE4_INCLUDE_DIR}
+ )
-
--find_path( LIBOKTETA_NORMAL_INCLUDE_DIR
-- NAMES
-- abstractbytearraymodel.h
-- PATH_SUFFIXES
-- okteta
-- HINTS
-- ${INCLUDE_INSTALL_DIR}
-- ${KDE4_INCLUDE_DIR}
--)
-
--find_path( LIBOKTETA_CAMELCASE_INCLUDE_DIR
-- NAMES
-- Okteta/AbstractByteArrayModel
-- PATH_SUFFIXES
-- KDE
-- HINTS
-- ${INCLUDE_INSTALL_DIR}
-- ${KDE4_INCLUDE_DIR}
--)
++
++
+ if( LIBOKTETA1_NORMAL_INCLUDE_DIR AND LIBOKTETA1_CAMELCASE_INCLUDE_DIR AND
+ LIBOKTETACORE1_LIBRARY AND LIBOKTETAGUI1_LIBRARY )
+ set( LIBOKTETA_FOUND TRUE )
+ endif( LIBOKTETA1_NORMAL_INCLUDE_DIR AND LIBOKTETA1_CAMELCASE_INCLUDE_DIR AND
+ LIBOKTETACORE1_LIBRARY AND LIBOKTETAGUI1_LIBRARY )
-
--set( LIBOKTETA_INCLUDE_DIRS
-- ${LIBOKTETA_NORMAL_INCLUDE_DIR}
-- ${LIBOKTETA_CAMELCASE_INCLUDE_DIR}
--)
++
+ if( LIBOKTETA_FOUND )
+ set( LIBOKTETA_VERSION 1 )
+ set( LIBOKTETA_INCLUDE_DIRS
@@ -369,7 +340,7 @@ index 6371c11..fb807e8 100644
+ endif( LIBOKTETA_FOUND )
+
+endif( LIBOKTETA_FIND_VERSION EQUAL 1 )
-
++
+if( LIBOKTETA_FIND_VERSION EQUAL 0 )
+ find_library( LIBOKTETACORE0_LIBRARY
+ NAMES
@@ -378,12 +349,7 @@ index 6371c11..fb807e8 100644
+ ${LIB_INSTALL_DIR}
+ ${KDE4_LIB_DIR}
+ )
-
--if( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES )
-- set( LIBOKTETA_FOUND TRUE )
--else( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
-- set( LIBOKTETA_FOUND FALSE )
--endif( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES )
++
+ find_library( LIBOKTETAGUI0_LIBRARY
+ NAMES
+ oktetagui
@@ -449,16 +415,15 @@ index 6371c11..fb807e8 100644
+ endif( LibOkteta_FIND_REQUIRED )
endif( LIBOKTETA_FOUND )
--mark_as_advanced( LIBOKTETA_INCLUDE_DIRS LIBOKTETA_LIBRARIES )
+-mark_as_advanced( LIBOKTETA_INCLUDE_DIR LIBOKTETA_LIBRARIES )
+mark_as_advanced(
+ LIBOKTETA_INCLUDE_DIRS
+ LIBOKTETA_LIBRARIES
+ LIBOKTETA_VERSION
+)
-diff --git a/cmake/modules/FindLibOktetaKasten.cmake b/cmake/modules/FindLibOktetaKasten.cmake
-index f641fe1..ffeaf1b 100644
---- a/cmake/modules/FindLibOktetaKasten.cmake
-+++ b/cmake/modules/FindLibOktetaKasten.cmake
+diff -ur kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake
+--- kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake 2011-12-24 01:04:52.000000000 +0100
@@ -1,73 +1,141 @@
-# - Find Kasten library
+# - Find Okteta Kasten libraries, v0 or v1
@@ -650,17 +615,17 @@ index f641fe1..ffeaf1b 100644
+ LIBOKTETAKASTEN_LIBRARIES
+ LIBOKTETAKASTEN_VERSION
+)
-diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 822683d..1545d8c 100644
---- a/utils/CMakeLists.txt
-+++ b/utils/CMakeLists.txt
+diff -ur kdevelop-4.2.3/utils/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/CMakeLists.txt
+--- kdevelop-4.2.3/utils/CMakeLists.txt 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/CMakeLists.txt 2011-12-24 01:08:44.000000000 +0100
@@ -1,20 +1,27 @@
macro_optional_find_package( LibOktetaKasten )
-macro_optional_find_package( LibOkteta )
-macro_optional_find_package( LibKasten )
macro_log_feature( LIBOKTETAKASTEN_FOUND
- "liboktetakasten" "Okteta Kasten libraries" "kdesdk/okteta/kasten" FALSE
+- "liboktetakasten" "Okteta Kasten libraries" "kdeutils/okteta/kasten" FALSE
++ "liboktetakasten" "Okteta Kasten libraries" "kdesdk/okteta/kasten" FALSE
"" "Required for building Okteta KDevelop plugin."
)
+
@@ -671,28 +636,27 @@ index 822683d..1545d8c 100644
+macro_optional_find_package( LibKasten )
+
macro_log_feature( LIBOKTETA_FOUND
-- "libokteta" "Okteta libraries" "kdesdk/okteta" FALSE
+- "libokteta" "Okteta libraries" "kdeutils/okteta" FALSE
+ "libokteta v${LIBOKTETA_FIND_VERSION}" "Okteta libraries" "kdesdk/okteta" FALSE
"" "Required for building Okteta KDevelop plugin."
)
macro_log_feature( LIBKASTEN_FOUND
-- "libkasten" "Kasten libraries" "kdesk/okteta/libs" FALSE
+- "libkasten" "Kasten libraries" "kdeutils/okteta/libs" FALSE
+ "libkasten v${LIBKASTEN_FIND_VERSION}" "Kasten libraries" "kdesk/okteta/libs" FALSE
"" "Required for building Okteta KDevelop plugin."
)
+endif( LIBOKTETAKASTEN_FOUND )
+
--if( LIBOKTETA_FOUND AND LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND )
+-if( LIBOKTETA_FOUND AND LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND KDE_VERSION VERSION_GREATER 4.4.50)
+if( LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND LIBOKTETA_FOUND )
add_subdirectory(okteta)
--endif( LIBOKTETA_FOUND AND LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND )
+-endif( LIBOKTETA_FOUND AND LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND KDE_VERSION VERSION_GREATER 4.4.50)
+endif( LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND LIBOKTETA_FOUND )
-diff --git a/utils/okteta/CMakeLists.txt b/utils/okteta/CMakeLists.txt
-index 66bf8b5..3fcb9d1 100644
---- a/utils/okteta/CMakeLists.txt
-+++ b/utils/okteta/CMakeLists.txt
-@@ -3,11 +3,14 @@ project( okteta )
+diff -ur kdevelop-4.2.3/utils/okteta/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/okteta/CMakeLists.txt
+--- kdevelop-4.2.3/utils/okteta/CMakeLists.txt 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/CMakeLists.txt 2011-12-24 01:13:02.000000000 +0100
+@@ -3,11 +3,14 @@
include_directories( ${okteta_SOURCE_DIR} ${okteta_BINARY_DIR} )
@@ -702,16 +666,17 @@ index 66bf8b5..3fcb9d1 100644
+)
include_directories(
- ${LIBKASTEN_INCLUDE_DIRS}
- ${LIBOKTETA_INCLUDE_DIRS}
+- ${LIBKASTEN_INCLUDE_DIR}
+- ${LIBOKTETA_INCLUDE_DIR}
++ ${LIBKASTEN_INCLUDE_DIRS}
++ ${LIBOKTETA_INCLUDE_DIRS}
+ ${LIBOKTETAKASTEN_INCLUDE_DIRS}
)
SET( kdevokteta_PART_SRCS
kastentoolviewwidget.cpp
-diff --git a/utils/okteta/kastentoolviewwidget.cpp b/utils/okteta/kastentoolviewwidget.cpp
-index c69a395..b10974e 100644
---- a/utils/okteta/kastentoolviewwidget.cpp
-+++ b/utils/okteta/kastentoolviewwidget.cpp
+diff -ur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.cpp kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.cpp
+--- kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.cpp 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.cpp 2011-12-24 01:04:52.000000000 +0100
@@ -25,10 +25,15 @@
// plugin
#include "oktetaview.h"
@@ -729,10 +694,9 @@ index c69a395..b10974e 100644
// KDev
#include <interfaces/icore.h>
#include <interfaces/iuicontroller.h>
-diff --git a/utils/okteta/kastentoolviewwidget.h b/utils/okteta/kastentoolviewwidget.h
-index 3a5fd7e..7c6c89a 100644
---- a/utils/okteta/kastentoolviewwidget.h
-+++ b/utils/okteta/kastentoolviewwidget.h
+diff -ur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.h kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.h
+--- kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.h 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.h 2011-12-24 01:04:52.000000000 +0100
@@ -23,10 +23,12 @@
#ifndef KASTENTOOLVIEWWIDGET_H
#define KASTENTOOLVIEWWIDGET_H
@@ -747,10 +711,9 @@ index 3a5fd7e..7c6c89a 100644
class AbstractToolView;
}
namespace Sublime {
-diff --git a/utils/okteta/oktetadocument.cpp b/utils/okteta/oktetadocument.cpp
-index 5ac0311..13b0d0b 100644
---- a/utils/okteta/oktetadocument.cpp
-+++ b/utils/okteta/oktetadocument.cpp
+diff -ur kdevelop-4.2.3/utils/okteta/oktetadocument.cpp kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.cpp
+--- kdevelop-4.2.3/utils/okteta/oktetadocument.cpp 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.cpp 2011-12-24 01:04:52.000000000 +0100
@@ -1,7 +1,7 @@
/*
This file is part of the KDevelop Okteta module, part of the KDE project.
@@ -788,7 +751,7 @@ index 5ac0311..13b0d0b 100644
// KDevelop
#include <shell/core.h>
#include <shell/uicontroller.h>
-@@ -91,7 +104,12 @@ bool OktetaDocument::save( IDocument::DocumentSaveMode mode )
+@@ -91,7 +104,12 @@
Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer();
Kasten::AbstractSyncToRemoteJob* syncJob = synchronizer->startSyncToRemote();
@@ -802,7 +765,7 @@ index 5ac0311..13b0d0b 100644
if( syncSucceeded )
{
-@@ -108,7 +126,12 @@ void OktetaDocument::reload()
+@@ -108,7 +126,12 @@
Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer();
Kasten::AbstractSyncFromRemoteJob* syncJob = synchronizer->startSyncFromRemote();
@@ -816,7 +779,7 @@ index 5ac0311..13b0d0b 100644
if( syncSucceeded )
notifyStateChanged();
-@@ -207,9 +230,19 @@ Sublime::View* OktetaDocument::newView( Sublime::Document* document )
+@@ -207,9 +230,19 @@
Kasten::AbstractModelSynchronizer* synchronizer = synchronizerFactory->createSynchronizer();
Kasten::AbstractLoadJob* loadJob = synchronizer->startLoad( url() );
@@ -838,7 +801,7 @@ index 5ac0311..13b0d0b 100644
delete synchronizerFactory;
}
-@@ -227,7 +260,11 @@ void OktetaDocument::onByteArrayDocumentLoaded( Kasten::AbstractDocument* docume
+@@ -227,7 +260,11 @@
if( document )
{
mByteArrayDocument = static_cast<Kasten::ByteArrayDocument*>( document );
@@ -851,10 +814,9 @@ index 5ac0311..13b0d0b 100644
SLOT(onByteArrayDocumentChanged()) );
}
}
-diff --git a/utils/okteta/oktetadocument.h b/utils/okteta/oktetadocument.h
-index d23d7bc..4e1bfed 100644
---- a/utils/okteta/oktetadocument.h
-+++ b/utils/okteta/oktetadocument.h
+diff -ur kdevelop-4.2.3/utils/okteta/oktetadocument.h kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.h
+--- kdevelop-4.2.3/utils/okteta/oktetadocument.h 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.h 2011-12-24 01:04:52.000000000 +0100
@@ -23,15 +23,17 @@
#ifndef OKTETADOCUMENT_H
#define OKTETADOCUMENT_H
@@ -875,7 +837,7 @@ index d23d7bc..4e1bfed 100644
class ByteArrayDocument;
class AbstractDocument;
}
-@@ -82,7 +84,12 @@ class OktetaDocument : public Sublime::UrlDocument, public IDocument
+@@ -82,7 +84,12 @@
protected Q_SLOTS:
void onByteArrayDocumentChanged();
@@ -888,51 +850,10 @@ index d23d7bc..4e1bfed 100644
private:
OktetaPlugin* mPlugin;
-diff --git a/utils/okteta/oktetaglobal.h b/utils/okteta/oktetaglobal.h
-new file mode 100644
-index 0000000..0113bbb
---- /dev/null
-+++ b/utils/okteta/oktetaglobal.h
-@@ -0,0 +1,35 @@
-+/*
-+ This file is part of the KDevelop Okteta module, part of the KDE project.
-+
-+ Copyright 2011 Friedrich W. H. Kossebau <kossebau at kde.org>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) version 3, or any
-+ later version accepted by the membership of KDE e.V. (or its
-+ successor approved by the membership of KDE e.V.), which shall
-+ act as a proxy defined in Section 6 of version 3 of the license.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef OKTETAGLOBAL_H
-+#define OKTETAGLOBAL_H
-+
-+// Adaptions for the different version of Kasten and Okteta
-+#if KASTEN_VERSION == 1
-+namespace Kasten1 {}
-+namespace Kasten = Kasten1;
-+#define KASTEN_NAMESPACE Kasten1
-+#else
-+#define KASTEN_NAMESPACE Kasten
-+#endif
-+
-+#endif
-diff --git a/utils/okteta/oktetatoolviewfactory.cpp b/utils/okteta/oktetatoolviewfactory.cpp
-index a483f5c..ed0cf13 100644
---- a/utils/okteta/oktetatoolviewfactory.cpp
-+++ b/utils/okteta/oktetatoolviewfactory.cpp
+Nur in kdevelop-4.2.3-okteta08/utils/okteta: oktetaglobal.h.
+diff -ur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.cpp kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.cpp
+--- kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.cpp 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.cpp 2011-12-24 01:04:52.000000000 +0100
@@ -25,9 +25,15 @@
// plugin
#include "kastentoolviewwidget.h"
@@ -949,10 +870,9 @@ index a483f5c..ed0cf13 100644
// KDE
#include <KIcon>
-diff --git a/utils/okteta/oktetatoolviewfactory.h b/utils/okteta/oktetatoolviewfactory.h
-index ddc7770..b69c1bb 100644
---- a/utils/okteta/oktetatoolviewfactory.h
-+++ b/utils/okteta/oktetatoolviewfactory.h
+diff -ur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.h kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.h
+--- kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.h 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.h 2011-12-24 01:04:52.000000000 +0100
@@ -23,10 +23,12 @@
#ifndef OKTETATOOLVIEWFACTORY_H
#define OKTETATOOLVIEWFACTORY_H
@@ -967,10 +887,9 @@ index ddc7770..b69c1bb 100644
class AbstractToolViewFactory;
class AbstractToolFactory;
}
-diff --git a/utils/okteta/oktetaview.h b/utils/okteta/oktetaview.h
-index 9dad1ea..29a6b39 100644
---- a/utils/okteta/oktetaview.h
-+++ b/utils/okteta/oktetaview.h
+diff -ur kdevelop-4.2.3/utils/okteta/oktetaview.h kdevelop-4.2.3-okteta08/utils/okteta/oktetaview.h
+--- kdevelop-4.2.3/utils/okteta/oktetaview.h 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetaview.h 2011-12-24 01:04:52.000000000 +0100
@@ -23,10 +23,12 @@
#ifndef OKTETAVIEW_H
#define OKTETAVIEW_H
@@ -985,10 +904,9 @@ index 9dad1ea..29a6b39 100644
class ByteArrayView;
}
-diff --git a/utils/okteta/oktetawidget.h b/utils/okteta/oktetawidget.h
-index dac83cf..dfc9907 100644
---- a/utils/okteta/oktetawidget.h
-+++ b/utils/okteta/oktetawidget.h
+diff -ur kdevelop-4.2.3/utils/okteta/oktetawidget.h kdevelop-4.2.3-okteta08/utils/okteta/oktetawidget.h
+--- kdevelop-4.2.3/utils/okteta/oktetawidget.h 2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetawidget.h 2011-12-24 01:04:52.000000000 +0100
@@ -23,12 +23,14 @@
#ifndef OKTETAWIDGET_H
#define OKTETAWIDGET_H
diff --git a/kdevelop.spec b/kdevelop.spec
index 39e4dec..ff757ad 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -16,6 +16,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## Upstream patches
# compile Okteta plugin also with libs from Okteta 0.8 (kdesdk 4.8)
# (Friedrich W. H. Kossebau)
+# cumulative patch from:
+# http://commits.kde.org/kdevelop/2d77d88856c78bd34690cae57042e7a314f446bf
+# http://commits.kde.org/kdevelop/14e0929d07b51b7bbccf802ef0a8502c9266140e
+# http://commits.kde.org/kdevelop/7b20bf4845ea5f85cb7ac8d24d30971f9b862d1d
+# http://commits.kde.org/kdevelop/1a0aeb55ff099d31fd6fe4f7e02c70f8c5f122ea
+# (The last is the fix, the others are minor CMake fixes on top of which the fix
+# applies.)
Patch100: kdevelop-4.2.3-okteta08.patch
BuildRequires: boost-devel
@@ -151,7 +158,7 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
%changelog
-* Fri Dec 23 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 9:4.2.3-6
+* Sat Dec 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 9:4.2.3-6
- upstream patch to make Okteta plugin compile against libs from Okteta 0.8
* Mon Dec 05 2011 Rex Dieter <rdieter at fedoraproject.org> 9:4.2.3-5
More information about the scm-commits
mailing list