Hello community,

here is the log from the commit of package kdevelop4-pg-qt for openSUSE:Factory 
checked in at 2015-01-22 21:49:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdevelop4-pg-qt (Old)
 and      /work/SRC/openSUSE:Factory/.kdevelop4-pg-qt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdevelop4-pg-qt"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdevelop4-pg-qt/kdevelop4-pg-qt.changes  
2014-09-01 16:59:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdevelop4-pg-qt.new/kdevelop4-pg-qt.changes     
2015-01-22 21:50:18.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Jan 22 09:20:32 UTC 2015 - [email protected]
+
+- Add upstream commit to fix warnings to resolve the current
+  build errors
+  - fix-error.diff
+
+-------------------------------------------------------------------

New:
----
  fix-error.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdevelop4-pg-qt.spec ++++++
--- /var/tmp/diff_new_pack.1NQS3J/_old  2015-01-22 21:50:19.000000000 +0100
+++ /var/tmp/diff_new_pack.1NQS3J/_new  2015-01-22 21:50:19.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kdevelop4-pg-qt
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@
 Group:          Development/Tools/IDE
 Url:            http://www.kdevelop.org
 Source0:        kdevelop-pg-qt-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM fix-error.diff 
+Patch1:         fix-error.diff
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libkde4-devel
@@ -36,6 +38,7 @@
 
 %prep
 %setup -q -n kdevelop-pg-qt-%{version}
+%patch1 -p1
 
 %build
   %cmake_kde4 -d build

++++++ fix-error.diff ++++++
commit ac587957cd0cabbc668604507e2cfebb6810ed09
Author: Milian Wolff <[email protected]>
Date:   Thu Nov 29 15:56:40 2012 +0100

    fix some warnings

diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
index e06c6be..badb461 100644
--- a/kdev-pg/kdev-pg-code-gen.cpp
+++ b/kdev-pg/kdev-pg-code-gen.cpp
@@ -51,7 +51,7 @@ namespace KDevPG
 
   void generateCondition(const World::NodeSet& s, QTextStream& out)
   {
-    if(s.size() == 0 || s.size() == 1 && 
nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
+    if(s.size() == 0 || (s.size() == 1 && 
nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
     {
       out << "true /*epsilon*/";
       return;
diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
index a0864af..9261d71 100644
--- a/kdev-pg/kdev-pg-lexer.ll
+++ b/kdev-pg/kdev-pg-lexer.ll
@@ -425,7 +425,7 @@ void appendLineBuffer()
   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); 
/* append current */
   /* strcpy is faster than strcat */
   
-  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
+  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
   
   lastTextLeng = strlen(yytext);
   yymoreFlag = false;
diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
index d5a25f5..8f8d604 100644
--- a/kdev-pg/kdev-pg-parser.yy
+++ b/kdev-pg/kdev-pg-parser.yy
@@ -309,7 +309,7 @@ opt_lexer_action
     | T_CONTINUE {
         r = "\nlxCONTINUE;\n";
       }
-    | /* empty */ { r = "\nlxSKIP\n" }
+    | /* empty */ { r = "\nlxSKIP\n"; }
     ;
 
 regexp
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to