Hello community,
here is the log from the commit of package dasher
checked in at Thu Nov 8 23:55:13 CET 2007.
--------
--- GNOME/dasher/dasher.changes 2007-09-18 18:26:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/dasher/dasher.changes 2007-11-06 21:10:32.672644000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 6 21:10:14 CET 2007 - maw@suse.de
+
+- Add dasher-gcc4.3-fixes.patch.
+
+-------------------------------------------------------------------
New:
----
dasher-gcc4.3-fixes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dasher.spec ++++++
--- /var/tmp/diff_new_pack.W15713/_old 2007-11-08 23:52:30.000000000 +0100
+++ /var/tmp/diff_new_pack.W15713/_new 2007-11-08 23:52:30.000000000 +0100
@@ -11,9 +11,9 @@
# norootforbuild
Name: dasher
-BuildRequires: at-spi-devel cairo-devel docbook_4 fdupes gcc-c++ gnome-doc-utils-devel gnome-speech-devel libglade2-devel libgnomeui-devel libstdc++ libwnck-devel perl-XML-Parser scrollkeeper update-desktop-files
+BuildRequires: at-spi-devel cairo-devel docbook_4 fdupes gcc-c++ gnome-doc-utils-devel gnome-speech-devel intltool libglade2-devel libgnomeui-devel libstdc++ libwnck-devel perl-XML-Parser scrollkeeper update-desktop-files
Version: 4.6.0
-Release: 1
+Release: 25
%if %suse_version > 1020
Requires: %{name}-lang = %{version}
%endif
@@ -23,6 +23,7 @@
Summary: Zooming Predictive Text Entry System
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2
Patch0: abuild.patch
+Patch1: dasher-gcc4.3-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
@@ -48,9 +49,11 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
#export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
+autoreconf -f -i
%configure \
--with-gnome \
--disable-scrollkeeper
@@ -91,8 +94,9 @@
%doc %{_mandir}/man?/*.*
%files lang -f %name.lang
-
%changelog
+* Tue Nov 06 2007 - maw@suse.de
+- Add dasher-gcc4.3-fixes.patch.
* Tue Sep 18 2007 - maw@suse.de
- Update to version 4.6.0:
+ Updated translations
++++++ dasher-gcc4.3-fixes.patch ++++++
Index: dasher-4.6.0/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
+++ dasher-4.6.0/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
@@ -23,6 +23,9 @@
//
//#include "stdafx.h"
+
+#include <cstring>
+
#include "CTWLanguageModel.h"
#include // not in use anymore? needed it for log
Index: dasher-4.6.0/Src/DasherCore/Alphabet/AlphIO.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/Alphabet/AlphIO.cpp
+++ dasher-4.6.0/Src/DasherCore/Alphabet/AlphIO.cpp
@@ -20,7 +20,7 @@
#include "../../Common/Common.h"
#include "AlphIO.h"
-
+#include <cstring>
#include <iostream>
using namespace Dasher;
Index: dasher-4.6.0/Src/DasherCore/ColourIO.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/ColourIO.cpp
+++ dasher-4.6.0/Src/DasherCore/ColourIO.cpp
@@ -4,6 +4,8 @@
#include "../Common/Common.h"
+#include <cstring>
+
#include "ColourIO.h"
using namespace Dasher;
using namespace std;
Index: dasher-4.6.0/Src/DasherCore/ControlManager.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/ControlManager.cpp
+++ dasher-4.6.0/Src/DasherCore/ControlManager.cpp
@@ -22,6 +22,8 @@
#include "ControlManager.h"
+#include <cstring>
+
using namespace Dasher;
using namespace std;
// Track memory leaks on Windows to the line that new'd the memory
Index: dasher-4.6.0/Src/DasherCore/ConversionManager.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/ConversionManager.cpp
+++ dasher-4.6.0/Src/DasherCore/ConversionManager.cpp
@@ -27,6 +27,7 @@
#include "EventHandler.h"
#include "NodeCreationManager.h"
+#include <cstring>
#include <iostream>
#include <string>
#include <vector>
Index: dasher-4.6.0/Src/DasherCore/DasherModel.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/DasherModel.cpp
+++ dasher-4.6.0/Src/DasherCore/DasherModel.cpp
@@ -20,6 +20,9 @@
#include "../Common/Common.h"
+#include <cstring>
+
+
#include <iostream>
#include "../Common/Random.h"
#include "DasherModel.h"
Index: dasher-4.6.0/Src/DasherCore/FileLogger.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/FileLogger.cpp
+++ dasher-4.6.0/Src/DasherCore/FileLogger.cpp
@@ -3,6 +3,8 @@
#include "FileLogger.h"
+#include <cstring>
+
// Track memory leaks on Windows to the line that new'd the memory
#ifdef _WIN32
#ifdef _DEBUG
Index: dasher-4.6.0/Src/DasherCore/TimeSpan.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/TimeSpan.cpp
+++ dasher-4.6.0/Src/DasherCore/TimeSpan.cpp
@@ -1,3 +1,6 @@
+#include <cstring>
+
+
#include "../Common/Common.h"
Index: dasher-4.6.0/Src/DasherCore/SocketInput.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/SocketInput.cpp
+++ dasher-4.6.0/Src/DasherCore/SocketInput.cpp
@@ -12,8 +12,6 @@
#include
#include
-#define _(_x) gettext(_x)
-
using namespace Dasher;
CSocketInput::CSocketInput(CEventHandler *pEventHandler, CSettingsStore *pSettingsStore)
Index: dasher-4.6.0/Src/DasherCore/XMLUtil.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/XMLUtil.cpp
+++ dasher-4.6.0/Src/DasherCore/XMLUtil.cpp
@@ -3,6 +3,8 @@
#include "XMLUtil.h"
+#include <cstring>
+
#include
#include
Index: dasher-4.6.0/Src/DasherCore/SettingsStore.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/SettingsStore.cpp
+++ dasher-4.6.0/Src/DasherCore/SettingsStore.cpp
@@ -12,6 +12,7 @@
#include "Event.h"
#include "EventHandler.h"
+#include <cstdlib>
#include <iostream>
using namespace std;
Index: dasher-4.6.0/Src/DasherCore/UserLogTrial.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/UserLogTrial.cpp
+++ dasher-4.6.0/Src/DasherCore/UserLogTrial.cpp
@@ -2,6 +2,8 @@
#include "UserLogTrial.h"
+#include <cstring>
+
// Track memory leaks on Windows to the line that new'd the memory
#ifdef _WIN32
#ifdef _DEBUG_MEMLEAKS
Index: dasher-4.6.0/Src/DasherCore/UserLog.cpp
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/UserLog.cpp
+++ dasher-4.6.0/Src/DasherCore/UserLog.cpp
@@ -3,6 +3,8 @@
#include "UserLog.h"
#include <fstream>
+#include <cstring>
+
#ifdef _WIN32
#include
#else
Index: dasher-4.6.0/Src/Gtk2/DasherAppSettings.cpp
===================================================================
--- dasher-4.6.0.orig/Src/Gtk2/DasherAppSettings.cpp
+++ dasher-4.6.0/Src/Gtk2/DasherAppSettings.cpp
@@ -6,6 +6,8 @@
#include
#endif
+#include <cstring>
+
#include "DasherAppSettings.h"
#include "../Common/AppSettingsData.h"
Index: dasher-4.6.0/Src/Gtk2/dasher_editor_internal.cpp
===================================================================
--- dasher-4.6.0.orig/Src/Gtk2/dasher_editor_internal.cpp
+++ dasher-4.6.0/Src/Gtk2/dasher_editor_internal.cpp
@@ -1,5 +1,5 @@
#include "config.h"
-
+#include <cstring>
#include
#include
/* TODO: r4epair gnome libs flags (or get rid of entirely) */
Index: dasher-4.6.0/Src/Common/I18n.h
===================================================================
--- dasher-4.6.0.orig/Src/Common/I18n.h
+++ dasher-4.6.0/Src/Common/I18n.h
@@ -28,7 +28,9 @@
#else
#include
-#define _(szText) gettext(szText)
+/* #define _(szText) gettext(szText) */
+/* #include
+ #include */
#endif
Index: dasher-4.6.0/Src/DasherCore/ClickFilter.h
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/ClickFilter.h
+++ dasher-4.6.0/Src/DasherCore/ClickFilter.h
@@ -1,6 +1,9 @@
#ifndef __CLICK_FILTER_H__
#define __CLICK_FILTER_H__
+#include
+#include
+
#include "InputFilter.h"
/// \ingroup InputFilter
Index: dasher-4.6.0/Src/Common/Common.h
===================================================================
--- dasher-4.6.0.orig/Src/Common/Common.h
+++ dasher-4.6.0/Src/Common/Common.h
@@ -42,6 +42,9 @@
#include "Trace.h"
+#include
+#include
+
#include "I18n.h"
#endif // __include__
Index: dasher-4.6.0/Src/DasherCore/LanguageModelling/Makefile.am
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/LanguageModelling/Makefile.am
+++ dasher-4.6.0/Src/DasherCore/LanguageModelling/Makefile.am
@@ -15,3 +15,6 @@ libdasherlm_a_SOURCES = \
SymbolAlphabet.h \
WordLanguageModel.cpp \
WordLanguageModel.h
+
+AM_CXXFLAGS = $(GTK2BUILD_CFLAGS)
+AM_CFLAGS = $(GTK2_CFLAGS)
\ No newline at end of file
Index: dasher-4.6.0/Src/DasherCore/Alphabet/Makefile.am
===================================================================
--- dasher-4.6.0.orig/Src/DasherCore/Alphabet/Makefile.am
+++ dasher-4.6.0/Src/DasherCore/Alphabet/Makefile.am
@@ -6,3 +6,6 @@ libdasheralphabet_a_SOURCES = AlphIO.cpp
AlphabetMap.cpp \
AlphabetMap.h \
GroupInfo.h
+
+AM_CXXFLAGS = $(GTK2BUILD_CFLAGS)
+AM_CFLAGS = $(GTK2_CFLAGS)
\ No newline at end of file
Index: dasher-4.6.0/Src/Gtk2/Preferences.cpp
===================================================================
--- dasher-4.6.0.orig/Src/Gtk2/Preferences.cpp
+++ dasher-4.6.0/Src/Gtk2/Preferences.cpp
@@ -1,5 +1,7 @@
#include "../../config.h"
+#include <cstring>
+
#include
#include
Index: dasher-4.6.0/Src/Gtk2/dasher_main.cpp
===================================================================
--- dasher-4.6.0.orig/Src/Gtk2/dasher_main.cpp
+++ dasher-4.6.0/Src/Gtk2/dasher_main.cpp
@@ -10,6 +10,8 @@
#endif
#include
+#include <cstring>
+
#include "GtkDasherControl.h"
#include "KeyboardHelper.h"
#include "Preferences.h"
Index: dasher-4.6.0/Src/Gtk2/DasherControl.cpp
===================================================================
--- dasher-4.6.0.orig/Src/Gtk2/DasherControl.cpp
+++ dasher-4.6.0/Src/Gtk2/DasherControl.cpp
@@ -13,6 +13,8 @@
#include
#include
#include
+
+#include <cstring>
using namespace std;
// 'Private' methods (only used in this file)
Index: dasher-4.6.0/Src/Gtk2/KeyboardHelper.cpp
===================================================================
--- dasher-4.6.0.orig/Src/Gtk2/KeyboardHelper.cpp
+++ dasher-4.6.0/Src/Gtk2/KeyboardHelper.cpp
@@ -7,6 +7,7 @@
#include <iostream>
#include <sstream>
#include <string>
+#include <cstring>
CKeyboardHelper::CKeyboardHelper(DasherAppSettings *pAppSettings) {
m_pAppSettings = pAppSettings;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org