[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH]][Fwd: Changes in Strigi caused build problems in 4.1 BRANCH]
From:       James Richard Tyrer <tyrerj () acm ! org>
Date:       2008-08-27 3:04:11
Message-ID: 48B4C42B.1000006 () acm ! org
[Download RAW message or body]

There have been problems building KDE-4.1 BRANCH:

-------- Original Message --------
Subject: Changes in Strigi caused build problems in 4.1 BRANCH
Date: Mon, 18 Aug 2008 19:25:03 -0700
From: James Richard Tyrer <tyrerj@acm.org>
Reply-To: kde-devel@kde.org
To: kde-devel@kde.org

This is from KDELibs:

[ 45%] Building CXX object
kio/kio/dummyanalyzers/CMakeFiles/dummy.dir/dummyanalyzers.o
/usr/SVN/branches/KDE/4.1/kdelibs/kio/kio/dummyanalyzers/dummyanalyzers.cpp:43: 

error: conflicting return type specified for 'virtual char
DummyEndAnalyzer::analyze(Strigi::AnalysisResult&, Strigi::InputStream*)'
/usr/local/KDE-4.1/include/strigi/streamendanalyzer.h:37: error:
overriding 'virtual signed char
Strigi::StreamEndAnalyzer::analyze(Strigi::AnalysisResult&,
Strigi::InputStream*)'
make[2]: ***
[kio/kio/dummyanalyzers/CMakeFiles/dummy.dir/dummyanalyzers.o] Error 1
make[1]: *** [kio/kio/dummyanalyzers/CMakeFiles/dummy.dir/all] Error 2
make: *** [all] Error 2

But I had the same error in other modules (KDESDK, etc.).

<SNIP>

-- 

There are similar problems with KDEPIM and KDESDK.  Fixing the type 
conflicts with the attached 3 patches fixes the problem with the 
compile.  However, I do not know if this creates other problems.

I just built 852908-9 and it build without errors except for unrelated 
problems in KDEBase.

I am using GCC-4.2.4 and I wonder if older versions of the compiler 
ignore the type mismatch.

Note that I did not build KDEBindings so I don't know if there is any 
issue with it.

-- 
JRT






["kde4.1_build-kdelibs00.diff" (text/plain)]

Index: kio/kio/dummyanalyzers/dummyanalyzers.cpp
===================================================================
--- kio/kio/dummyanalyzers/dummyanalyzers.cpp	(revision 852451)
+++ kio/kio/dummyanalyzers/dummyanalyzers.cpp	(working copy)
@@ -40,7 +40,7 @@ public:
     bool checkHeader(const char*, int32_t) const {
         return false;
     }
-    char analyze(Strigi::AnalysisResult&, InputStream*) {
+    signed char analyze(Strigi::AnalysisResult&, InputStream*) {
         return -1;
     }
     const char* name() const { return "DummyEndAnalyzer"; }

["kde4.1_build-kdepim00.diff" (text/plain)]

Index: strigi-analyzer/rfc822/rfc822endanalyzer.cpp
===================================================================
--- strigi-analyzer/rfc822/rfc822endanalyzer.cpp	(revision 852724)
+++ strigi-analyzer/rfc822/rfc822endanalyzer.cpp	(working copy)
@@ -38,7 +38,7 @@ bool Rfc822EndAnalyzer::checkHeader(  co
     return false;
 }
 
-char Rfc822EndAnalyzer::analyze( Strigi::AnalysisResult& idx, Strigi::InputStream* in )
+signed char Rfc822EndAnalyzer::analyze( Strigi::AnalysisResult& idx, Strigi::InputStream* in )
 {
     char id_from[] = "From: ";
     char id_to[] = "To: ";
Index: strigi-analyzer/rfc822/rfc822endanalyzer.h
===================================================================
--- strigi-analyzer/rfc822/rfc822endanalyzer.h	(revision 852724)
+++ strigi-analyzer/rfc822/rfc822endanalyzer.h	(working copy)
@@ -36,7 +36,7 @@ public:
 
   const char* name() const { return "Rfc822EndAnalyzer"; }
   bool checkHeader( const char* header, int32_t headersize ) const;
-  char analyze(  Strigi::AnalysisResult& idx, Strigi::InputStream* in );
+  signed char analyze(  Strigi::AnalysisResult& idx, Strigi::InputStream* in );
 
 private:
   const Rfc822EndAnalyzerFactory* m_factory;
Index: strigi-analyzer/ics/icsendanalyzer.h
===================================================================
--- strigi-analyzer/ics/icsendanalyzer.h	(revision 852724)
+++ strigi-analyzer/ics/icsendanalyzer.h	(working copy)
@@ -36,7 +36,7 @@ public:
 
   const char* name() const { return "IcsEndAnalyzer"; }
   bool checkHeader( const char* header, int32_t headersize ) const;
-  char analyze(  Strigi::AnalysisResult& idx, Strigi::InputStream* in );
+  signed char analyze(  Strigi::AnalysisResult& idx, Strigi::InputStream* in );
 
 private:
   const IcsEndAnalyzerFactory* m_factory;
Index: strigi-analyzer/ics/icsendanalyzer.cpp
===================================================================
--- strigi-analyzer/ics/icsendanalyzer.cpp	(revision 852724)
+++ strigi-analyzer/ics/icsendanalyzer.cpp	(working copy)
@@ -51,7 +51,7 @@ bool IcsEndAnalyzer::checkHeader( const 
 I chose to use libkcal instead of reading the calendar manually. It's easier to
 maintain this way.
 */
-char IcsEndAnalyzer::analyze( Strigi::AnalysisResult& idx, Strigi::InputStream* in )
+signed char IcsEndAnalyzer::analyze( Strigi::AnalysisResult& idx, Strigi::InputStream* in )
 {
   CalendarLocal cal( QString::fromLatin1( "UTC" ) );
 
Index: strigi-analyzer/vcf/vcfendanalyzer.h
===================================================================
--- strigi-analyzer/vcf/vcfendanalyzer.h	(revision 852724)
+++ strigi-analyzer/vcf/vcfendanalyzer.h	(working copy)
@@ -37,7 +37,7 @@ class PIMSTRIGI_ANALYZER_EXPORT VcfEndAn
 
     const char* name() const { return "VcfEndAnalyzer"; }
     bool checkHeader( const char* header, int32_t headersize ) const;
-    char analyze(  Strigi::AnalysisResult& idx, Strigi::InputStream* in );
+    signed char analyze(  Strigi::AnalysisResult& idx, Strigi::InputStream* in );
 
   private:
     const VcfEndAnalyzerFactory* m_factory;
Index: strigi-analyzer/vcf/vcfendanalyzer.cpp
===================================================================
--- strigi-analyzer/vcf/vcfendanalyzer.cpp	(revision 852724)
+++ strigi-analyzer/vcf/vcfendanalyzer.cpp	(working copy)
@@ -43,7 +43,7 @@ bool VcfEndAnalyzer::checkHeader( const 
  * It's easier to use KABC::VCardConverter to extract the single fields from the vCard
  * than doing it manually.
  */
-char VcfEndAnalyzer::analyze( Strigi::AnalysisResult& idx, Strigi::InputStream* in )
+signed char VcfEndAnalyzer::analyze( Strigi::AnalysisResult& idx, Strigi::InputStream* in )
 {
   const char* data;
   if ( in->read( data, 1, in->size() ) < 0 )

["kde4.1_build-kdesdk00.diff" (text/plain)]

Index: strigi-analyzer/po/poendanalyzer.cpp
===================================================================
--- strigi-analyzer/po/poendanalyzer.cpp	(revision 852724)
+++ strigi-analyzer/po/poendanalyzer.cpp	(working copy)
@@ -41,7 +41,7 @@ class PoEndAnalyzer : public StreamEndAn
         PoEndAnalyzer(const PoEndAnalyzerFactory* f):factory(f) {}
         const char* name() const {return "PoEndAnalyzer";}
         bool checkHeader(const char* header, int32_t headersize) const;
-        char analyze(Strigi::AnalysisResult& idx,Strigi::InputStream* in);
+        signed char analyze(Strigi::AnalysisResult& idx,Strigi::InputStream* in);
     private:
         const PoEndAnalyzerFactory* factory;
 };
@@ -103,7 +103,7 @@ bool PoEndAnalyzer::checkHeader(const ch
 }
 
 
-char PoEndAnalyzer::analyze(AnalysisResult& idx, InputStream* in)
+signed char PoEndAnalyzer::analyze(AnalysisResult& idx, InputStream* in)
 {
     if (idx.extension()=="svn-base")
         return Ok;


[prev in list] [next in list] [prev in thread] [next in thread]