rpms/dasher/devel gcc43.patch,NONE,1.1 dasher.spec,1.72,1.73
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Feb 19 15:45:06 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/dasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26249
Modified Files:
dasher.spec
Added Files:
gcc43.patch
Log Message:
Fix the build
gcc43.patch:
--- NEW FILE gcc43.patch ---
diff -up dasher-4.7.0/Src/Gtk2/dasher_main.cpp.gcc43 dasher-4.7.0/Src/Gtk2/dasher_main.cpp
--- dasher-4.7.0/Src/Gtk2/dasher_main.cpp.gcc43 2008-02-19 10:23:43.000000000 -0500
+++ dasher-4.7.0/Src/Gtk2/dasher_main.cpp 2008-02-19 10:23:56.000000000 -0500
@@ -1,5 +1,7 @@
#include "config.h"
+#include <cstring>
+
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <glade/glade.h>
diff -up dasher-4.7.0/Src/Gtk2/KeyboardHelper.cpp.gcc43 dasher-4.7.0/Src/Gtk2/KeyboardHelper.cpp
--- dasher-4.7.0/Src/Gtk2/KeyboardHelper.cpp.gcc43 2008-02-19 10:24:47.000000000 -0500
+++ dasher-4.7.0/Src/Gtk2/KeyboardHelper.cpp 2008-02-19 10:25:03.000000000 -0500
@@ -4,6 +4,7 @@
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
+#include <cstring>
#include <iostream>
#include <sstream>
#include <string>
diff -up dasher-4.7.0/Src/Gtk2/Preferences.cpp.gcc43 dasher-4.7.0/Src/Gtk2/Preferences.cpp
--- dasher-4.7.0/Src/Gtk2/Preferences.cpp.gcc43 2008-02-19 10:22:26.000000000 -0500
+++ dasher-4.7.0/Src/Gtk2/Preferences.cpp 2008-02-19 10:22:38.000000000 -0500
@@ -2,6 +2,7 @@
#include <glib/gi18n.h>
#include <libintl.h>
+#include <cstring>
#include "../Common/Common.h"
#include "DasherTypes.h"
diff -up dasher-4.7.0/Src/Gtk2/DasherAppSettings.cpp.gcc43 dasher-4.7.0/Src/Gtk2/DasherAppSettings.cpp
--- dasher-4.7.0/Src/Gtk2/DasherAppSettings.cpp.gcc43 2008-02-19 10:22:00.000000000 -0500
+++ dasher-4.7.0/Src/Gtk2/DasherAppSettings.cpp 2008-02-19 10:22:14.000000000 -0500
@@ -6,6 +6,7 @@
#include <gconf/gconf-enum-types.h>
#endif
+#include <cstring>
#include "DasherAppSettings.h"
#include "../Common/AppSettingsData.h"
diff -up dasher-4.7.0/Src/Gtk2/DasherControl.cpp.gcc43 dasher-4.7.0/Src/Gtk2/DasherControl.cpp
--- dasher-4.7.0/Src/Gtk2/DasherControl.cpp.gcc43 2008-02-19 10:24:22.000000000 -0500
+++ dasher-4.7.0/Src/Gtk2/DasherControl.cpp 2008-02-19 10:24:33.000000000 -0500
@@ -1,6 +1,7 @@
#include "../Common/Common.h"
#include "../../config.h"
+#include <cstring>
#include <iostream>
#include "DasherControl.h"
#include "Timer.h"
diff -up dasher-4.7.0/Src/Gtk2/dasher_editor_internal.cpp.gcc43 dasher-4.7.0/Src/Gtk2/dasher_editor_internal.cpp
--- dasher-4.7.0/Src/Gtk2/dasher_editor_internal.cpp.gcc43 2008-02-19 10:23:04.000000000 -0500
+++ dasher-4.7.0/Src/Gtk2/dasher_editor_internal.cpp 2008-02-19 10:23:25.000000000 -0500
@@ -1,5 +1,7 @@
#include "config.h"
+#include <cstring>
+
#include <glib/gi18n.h>
#include <gtk/gtk.h>
/* TODO: r4epair gnome libs flags (or get rid of entirely) */
diff -up dasher-4.7.0/Src/DasherCore/ColourIO.cpp.gcc43 dasher-4.7.0/Src/DasherCore/ColourIO.cpp
--- dasher-4.7.0/Src/DasherCore/ColourIO.cpp.gcc43 2008-02-19 09:49:36.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/ColourIO.cpp 2008-02-19 09:52:10.000000000 -0500
@@ -5,6 +5,8 @@
#include "../Common/Common.h"
#include "ColourIO.h"
+#include <cstring>
+
using namespace Dasher;
using namespace std;
//using namespace expat;
diff -up dasher-4.7.0/Src/DasherCore/UserLog.cpp.gcc43 dasher-4.7.0/Src/DasherCore/UserLog.cpp
--- dasher-4.7.0/Src/DasherCore/UserLog.cpp.gcc43 2008-02-19 10:19:05.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/UserLog.cpp 2008-02-19 10:19:14.000000000 -0500
@@ -2,6 +2,7 @@
#include "UserLog.h"
#include <fstream>
+#include <cstring>
#ifdef _WIN32
#include <sys/timeb.h>
diff -up dasher-4.7.0/Src/DasherCore/UserLogTrial.cpp.gcc43 dasher-4.7.0/Src/DasherCore/UserLogTrial.cpp
--- dasher-4.7.0/Src/DasherCore/UserLogTrial.cpp.gcc43 2008-02-19 10:19:32.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/UserLogTrial.cpp 2008-02-19 10:19:43.000000000 -0500
@@ -1,5 +1,6 @@
#include "../Common/Common.h"
+#include <cstring>
#include "UserLogTrial.h"
// Track memory leaks on Windows to the line that new'd the memory
diff -up dasher-4.7.0/Src/DasherCore/PinyinParser.cpp.gcc43 dasher-4.7.0/Src/DasherCore/PinyinParser.cpp
diff -up dasher-4.7.0/Src/DasherCore/XMLUtil.cpp.gcc43 dasher-4.7.0/Src/DasherCore/XMLUtil.cpp
--- dasher-4.7.0/Src/DasherCore/XMLUtil.cpp.gcc43 2008-02-19 10:20:17.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/XMLUtil.cpp 2008-02-19 10:20:35.000000000 -0500
@@ -1,6 +1,8 @@
#include "../Common/Common.h"
+#include <cstring>
+
#include "XMLUtil.h"
#include <sys/types.h>
diff -up dasher-4.7.0/Src/DasherCore/ConversionManager.cpp.gcc43 dasher-4.7.0/Src/DasherCore/ConversionManager.cpp
--- dasher-4.7.0/Src/DasherCore/ConversionManager.cpp.gcc43 2008-02-19 10:12:30.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/ConversionManager.cpp 2008-02-19 10:12:44.000000000 -0500
@@ -28,6 +28,7 @@
#include "NodeCreationManager.h"
#include <iostream>
+#include <cstring>
#include <string>
#include <vector>
#include <stdlib.h>
diff -up dasher-4.7.0/Src/DasherCore/TimeSpan.cpp.gcc43 dasher-4.7.0/Src/DasherCore/TimeSpan.cpp
--- dasher-4.7.0/Src/DasherCore/TimeSpan.cpp.gcc43 2008-02-19 10:18:22.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/TimeSpan.cpp 2008-02-19 10:18:34.000000000 -0500
@@ -1,6 +1,7 @@
#include "../Common/Common.h"
+#include <cstring>
#include "TimeSpan.h"
#ifdef _WIN32
diff -up dasher-4.7.0/Src/DasherCore/Alphabet/AlphIO.cpp.gcc43 dasher-4.7.0/Src/DasherCore/Alphabet/AlphIO.cpp
--- dasher-4.7.0/Src/DasherCore/Alphabet/AlphIO.cpp.gcc43 2007-11-12 13:26:16.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/Alphabet/AlphIO.cpp 2008-02-19 09:52:59.000000000 -0500
@@ -22,6 +22,7 @@
#include "AlphIO.h"
#include <iostream>
+#include <cstring>
using namespace Dasher;
using namespace std;
diff -up dasher-4.7.0/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp.gcc43 dasher-4.7.0/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
--- dasher-4.7.0/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp.gcc43 2007-11-12 13:26:21.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp 2008-02-19 09:53:10.000000000 -0500
@@ -25,6 +25,7 @@
//#include "stdafx.h"
#include "CTWLanguageModel.h"
#include <math.h> // not in use anymore? needed it for log
+#include <cstring>
using namespace Dasher;
diff -up dasher-4.7.0/Src/DasherCore/ControlManager.cpp.gcc43 dasher-4.7.0/Src/DasherCore/ControlManager.cpp
--- dasher-4.7.0/Src/DasherCore/ControlManager.cpp.gcc43 2008-02-19 09:50:49.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/ControlManager.cpp 2008-02-19 09:52:17.000000000 -0500
@@ -21,6 +21,7 @@
#include "../Common/Common.h"
#include "ControlManager.h"
+#include <cstring>
using namespace Dasher;
using namespace std;
diff -up dasher-4.7.0/Src/DasherCore/FileLogger.cpp.gcc43 dasher-4.7.0/Src/DasherCore/FileLogger.cpp
--- dasher-4.7.0/Src/DasherCore/FileLogger.cpp.gcc43 2008-02-19 10:16:15.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/FileLogger.cpp 2008-02-19 10:16:24.000000000 -0500
@@ -1,6 +1,7 @@
#include "../Common/Common.h"
+#include <cstring>
#include "FileLogger.h"
// Track memory leaks on Windows to the line that new'd the memory
diff -up dasher-4.7.0/Src/DasherCore/DasherModel.cpp.gcc43 dasher-4.7.0/Src/DasherCore/DasherModel.cpp
--- dasher-4.7.0/Src/DasherCore/DasherModel.cpp.gcc43 2008-02-19 10:13:39.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/DasherModel.cpp 2008-02-19 10:13:52.000000000 -0500
@@ -21,6 +21,7 @@
#include "../Common/Common.h"
#include <iostream>
+#include <cstring>
#include "../Common/Random.h"
#include "DasherModel.h"
#include "DasherView.h"
diff -up dasher-4.7.0/Src/DasherCore/SettingsStore.cpp.gcc43 dasher-4.7.0/Src/DasherCore/SettingsStore.cpp
--- dasher-4.7.0/Src/DasherCore/SettingsStore.cpp.gcc43 2008-02-19 10:20:57.000000000 -0500
+++ dasher-4.7.0/Src/DasherCore/SettingsStore.cpp 2008-02-19 10:21:33.000000000 -0500
@@ -12,6 +12,8 @@
#include "Event.h"
#include "EventHandler.h"
+#include <cstring>
+#include <cstdlib>
#include <iostream>
using namespace std;
Index: dasher.spec
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- dasher.spec 19 Feb 2008 00:21:45 -0000 1.72
+++ dasher.spec 19 Feb 2008 15:44:17 -0000 1.73
@@ -6,6 +6,7 @@
Group: Desktop/Accessibility
URL: http://www.gnome.org/
Source0: http://download.gnome.org/sources/dasher/4.7/%{name}-%{version}.tar.bz2
+Patch0: gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnome-speech-devel
@@ -31,6 +32,7 @@
%prep
%setup -q
+%patch0 -p1 -b .gcc43
%build
@@ -107,6 +109,9 @@
%{_sysconfdir}/gconf/schemas/dasher.schemas
%changelog
+* Tue Feb 19 2008 Matthias Clasen <mclasen at redhat.com> - 4.7.0-3
+- Fix build with gcc 4.3
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.7.0-2
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list