RHEL/Fedora: updates K3B for GCC 4.7

2 files changed, 36 insertions, 5 deletions

diff --git a/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch b/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch
new file mode 100644
index 000000000..3de442b61
--- /dev/null
+++ b/redhat/applications/k3b/k3b-3.5.13-fix_Range_r_3-gcc47.patch
@@ -0,0 +1,22 @@
+--- k3b/src/projects/k3baudioeditorwidget.cpp
++++ k3b/src/projects/k3baudioeditorwidget.cpp	2012-04-18 16:48:00.794902506 -0500
+@@ -663,15 +663,16 @@
+ {
+   m_draggedRange = 0;
+   m_draggedMarker = 0;
+-
+   bool end;
+-  if( Range* r = findRangeEdge( e->pos(), &end ) ) {
++  Range* r = findRangeEdge( e->pos(), &end );
++
++  if (r) {
+     m_draggedRange = r;
+     m_draggingRangeEnd = end;
+     setSelectedRange( r );
+   }
+   else {
+-    Range* r = findRange( e->pos() );
++    r = findRange( e->pos() );
+     d->movedRange = r;
+     d->lastMovePosition = posToMsf( e->pos().x() );
+     setSelectedRange( r );
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index fd325935d..a0569181a 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -49,6 +49,9 @@ Patch106: trinity-k3b-icons.patch
 # TDE 3.5.13 library directory changed
 Patch107: k3b-i18n-trinity.patch
 
+# [k3b] Fix compilation with GCC 4.7 [Bug #958]
+Patch108:	k3b-3.5.13-fix_Range_r_3-gcc47.patch
+
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: desktop-file-utils
 BuildRequires: alsa-lib-devel
@@ -120,15 +123,17 @@ Requires: %{name}-libs = %{version}-%{release}
 %patch4 -p1 -b .manualbufsize
 %patch106 -p1 -b .desktopfile
 %patch107
+%patch108 -p1
 
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+%__sed -i admin/acinclude.m4.in \
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -213,7 +218,7 @@ update-desktop-database -q &> /dev/null
 %{_bindir}/k3b
 %{tde_libdir}/*.so
 %{tde_libdir}/*.la
-%doc %{_docdir}/HTML/*/k3b/*
+%doc %{tde_docdir}/HTML/en/k3b
 
 %files common
 %defattr(-,root,root,-)
@@ -242,6 +247,10 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Rebuilt for Fedora 17
+- Fix compilation with GCC 4.7 [Bug #958]
+
 * Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Updates BuildRequires