[kdewebdev] * Thu Mar 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-11 - fix g++ 4.6 FTBFS properly,

[Kevin Kofler]

commit b0599de58add16ff1a4b489bc74eed204605fb2f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Mar 11 00:21:47 2011 +0100

    * Thu Mar 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-11
    - fix g++ 4.6 FTBFS properly, don't use a temporary as an lvalue, the code
      probably silently did the wrong thing when built with an older g++
    - drop -fpermissive (which should never be used)

 kdewebdev-3.5.10-gcc46.patch |   16 ++++++++++++++++
 kdewebdev.spec               |   14 ++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/kdewebdev-3.5.10-gcc46.patch b/kdewebdev-3.5.10-gcc46.patch
new file mode 100644
index 0000000..9e4e264
--- /dev/null
+++ b/kdewebdev-3.5.10-gcc46.patch
@@ -0,0 +1,16 @@
+diff -ur kdewebdev-3.5.10/quanta/parsers/tag.h kdewebdev-3.5.10-gcc46/quanta/parsers/tag.h
+--- kdewebdev-3.5.10/quanta/parsers/tag.h	2005-09-10 10:22:52.000000000 +0200
++++ kdewebdev-3.5.10-gcc46/quanta/parsers/tag.h	2011-03-11 00:16:25.000000000 +0100
+@@ -86,8 +86,10 @@
+   QString attributeValue(const QString &attr, bool ignoreCase = false);
+   /** Add an attribute */
+   void addAttribute(TagAttr attr) {attrs.append(attr);}
+-  /** Get the attribute number index */
+-  TagAttr getAttribute(uint index) const {return attrs[index];}
++  /** Get the attribute number index (const version) */
++  const TagAttr &getAttribute(uint index) const {return attrs[index];}
++  /** Get the attribute number index (must return a reference for Kafka) */
++  TagAttr &getAttribute(uint index) {return attrs[index];}
+   /** Remove the attribute number index */
+   void deleteAttribute(uint index) {attrs.remove(attrs.at(index));}
+   /** Insert a new Attribute, even if it already exists. Prefer using editAttribute.
diff --git a/kdewebdev.spec b/kdewebdev.spec
index 0f822d1..44e6ea4 100644
--- a/kdewebdev.spec
+++ b/kdewebdev.spec
@@ -5,7 +5,7 @@ Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -24,6 +24,9 @@ Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
 Patch2: arts-acinclude.patch
 # fixes crash in kimagemapeditor when using freehand tool
 Patch3: kdewebdev-3.5.10-fix-freehand-crash.patch
+# fixes using a temporary as a lvalue in KafkaPart (FTBFS with g++ 4.6, probably
+# silently did the wrong thing before)
+Patch4: kdewebdev-3.5.10-gcc46.patch
 
 %if %{make_cvs}
 BuildRequires: automake libtool
@@ -91,6 +94,7 @@ Requires: kdelibs3%{?_isa} >= %{version}
 %patch1 -p1 -b .kxsldbg-icons
 %patch2 -p1 -b .autoconf
 %patch3 -p1 -b .fix-freehand-crash
+%patch4 -p1 -b .gcc46
 
 install -m644 -p %{SOURCE5} kxsldbg/
 
@@ -104,9 +108,6 @@ install -m644 -p %{SOURCE5} kxsldbg/
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-# gcc 4.6+ is more strict, hack to support old code
-export CXXFLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive")
-
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
@@ -212,6 +213,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-11
+- fix g++ 4.6 FTBFS properly, don't use a temporary as an lvalue, the code
+  probably silently did the wrong thing when built with an older g++
+- drop -fpermissive (which should never be used)
+
 * Wed Mar 09 2011 Jaroslav Reznik <jreznik at redhat.com> - 6:3.5.10-10
 - fixes crash in kimagemapeditor when using freehand tool
 - add -fpermissive to build with gcc 4.6+