rpms/krusader/devel krusader-1.80.0-gcc43-compile-fix.patch, NONE, 1.1 krusader.spec, 1.18, 1.19

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/pkgs/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32215

Modified Files:
	krusader.spec 
Added Files:
	krusader-1.80.0-gcc43-compile-fix.patch 
Log Message:
- GCC 4.3 compile fix


krusader-1.80.0-gcc43-compile-fix.patch:

--- NEW FILE krusader-1.80.0-gcc43-compile-fix.patch ---
diff -ur krusader-1.80.0-orig/iso/isoservice.desktop krusader-1.80.0/iso/isoservice.desktop
--- krusader-1.80.0-orig/iso/isoservice.desktop	2004-10-11 01:10:52.000000000 +0200
+++ krusader-1.80.0/iso/isoservice.desktop	2008-02-14 17:33:52.000000000 +0100
@@ -11,4 +11,4 @@
 Name=ISO9660 View
 Name[hu]=ISO9660 Nézet
 Name[fr]=Lecteur ISO9660
-Exec=
\ Brak znaku nowej linii na końcu pliku
+Exec=kfmclient exec iso:%f
diff -ur krusader-1.80.0-orig/krusader/Konfigurator/kgcolors.cpp krusader-1.80.0/krusader/Konfigurator/kgcolors.cpp
--- krusader-1.80.0-orig/krusader/Konfigurator/kgcolors.cpp	2006-10-02 17:55:32.000000000 +0200
+++ krusader-1.80.0/krusader/Konfigurator/kgcolors.cpp	2008-02-14 17:34:46.000000000 +0100
@@ -613,13 +613,15 @@
 void KgColors::serializeItem(class QDataStream & stream, const char * name)
 {
    stream << QString(name);
-   if( name == "KDE Default" || name == "Enable Alternate Background" ||
-       name == "Show Current Item Always" || name == "Dim Inactive Colors" )
+   if( (strcmp( name, "KDE Default") == 0)
+        || (strcmp( name, "Enable Alternate Background") == 0)
+        || (strcmp( name, "Show Current Item Always") == 0)
+        || (strcmp( name, "Dim Inactive Colors") == 0) )
    {
      bool bValue = generals->find( name )->isChecked();
      stream << QString( bValue ? "true" : "false" );
    }
-   else if( name == "Dim Factor" )
+   else if( strcmp( name, "Dim Factor") == 0 )
      stream << QString::number(dimFactor->value());
    else
    {
diff -ur krusader-1.80.0-orig/krusader/UserAction/expander.cpp krusader-1.80.0/krusader/UserAction/expander.cpp
--- krusader-1.80.0-orig/krusader/UserAction/expander.cpp	2007-03-19 12:55:33.000000000 +0100
+++ krusader-1.80.0/krusader/UserAction/expander.cpp	2008-02-14 17:34:29.000000000 +0100
@@ -10,6 +10,8 @@
 //
 //
 
+#include <algorithm>
+
 #include "expander.h"
 
 #include "../krusader.h"


Index: krusader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- krusader.spec	15 Dec 2007 19:43:34 -0000	1.18
+++ krusader.spec	14 Feb 2008 16:38:50 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.80.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -9,6 +9,8 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		krusader-1.80.0-gcc43-compile-fix.patch
+
 BuildRequires:	kdelibs3-devel kdebase3-devel
 BuildRequires:	libpng-devel gamin-devel libacl-devel
 BuildRequires:	desktop-file-utils automake gettext
@@ -27,6 +29,8 @@
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 
@@ -92,6 +96,9 @@
 %{_datadir}/services/*.protocol
 
 %changelog
+* Thu Feb 14 2008 Marcin Garski <mgarski[AT]post.pl> 1.80.0-5
+- GCC 4.3 compile fix
+
 * Sat Dec 15 2007 Marcin Garski <mgarski[AT]post.pl> 1.80.0-4
 - Remove kdebindings-devel dependency (#425081)