r15419 - in /desktop/unstable/dasher/debian: changelog control.in patches/02_gcc-4.3.patch patches/02_speech-build.patch patches/03_no-cairo.patch
rfrancoise at users.alioth.debian.org
rfrancoise at users.alioth.debian.org
Fri Mar 28 18:55:38 UTC 2008
Author: rfrancoise
Date: Fri Mar 28 18:55:38 2008
New Revision: 15419
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15419
Log:
* New upstream release, fixes crash when switching alphabets
(closes: #458254).
* debian/patches/02_gcc-4.3.patch: New patch, fixes build with GCC 4.3,
thanks to Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>.
* debian/patches/03_no-cairo.patch: New patch, fixes build w/o cairo.
* debian/control: Bump Standards-Version to 3.7.3.
Added:
desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch
desktop/unstable/dasher/debian/patches/03_no-cairo.patch
Removed:
desktop/unstable/dasher/debian/patches/02_speech-build.patch
Modified:
desktop/unstable/dasher/debian/changelog
desktop/unstable/dasher/debian/control.in
Modified: desktop/unstable/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/changelog?rev=15419&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/changelog (original)
+++ desktop/unstable/dasher/debian/changelog Fri Mar 28 18:55:38 2008
@@ -1,11 +1,14 @@
-dasher (4.6.1-1) UNRELEASED; urgency=low
+dasher (4.7.0-1) UNRELEASED; urgency=low
[ Romain Francoise ]
- * New upstream release.
+ * New upstream release, fixes crash when switching alphabets
+ (closes: #458254).
* debian/dasher.menu: Update for new menu policy (closes: #445041).
* debian/patches/01_missing-includes.patch: Resync with new upstream.
- * debian/patches/02_speech-build.patch: New patch by Ed Catmur, fixes
- build with --enable-speech.
+ * debian/patches/02_gcc-4.3.patch: New patch, fixes build with GCC 4.3,
+ thanks to Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>.
+ * debian/patches/03_no-cairo.patch: New patch, fixes build w/o cairo.
+ * debian/control: Bump Standards-Version to 3.7.3.
[ Alan Baghumian ]
* Updated debian/control*:
@@ -14,9 +17,8 @@
[ Josselin Mouette ]
* Fix corrupt line in changelog.
- * Let’s not upload this at once, it doesn’t work at all.
-
- -- Josselin Mouette <joss at debian.org> Sun, 16 Dec 2007 11:01:48 +0100
+
+ -- Romain Francoise <rfrancoise at debian.org> Fri, 28 Mar 2008 19:50:05 +0100
dasher (4.4.2-2) unstable; urgency=low
Modified: desktop/unstable/dasher/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/control.in?rev=15419&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/control.in (original)
+++ desktop/unstable/dasher/debian/control.in Fri Mar 28 18:55:38 2008
@@ -30,7 +30,7 @@
libatk1.0-dev,
gnome-doc-utils (>= 0.3.2),
libcanna1g-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: dasher
Architecture: any
Added: desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch?rev=15419&op=file
==============================================================================
--- desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch (added)
+++ desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch Fri Mar 28 18:55:38 2008
@@ -1,0 +1,246 @@
+diff --git a/Src/DasherCore/Alphabet/AlphIO.cpp b/Src/DasherCore/Alphabet/AlphIO.cpp
+index 78feb6e..512e6bf 100644
+--- a/Src/DasherCore/Alphabet/AlphIO.cpp
++++ b/Src/DasherCore/Alphabet/AlphIO.cpp
+@@ -23,6 +23,8 @@
+
+ #include <iostream>
+
++#include <cstring>
++
+ using namespace Dasher;
+ using namespace std;
+
+diff --git a/Src/DasherCore/ColourIO.cpp b/Src/DasherCore/ColourIO.cpp
+index 2b2502b..ecf2e6e 100644
+--- a/Src/DasherCore/ColourIO.cpp
++++ b/Src/DasherCore/ColourIO.cpp
+@@ -5,6 +5,9 @@
+ #include "../Common/Common.h"
+
+ #include "ColourIO.h"
++
++#include <cstring>
++
+ using namespace Dasher;
+ using namespace std;
+ //using namespace expat;
+diff --git a/Src/DasherCore/ControlManager.cpp b/Src/DasherCore/ControlManager.cpp
+index 5e7cbdb..42e327a 100644
+--- a/Src/DasherCore/ControlManager.cpp
++++ b/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
+diff --git a/Src/DasherCore/ConversionManager.cpp b/Src/DasherCore/ConversionManager.cpp
+index 93eb2da..945da6f 100644
+--- a/Src/DasherCore/ConversionManager.cpp
++++ b/Src/DasherCore/ConversionManager.cpp
+@@ -32,6 +32,8 @@
+ #include <vector>
+ #include <stdlib.h>
+
++#include <cstring>
++
+ using namespace Dasher;
+
+ CConversionManager::CConversionManager(CNodeCreationManager *pNCManager, CConversionHelper *pHelper, CAlphabet *pAlphabet, int CMid)
+diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
+index 4edaf27..3b975bb 100644
+--- a/Src/DasherCore/DasherModel.cpp
++++ b/Src/DasherCore/DasherModel.cpp
+@@ -36,6 +36,8 @@
+ #include "DasherGameMode.h"
+ #include "AlphabetManager.h"
+
++#include <cstring>
++
+ using namespace Dasher;
+ using namespace std;
+
+diff --git a/Src/DasherCore/FileLogger.cpp b/Src/DasherCore/FileLogger.cpp
+index ef18c4b..10864a5 100644
+--- a/Src/DasherCore/FileLogger.cpp
++++ b/Src/DasherCore/FileLogger.cpp
+@@ -25,6 +25,8 @@ static char THIS_FILE[] = __FILE__;
+ #include <sys/time.h>
+ #endif
+
++#include <cstring>
++
+ CFileLogger::CFileLogger(const std::string& strFilenamePath, eLogLevel iLogLevel, int iOptionsMask)
+ {
+ m_strFilenamePath = "";
+diff --git a/Src/DasherCore/TimeSpan.cpp b/Src/DasherCore/TimeSpan.cpp
+index 194da5a..6f217d9 100644
+--- a/Src/DasherCore/TimeSpan.cpp
++++ b/Src/DasherCore/TimeSpan.cpp
+@@ -19,6 +19,8 @@ static char THIS_FILE[] = __FILE__;
+ #endif
+ #endif
+
++#include <cstring>
++
+ CTimeSpan::CTimeSpan(const string& strName, bool bAddDate)
+ {
+ InitMemberVars();
+diff --git a/Src/DasherCore/UserLog.cpp b/Src/DasherCore/UserLog.cpp
+index d2eefbd..acde969 100644
+--- a/Src/DasherCore/UserLog.cpp
++++ b/Src/DasherCore/UserLog.cpp
+@@ -9,6 +9,8 @@
+ #include <sys/time.h>
+ #endif
+
++#include <cstring>
++
+ // Track memory leaks on Windows to the line that new'd the memory
+ #ifdef _WIN32
+ #ifdef _DEBUG_MEMLEAKS
+diff --git a/Src/DasherCore/UserLogTrial.cpp b/Src/DasherCore/UserLogTrial.cpp
+index 6235bf7..8ca58af 100644
+--- a/Src/DasherCore/UserLogTrial.cpp
++++ b/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
+diff --git a/Src/DasherCore/XMLUtil.cpp b/Src/DasherCore/XMLUtil.cpp
+index 96fcf18..6626f84 100644
+--- a/Src/DasherCore/XMLUtil.cpp
++++ b/Src/DasherCore/XMLUtil.cpp
+@@ -6,6 +6,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
++#include <cstring>
++
+ // Track memory leaks on Windows to the line that new'd the memory
+ #ifdef _WIN32
+ #ifdef _DEBUG
+diff --git a/Src/Gtk2/DasherAppSettings.cpp b/Src/Gtk2/DasherAppSettings.cpp
+index 155fca9..5ca286e 100644
+--- a/Src/Gtk2/DasherAppSettings.cpp
++++ b/Src/Gtk2/DasherAppSettings.cpp
+@@ -16,6 +16,8 @@
+ #include "dasher.h"
+ #include "GtkDasherControl.h"
+
++#include <cstring>
++
+ // FIXME - should really do something to make this a singleton class
+
+ // TODO: Rename this file to fit in with naming conventions
+diff --git a/Src/Gtk2/DasherControl.cpp b/Src/Gtk2/DasherControl.cpp
+index 5242f03..f2d4c1f 100644
+--- a/Src/Gtk2/DasherControl.cpp
++++ b/Src/Gtk2/DasherControl.cpp
+@@ -13,6 +13,7 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <sys/stat.h>
++#include <cstring>
+ using namespace std;
+
+ // 'Private' methods (only used in this file)
+diff --git a/Src/Gtk2/KeyboardHelper.cpp b/Src/Gtk2/KeyboardHelper.cpp
+index 648de43..cb4e130 100644
+--- a/Src/Gtk2/KeyboardHelper.cpp
++++ b/Src/Gtk2/KeyboardHelper.cpp
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <cstring>
+
+ CKeyboardHelper::CKeyboardHelper(DasherAppSettings *pAppSettings) {
+ m_pAppSettings = pAppSettings;
+diff --git a/Src/Gtk2/Preferences.cpp b/Src/Gtk2/Preferences.cpp
+index 55a5fa9..1b9d8ea 100644
+--- a/Src/Gtk2/Preferences.cpp
++++ b/Src/Gtk2/Preferences.cpp
+@@ -10,6 +10,8 @@
+ #include "Parameters.h"
+ #include "module_settings_window.h"
+
++#include <cstring>
++
+ #define DASHER_PREFERENCES_DIALOGUE_PRIVATE(pSelf) (DasherPreferencesDialoguePrivate *)(pSelf->private_data);
+
+ /* Static global member - use to deal with callbacks */
+diff --git a/Src/Gtk2/dasher_action_speech.cpp b/Src/Gtk2/dasher_action_speech.cpp
+index b260eab..aae4040 100644
+--- a/Src/Gtk2/dasher_action_speech.cpp
++++ b/Src/Gtk2/dasher_action_speech.cpp
+@@ -8,6 +8,8 @@
+ #include <glib/gi18n.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <libbonobo.h>
++
++#include <cstring>
+ //#include <libintl.h>
+ //#include <string.h>
+
+diff --git a/Src/Gtk2/dasher_editor.cpp b/Src/Gtk2/dasher_editor.cpp
+index 992b6fe..5634214 100644
+--- a/Src/Gtk2/dasher_editor.cpp
++++ b/Src/Gtk2/dasher_editor.cpp
+@@ -43,6 +43,8 @@
+ #include "dasher_main.h"
+ //#include "game_mode_helper.h"
+
++#include <cstring>
++
+ #define ACTION_STATE_SHOW 1
+ #define ACTION_STATE_CONTROL 2
+ #define ACTION_STATE_AUTO 4
+diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
+index d2c8b12..ac547e6 100644
+--- a/Src/Gtk2/dasher_main.cpp
++++ b/Src/Gtk2/dasher_main.cpp
+@@ -23,6 +23,8 @@
+ #include "dasher_editor_internal.h"
+ #include "dasher_editor_external.h"
+
++#include <cstring>
++
+ /* Static instance of singleton, USE SPARINGLY */
+ static DasherMain *g_pDasherMain = NULL;
+
+diff --git a/Src/Gtk2/game_mode_helper.cpp b/Src/Gtk2/game_mode_helper.cpp
+index d96e88b..f73bb0b 100644
+--- a/Src/Gtk2/game_mode_helper.cpp
++++ b/Src/Gtk2/game_mode_helper.cpp
+@@ -3,6 +3,8 @@
+ #include "dasher_editor_internal.h"
+ #include <string>
+
++#include <cstring>
++
+ struct _GameModeHelperPrivate {
+ DasherEditorInternal* pEditor;
+ GtkDasherControl *pControl;
+diff --git a/Src/Gtk2/module_settings_window.cpp b/Src/Gtk2/module_settings_window.cpp
+index 37bfc5c..100911a 100644
+--- a/Src/Gtk2/module_settings_window.cpp
++++ b/Src/Gtk2/module_settings_window.cpp
+@@ -22,6 +22,8 @@
+
+ #include <glib/gi18n.h>
+
++#include <cstring>
++
+ typedef struct _ModuleSettingsData ModuleSettingsData;
+
+ struct _ModuleSettingsData {
Added: desktop/unstable/dasher/debian/patches/03_no-cairo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/patches/03_no-cairo.patch?rev=15419&op=file
==============================================================================
--- desktop/unstable/dasher/debian/patches/03_no-cairo.patch (added)
+++ desktop/unstable/dasher/debian/patches/03_no-cairo.patch Fri Mar 28 18:55:38 2008
@@ -1,0 +1,14 @@
+diff --git a/Src/Gtk2/Canvas.cpp b/Src/Gtk2/Canvas.cpp
+index f90ba15..f804338 100644
+--- a/Src/Gtk2/Canvas.cpp
++++ b/Src/Gtk2/Canvas.cpp
+@@ -88,7 +88,9 @@ CCanvas::~CCanvas() {
+ g_object_unref(m_pOnscreenBuffer);
+ #endif
+
++#if WITH_CAIRO
+ delete[] cairo_colours;
++#endif
+ delete m_pPangoInk;
+ }
+
More information about the pkg-gnome-commits
mailing list