File koffice-trinity-gcc6.patch of Package koffice

Overview Repositories Revisions Requests Users Attributes Meta

File koffice-trinity-gcc6.patch of Package koffice

From 0b9e390c01029f4f1a8c0263e532fc1c3faf2b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 3 Sep 2016 17:57:54 +0200
Subject: Fix FTBFS with GCC6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 filters/karbon/ai/ailexer.cc               | 2 +-
 filters/karbon/eps/pscommentlexer.cc       | 2 +-
 filters/kspread/qpro/libqpro/src/stream.cc | 2 +-
 kexi/kexidb/connection.cpp                 | 2 +-
 kexi/kexidb/parser/parser_p.cpp            | 2 +-
 kexi/main/keximainwindowimpl.cpp           | 2 +-
 kpresenter/KPrTextObject.cpp               | 4 ++--
 kspread/kspread_canvas.cc                  | 2 +-
 lib/kformula/kformuladefs.h                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/filters/karbon/ai/ailexer.cc b/filters/karbon/ai/ailexer.cc
index 935403d..352b8f4 100644
--- a/filters/karbon/ai/ailexer.cc
+++ b/filters/karbon/ai/ailexer.cc
@@ -73,7 +73,7 @@ const char*statetoa (State state){
 
 typedef struct {
   State oldState;
-  char c;
+  signed char c;
   State newState;
   Action action;
 } Transition;
diff --git a/filters/karbon/eps/pscommentlexer.cc b/filters/karbon/eps/pscommentlexer.cc
index a321cc0..e15dcc5 100644
--- a/filters/karbon/eps/pscommentlexer.cc
+++ b/filters/karbon/eps/pscommentlexer.cc
@@ -59,7 +59,7 @@ const char*statetoa (State state){
 
 typedef struct {
   State oldState;
-  char c;
+  signed char c;
   State newState;
   Action action;
 } Transition;
diff --git a/filters/kspread/qpro/libqpro/src/stream.cc b/filters/kspread/qpro/libqpro/src/stream.cc
index 5b96eb8..012e18b 100644
--- a/filters/kspread/qpro/libqpro/src/stream.cc
+++ b/filters/kspread/qpro/libqpro/src/stream.cc
@@ -114,7 +114,7 @@ QpIStream::operator void* ()
    if( cIn == 0 )
       return 0;
    else
-      return *cIn;
+      return cIn;
 }
 
 int
diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index dd2eb76..776285e 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -2938,7 +2938,7 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data )
 	bool ok = true;
 	const int objID = data[0].toInt(&ok);
 	if (!ok)
-		return false;
+		return 0;
 	QString sqlText;
 	if (!loadDataBlock( objID, sqlText, "sql" )) {
 		setError(ERR_OBJECT_NOT_FOUND, 
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index df4f332..7c22323 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -585,7 +585,7 @@ QuerySchema* buildSelectQuery(
 			if (!options->whereExpr->validate(parseInfo)) {
 				setError(parseInfo.errMsg, parseInfo.errDescr);
 				CLEANUP;
-				return false;
+				return 0;
 			}
 			querySchema->setWhereExpression(options->whereExpr);
 		}
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 6730c84..bede225 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3697,7 +3697,7 @@ KexiMainWindowImpl::openObjectFromNavigator(KexiPart::Item* item, int viewMode,
 		return 0;
 	}
 	if (!d->prj || !item)
-		return false;
+		return 0;
 #ifndef KEXI_NO_PENDING_DIALOGS
 	Private::PendingJobType pendingType;
 	KexiDialogBase *dlg = d->openedDialogFor( item, pendingType );
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 2d02f6c..d4fc82b 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -2407,11 +2407,11 @@ QDragObject * KPrTextView::newDrag( QWidget * parent )
     oasisStore.closeContentWriter();
 
     if ( !store->open( "styles.xml" ) )
-        return false;
+        return 0;
     //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
     doc->saveOasisDocumentStyles( store, mainStyles, 0, savingContext, KPrDocument::SaveSelected /* simply means not SaveAll */ );
     if ( !store->close() ) // done with styles.xml
-        return false;
+        return 0;
 
     delete store;
 
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 7ce1f63..0518e27 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -246,7 +246,7 @@ Canvas::Canvas (View *_view)
   d->m_resizeObject = 0L;
   d->m_ratio = 0.0;
   d->m_isMoving = false;
-  d->m_objectDisplayAbove = false;
+  d->m_objectDisplayAbove = 0;
   d->m_isResizing = false;
 
   d->prevSpokenPointerRow = -1;
diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h
index 930b8be..d4a3739 100644
--- a/lib/kformula/kformuladefs.h
+++ b/lib/kformula/kformuladefs.h
@@ -163,7 +163,7 @@ enum TokenElementType {
  * The struct used to store static font data.
  */
 struct InternFontTable {
-    short unicode;
+    unsigned short unicode;
     QChar pos;
     CharClass cl;
     CharStyle style;
-- 
cgit v1.1

Places

File koffice-trinity-gcc6.patch of Package koffice

Places