rpms/ed2k_hash/devel ed2k_hash-gcc43.patch, NONE, 1.1 ed2k_hash.spec, 1.4, 1.5

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Sun Jan 6 14:27:06 UTC 2008


Author: rathann

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

Modified Files:
	ed2k_hash.spec 
Added Files:
	ed2k_hash-gcc43.patch 
Log Message:
- fix compilation with gcc-4.3

ed2k_hash-gcc43.patch:

--- NEW FILE ed2k_hash-gcc43.patch ---
diff -up ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp.gcc43 ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp
--- ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp.gcc43	2003-05-25 13:55:33.000000000 +0200
+++ ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp	2008-01-06 14:48:05.000000000 +0100
@@ -28,6 +28,8 @@
 **********************************************************************/
 // $Id: JobQueue.cpp,v 1.1 2003/05/25 11:55:33 fraca7 Exp $
 
+#include <cstdlib>
+#include <cstring>
 #include "JobQueue.h"
 #include "MainWindow.h"
 #include "Event.h"
diff -up ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp.gcc43 ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp
--- ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp.gcc43	2004-01-09 22:12:11.000000000 +0100
+++ ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp	2008-01-06 15:17:14.000000000 +0100
@@ -42,7 +42,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <cstring>
 #include <iostream>
 
 using namespace std;


Index: ed2k_hash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ed2k_hash/devel/ed2k_hash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ed2k_hash.spec	24 Oct 2007 22:00:07 -0000	1.4
+++ ed2k_hash.spec	6 Jan 2008 14:26:28 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Edonkey 2000 file hash calculator
 Name: ed2k_hash
 Version: 0.4.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://ed2k-tools.sourceforge.net/index.shtml
 Group: Applications/File
 Source0: http://dl.sourceforge.net/sourceforge/ed2k-tools/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Source2: ed2k-logo-mini.png
 Patch0: %{name}-64bit.patch
 Patch1: %{name}-warnings.patch
+Patch2: %{name}-gcc43.patch
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fltk-devel
@@ -31,6 +32,7 @@
 %setup -q
 %patch0 -p1 -b .64bit
 %patch1 -p1 -b .w
+%patch2 -p1 -b .gcc43
 
 %build
 %configure
@@ -74,6 +76,9 @@
 %{_iconsdir}/%{name}.png
 
 %changelog
+* Sun Jan 06 2008 Dominik Mierzejewski <rpm at greysector.net> 0.4.0-6
+- fix compilation with gcc-4.3
+
 * Wed Oct 24 2007 Dominik Mierzejewski <rpm at greysector.net> 0.4.0-5
 - fix hash miscalculation on 64bit (bug #255321)
 - fix compilation warnings




More information about the fedora-extras-commits mailing list