rev 16254 - in trunk/packages: kdevelop/debian kdevelop/debian/patches kdevplatform/debian kdevplatform/debian/patches

Fathi Boudra fabo at alioth.debian.org
Thu Nov 12 16:56:05 UTC 2009


Author: fabo
Date: 2009-11-12 16:56:04 +0000 (Thu, 12 Nov 2009)
New Revision: 16254

Added:
   trunk/packages/kdevelop/debian/patches/01_kdevelop_r1044086.diff
   trunk/packages/kdevelop/debian/patches/02_kdevelop_r1044721.diff
   trunk/packages/kdevplatform/debian/patches/01_kdevplatform_r1044088.diff
Modified:
   trunk/packages/kdevelop/debian/changelog
   trunk/packages/kdevelop/debian/control
   trunk/packages/kdevelop/debian/patches/10_private_libs_soversion.diff
   trunk/packages/kdevelop/debian/patches/series
   trunk/packages/kdevplatform/debian/changelog
   trunk/packages/kdevplatform/debian/control
   trunk/packages/kdevplatform/debian/patches/series
Log:
Prepare kdevplatforma and kdevelop beta 6:
- Add some patches commited after the tag to avoid some crashes.
- Add Replaces to kdevplatform1-libs as some files were moved from
  kdevelop/kdevelop-data.
- Bump build dependencies versions.


Modified: trunk/packages/kdevelop/debian/changelog
===================================================================
--- trunk/packages/kdevelop/debian/changelog	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevelop/debian/changelog	2009-11-12 16:56:04 UTC (rev 16254)
@@ -1,11 +1,12 @@
-kdevelop (4:3.9.96-1) UNRELEASED; urgency=low
+kdevelop (4:3.9.96-1) experimental; urgency=low
 
   * New upstream release.
+  * Add 01_kdevelop_r1044086.diff and 02_kdevelop_r1044721.diff patches.
   * Remove kdevelop version fix.
   * Update debian/kdevelop-data.install: re-add usr/share/icons/* entry and
     update installed files.
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 25 Aug 2009 10:57:44 +0200
+ -- Fathi Boudra <fabo at debian.org>  Thu, 12 Nov 2009 16:34:51 +0100
 
 kdevelop (4:3.9.95-2) experimental; urgency=low
 

Modified: trunk/packages/kdevelop/debian/control
===================================================================
--- trunk/packages/kdevelop/debian/control	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevelop/debian/control	2009-11-12 16:56:04 UTC (rev 16254)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Jeremy Lainé <jeremy.laine at m4x.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, cmake, pkg-kde-tools,
- kdevplatform-dev (>= 0.9.95), kdebase-workspace-dev (>= 4:4.3.0)
+Build-Depends: cdbs, debhelper (>= 7.3.16), quilt, cmake, pkg-kde-tools (>= 0.5),
+ kdevplatform-dev (>= 0.9.96), kdebase-workspace-dev (>= 4:4.3.2)
 Standards-Version: 3.8.3
 Homepage: http://www.kdevelop.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdevelop

Added: trunk/packages/kdevelop/debian/patches/01_kdevelop_r1044086.diff
===================================================================
--- trunk/packages/kdevelop/debian/patches/01_kdevelop_r1044086.diff	                        (rev 0)
+++ trunk/packages/kdevelop/debian/patches/01_kdevelop_r1044086.diff	2009-11-12 16:56:04 UTC (rev 16254)
@@ -0,0 +1,11 @@
+--- a/languages/cpp/codegen/signatureassistant.cpp
++++ b/languages/cpp/codegen/signatureassistant.cpp
+@@ -155,7 +155,7 @@ QString makeSignatureString(Signature si
+     if(!item.second.isEmpty())
+       ret += " " + item.second;
+     
+-    if (!signature.defaultParams[pos].isEmpty())
++    if (signature.defaultParams.size() > pos && !signature.defaultParams[pos].isEmpty())
+       ret += " = " + signature.defaultParams[pos];
+     
+     ++pos;

Added: trunk/packages/kdevelop/debian/patches/02_kdevelop_r1044721.diff
===================================================================
--- trunk/packages/kdevelop/debian/patches/02_kdevelop_r1044721.diff	                        (rev 0)
+++ trunk/packages/kdevelop/debian/patches/02_kdevelop_r1044721.diff	2009-11-12 16:56:04 UTC (rev 16254)
@@ -0,0 +1,36 @@
+--- a/languages/cpp/codegen/signatureassistant.cpp
++++ b/languages/cpp/codegen/signatureassistant.cpp
+@@ -259,13 +259,12 @@ void AdaptDefinitionSignatureAssistant::
+         Signature newSignature;
+         AbstractFunctionDeclaration* contextFunction = dynamic_cast<AbstractFunctionDeclaration*>(decl);
+         foreach(Declaration* parameter, context->localDeclarations()) {
+-          kDebug() << "parameter:" << parameter->toString() << parameter->range().textRange();
++//           kDebug() << "parameter:" << parameter->toString() << parameter->range().textRange();
++          newSignature.defaultParams << contextFunction->defaultParameterForArgument(pos).str();
+           newSignature.parameters << qMakePair(parameter->indexedType(), parameter->identifier().identifier().str());
+           ++pos;
+         }
+         
+-        newSignature.defaultParams = m_oldSignature.defaultParams;
+-        
+         KDevelop::IndexedType newReturnType;
+         FunctionType::Ptr funType = decl->type<FunctionType>();
+         if(funType)
+@@ -307,7 +306,16 @@ void AdaptDefinitionSignatureAssistant::
+             canHaveDefault = false; //This param didn't have a default, none that follow may either
+           }
+         }
+-
++        
++        if(newSignature.parameters.size() != m_oldSignature.parameters.size())
++          changed = true;
++        
++        //We only need to fiddle around with default parameters if we're updating the declaration
++        if(!m_editingDefinition) {
++          for(QList<QString>::iterator it = newSignature.defaultParams.begin(); it != newSignature.defaultParams.end(); ++it)
++            *it = QString();
++        }
++          
+         if(changed /*|| newSignature.returnType != m_oldSignature.returnType*/) {
+           kDebug() << "signature changed";
+           addAction(IAssistantAction::Ptr(new AdaptSignatureAction(m_definitionId, m_definitionContext, m_oldSignature, newSignature)));

Modified: trunk/packages/kdevelop/debian/patches/10_private_libs_soversion.diff
===================================================================
--- trunk/packages/kdevelop/debian/patches/10_private_libs_soversion.diff	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevelop/debian/patches/10_private_libs_soversion.diff	2009-11-12 16:56:04 UTC (rev 16254)
@@ -3,17 +3,17 @@
 @@ -22,6 +22,7 @@ set(kdevcpprpp_LIB_SRCS
  #       to the plugin target
  kde4_add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS})
- target_link_libraries(kdev4cpprpp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} )
+ target_link_libraries(kdev4cpprpp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS} )
 +set_target_properties(kdev4cpprpp PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
  install(TARGETS kdev4cpprpp ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  ########### install files ###############
 --- a/languages/cpp/parser/CMakeLists.txt
 +++ b/languages/cpp/parser/CMakeLists.txt
-@@ -34,4 +34,5 @@ set(kdevcppparser_LIB_SRCS
+@@ -35,4 +35,5 @@ set(kdevcppparser_LIB_SRCS
  #       to the plugin target
  kde4_add_library(kdev4cppparser SHARED ${kdevcppparser_LIB_SRCS})
- target_link_libraries(kdev4cppparser ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} kdev4cpprpp )
+ target_link_libraries(kdev4cppparser ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} kdev4cpprpp )
 +set_target_properties(kdev4cppparser PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
  install(TARGETS kdev4cppparser ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/languages/cpp/cppduchain/CMakeLists.txt
@@ -29,8 +29,8 @@
 --- a/projectmanagers/cmake/CMakeLists.txt
 +++ b/projectmanagers/cmake/CMakeLists.txt
 @@ -70,6 +70,7 @@ target_link_libraries( kdev4cmakecommon 
-                         ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARY} ${KDEVPLATFORM_PROJECT_LIBRARY}
-                         ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARY}
+                         ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES}
+                         ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                          )
 +set_target_properties(kdev4cmakecommon PROPERTIES SOVERSION ${PRIVATE_LIBS_SOVERSION})
  

Modified: trunk/packages/kdevelop/debian/patches/series
===================================================================
--- trunk/packages/kdevelop/debian/patches/series	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevelop/debian/patches/series	2009-11-12 16:56:04 UTC (rev 16254)
@@ -1 +1,3 @@
+01_kdevelop_r1044086.diff
+02_kdevelop_r1044721.diff
 10_private_libs_soversion.diff

Modified: trunk/packages/kdevplatform/debian/changelog
===================================================================
--- trunk/packages/kdevplatform/debian/changelog	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevplatform/debian/changelog	2009-11-12 16:56:04 UTC (rev 16254)
@@ -1,10 +1,13 @@
-kdevplatform (0.9.96-1) UNRELEASED; urgency=low
+kdevplatform (0.9.96-1) unstable; urgency=low
 
   * New upstream release.
+  * Add 01_kdevplatform_r1044088.diff patch.
   * Remove kdevplatform version fix.
   * Update installed plugins. Some plugins were removed upstream.
+  * Add Replaces against kdevelop and kdevelop-data (<< 4:3.9.96-1).
+    Some files were move from these packages to kdevplatform1-libs.
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 25 Aug 2009 10:56:27 +0200
+ -- Fathi Boudra <fabo at debian.org>  Thu, 12 Nov 2009 15:29:14 +0100
 
 kdevplatform (0.9.95-2) unstable; urgency=low
 

Modified: trunk/packages/kdevplatform/debian/control
===================================================================
--- trunk/packages/kdevplatform/debian/control	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevplatform/debian/control	2009-11-12 16:56:04 UTC (rev 16254)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Jeremy Lainé <jeremy.laine at m4x.org>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2),
- pkg-kde-tools (>= 0.4), kdelibs5-dev (>= 4:4.3.0),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.3.16), quilt, cmake (>= 2.6.2),
+ pkg-kde-tools (>= 0.5), kdelibs5-dev (>= 4:4.3.2),
  libsvn-dev, libboost-serialization-dev
 # libcommoncpp2-dev, libboost-iostreams-dev
 Standards-Version: 3.8.3
@@ -16,6 +16,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libsublime1 (>= ${source:Version})
+Replaces: kdevelop (<< 4:3.9.96-1), kdevelop-data (<< 4:3.9.96-1)
 Description: shared libraries for the KDevelop platform
  This package contains shared libraries needed to run integrated development
  environments based on the KDevelop platform.

Added: trunk/packages/kdevplatform/debian/patches/01_kdevplatform_r1044088.diff
===================================================================
--- trunk/packages/kdevplatform/debian/patches/01_kdevplatform_r1044088.diff	                        (rev 0)
+++ trunk/packages/kdevplatform/debian/patches/01_kdevplatform_r1044088.diff	2009-11-12 16:56:04 UTC (rev 16254)
@@ -0,0 +1,138 @@
+--- a/plugins/patchreview/patchreview.cpp
++++ b/plugins/patchreview/patchreview.cpp
+@@ -790,29 +790,24 @@ bool PatchHighlighter::isRemoval(Diff2::
+ }
+ 
+ 
+-PatchHighlighter::PatchHighlighter( const Diff2::DiffModel* model, IDocument* kdoc, PatchReviewPlugin* plugin ) throw( QString ) : m_doc( kdoc ), m_plugin(plugin) {
+-//  connect( kdoc, SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) );
+-    connect( kdoc->textDocument(), SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) );
+-    connect( model, SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) );
+-
+-    KTextEditor::Document* doc = kdoc->textDocument();
+-    if ( doc->lines() == 0 )
+-        return ;
+-
+-    if ( !model->differences() )
++void PatchHighlighter::textInserted(KTextEditor::Document* doc, KTextEditor::Range range)
++{
++    if(range == doc->documentRange())
++    {
++      kWarning() << "re-doing";
++      //The document was loaded / reloaded
++    if ( !m_model->differences() )
+         return ;
+     KTextEditor::SmartInterface* smart = dynamic_cast<KTextEditor::SmartInterface*>( doc );
+     if ( !smart )
+-        throw QString( "no smart-interface" );
++        return;
+ 
+     KTextEditor::MarkInterface* markIface = dynamic_cast<KTextEditor::MarkInterface*>( doc );
+     if( !markIface )
+-      throw QString( "no mark-interface" );
++      return;
++    
++    clear();
+     
+-    ///This requires the KDE 4.4 development branch from 12.8.2009
+-    connect(doc, SIGNAL(markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&)), this, SLOT(markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&)));
+-    connect(doc, SIGNAL(markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&)), this, SLOT(markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&)));
+-
+     QColor activeIconColor = QApplication::palette().color(QPalette::Active, QPalette::Highlight);
+     QColor inActiveIconColor = QApplication::palette().color(QPalette::Active, QPalette::Base);
+     
+@@ -843,7 +838,9 @@ PatchHighlighter::PatchHighlighter( cons
+ 
+     KTextEditor::SmartRange* topRange = smart->newSmartRange(doc->documentRange(), 0, KTextEditor::SmartRange::ExpandLeft | KTextEditor::SmartRange::ExpandRight);
+ 
+-    for ( Diff2::DifferenceList::const_iterator it = model->differences() ->begin(); it != model->differences() ->end(); ++it ) {
++    topRange->addWatcher(this);
++    
++    for ( Diff2::DifferenceList::const_iterator it = m_model->differences() ->begin(); it != m_model->differences() ->end(); ++it ) {
+         Diff2::Difference* diff = *it;
+         int line, lineCount;
+         Diff2::DifferenceStringList lines ;
+@@ -865,6 +862,7 @@ PatchHighlighter::PatchHighlighter( cons
+         if ( endC.isValid() && c.isValid() ) {
+             KTextEditor::SmartRange * r = smart->newSmartRange( c, endC );
+             r->setParentRange(topRange);
++            r->addWatcher(this);
+             
+             m_differencesForRanges[r] = *it;
+ 
+@@ -875,6 +873,24 @@ PatchHighlighter::PatchHighlighter( cons
+     m_ranges << topRange;
+ 
+     smart->addHighlightToDocument(topRange);
++    }
++}
++
++PatchHighlighter::PatchHighlighter( const Diff2::DiffModel* model, IDocument* kdoc, PatchReviewPlugin* plugin ) throw( QString ) : m_doc( kdoc ), m_plugin(plugin), m_model(model) {
++//  connect( kdoc, SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) );
++    connect( kdoc->textDocument(), SIGNAL(textInserted(KTextEditor::Document*,KTextEditor::Range)), this, SLOT(textInserted(KTextEditor::Document*,KTextEditor::Range)) );
++    connect( kdoc->textDocument(), SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) );
++    connect( model, SIGNAL( destroyed( QObject* ) ), this, SLOT( documentDestroyed() ) );
++
++    KTextEditor::Document* doc = kdoc->textDocument();
++    if ( doc->lines() == 0 )
++        return ;
++
++    ///This requires the KDE 4.4 development branch from 12.8.2009
++    connect(doc, SIGNAL(markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&)), this, SLOT(markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&)));
++    connect(doc, SIGNAL(markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&)), this, SLOT(markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&)));
++    
++    textInserted(kdoc->textDocument(), kdoc->textDocument()->documentRange());
+ }
+ 
+ void PatchHighlighter::removeLineMarker(KTextEditor::SmartRange* range, Diff2::Difference* difference)
+@@ -968,7 +984,7 @@ void PatchHighlighter::addLineMarker(KTe
+     }
+ }
+ 
+-PatchHighlighter::~PatchHighlighter()
++void PatchHighlighter::clear()
+ {
+     KTextEditor::SmartInterface* smart = dynamic_cast<KTextEditor::SmartInterface*>( m_doc->textDocument() );
+     if ( !smart )
+@@ -990,10 +1006,16 @@ PatchHighlighter::~PatchHighlighter()
+     
+     QMutexLocker lock(smart->smartMutex());
+ 
+-    for ( QSet<KTextEditor::SmartRange*>::iterator it = m_ranges.begin(); it != m_ranges.end(); ++it )
+-        delete *it;
++    while(!m_ranges.isEmpty())
++      delete *m_ranges.begin();
+ 
+-    m_ranges.clear();
++    Q_ASSERT(m_ranges.isEmpty());
++    Q_ASSERT(m_differencesForRanges.isEmpty());
++}
++
++PatchHighlighter::~PatchHighlighter()
++{
++    clear();
+ }
+ 
+ IDocument* PatchHighlighter::doc() {
+--- a/plugins/patchreview/patchreview.h
++++ b/plugins/patchreview/patchreview.h
+@@ -71,16 +71,19 @@ private:
+     KTextEditor::SmartRange* rangeForMark(KTextEditor::Mark mark);
+ 
+     virtual void rangeDeleted(KTextEditor::SmartRange* range);
++    void clear();
+     QSet<KTextEditor::SmartRange*> m_ranges;
+     QMap<KTextEditor::SmartRange*, Diff2::Difference*> m_differencesForRanges;
+     KDevelop::IDocument* m_doc;
+     PatchReviewPlugin* m_plugin;
++    const Diff2::DiffModel* m_model;
+ public slots:
+     void markToolTipRequested(KTextEditor::Document*,KTextEditor::Mark,QPoint,bool&);
+     void showToolTipForMark(QPoint arg1, KTextEditor::SmartRange* arg2, QPair< int, int > highlightMark = qMakePair(-1, -1));
+     bool isRemoval(Diff2::Difference*);
+     bool isInsertion(Diff2::Difference*);
+     void markClicked(KTextEditor::Document*,KTextEditor::Mark,bool&);
++    void textInserted(KTextEditor::Document*,KTextEditor::Range);
+ };
+ 
+ class DiffSettings;

Modified: trunk/packages/kdevplatform/debian/patches/series
===================================================================
--- trunk/packages/kdevplatform/debian/patches/series	2009-11-11 23:54:26 UTC (rev 16253)
+++ trunk/packages/kdevplatform/debian/patches/series	2009-11-12 16:56:04 UTC (rev 16254)
@@ -1,2 +1,3 @@
+01_kdevplatform_r1044088.diff
 #10_private_libs_soversion.diff
 11_disable_examples_tests.diff




More information about the pkg-kde-commits mailing list