diff options
Diffstat (limited to 'accessibility/dasher/files')
6 files changed, 189 insertions, 8 deletions
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp new file mode 100644 index 000000000000..da5a022d06c5 --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp @@ -0,0 +1,36 @@ +--- Src/DasherCore/FileLogger.cpp.orig Tue Jan 17 01:41:44 2006 ++++ Src/DasherCore/FileLogger.cpp Tue Jan 17 01:51:33 2006 +@@ -17,7 +17,7 @@ static char THIS_FILE[] = __FILE__; + #include <windows.h> + #endif + +-#include <sys/timeb.h> ++#include <sys/time.h> + + CFileLogger::CFileLogger(const std::string& strFilenamePath, eLogLevel iLogLevel, int iOptionsMask) + { +@@ -492,12 +492,12 @@ std::string CFileLogger::GetTimeDateStam + + if ((m_bTimeStamp) || (m_bDateStamp)) + { +- struct timeb sTimeBuffer; ++ struct timeval sTimeBuffer; + char* szTimeLine = NULL; + +- ftime(&sTimeBuffer); ++ gettimeofday(&sTimeBuffer, NULL); + +- szTimeLine = ctime(&(sTimeBuffer.time)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + + // Format is: + // Wed Jun 22 10:22:00 2005 +@@ -520,7 +520,7 @@ std::string CFileLogger::GetTimeDateStam + strTimeStamp += szTimeLine[i]; + strTimeStamp += "."; + char strMs[16]; +- sprintf(strMs, "%d", sTimeBuffer.millitm); ++ sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000)); + if (strlen(strMs) == 1) + strTimeStamp += "00"; + else if (strlen(strMs) == 2) diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp new file mode 100644 index 000000000000..d8679afaed3e --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp @@ -0,0 +1,44 @@ +--- Src/DasherCore/SimpleTimer.cpp.orig Tue Jan 17 01:43:17 2006 ++++ Src/DasherCore/SimpleTimer.cpp Tue Jan 17 01:46:24 2006 +@@ -1,6 +1,6 @@ + #include "SimpleTimer.h" + +-#include <sys/timeb.h> ++#include <sys/time.h> + + // Track memory leaks on Windows to the line that new'd the memory + #ifdef _WIN32 +@@ -14,12 +14,12 @@ static char THIS_FILE[] = __FILE__; + + CSimpleTimer::CSimpleTimer() + { +- struct timeb sTimeBuffer; ++ struct timeval sTimeBuffer; + +- ftime(&sTimeBuffer); ++ gettimeofday(&sTimeBuffer, NULL); + +- m_iStartMs = sTimeBuffer.millitm; +- m_iStartSecond = sTimeBuffer.time; ++ m_iStartMs = (int) (sTimeBuffer.tv_usec / 1000); ++ m_iStartSecond = (int) sTimeBuffer.tv_sec; + } + + CSimpleTimer::~CSimpleTimer() +@@ -28,12 +28,12 @@ CSimpleTimer::~CSimpleTimer() + + double CSimpleTimer::GetElapsed() + { +- struct timeb sTimeBuffer; ++ struct timeval sTimeBuffer; + +- ftime(&sTimeBuffer); ++ gettimeofday(&sTimeBuffer, NULL); + +- int iEndMs = sTimeBuffer.millitm; +- int iEndSecond = sTimeBuffer.time; ++ int iEndMs = (int) (sTimeBuffer.tv_usec / 1000); ++ int iEndSecond = (int) sTimeBuffer.tv_sec; + + return ((double) iEndMs / 1000.0 + (double) iEndSecond) - + ((double) m_iStartMs / 1000.0 + (double) m_iStartSecond); diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp new file mode 100644 index 000000000000..d5bf37daf0d2 --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp @@ -0,0 +1,51 @@ +--- Src/DasherCore/TimeSpan.cpp.orig Tue Jan 17 01:47:12 2006 ++++ Src/DasherCore/TimeSpan.cpp Tue Jan 17 01:48:47 2006 +@@ -1,6 +1,6 @@ + + #include "TimeSpan.h" +-#include <sys/timeb.h> ++#include <sys/time.h> + + #ifdef _WIN32 + // In order to track leaks to line number, we need this at the top of every file +@@ -102,12 +102,12 @@ string CTimeSpan::GetXML(const string& s + string CTimeSpan::GetTimeStamp() + { + string strTimeStamp = ""; +- struct timeb sTimeBuffer; ++ struct timeval sTimeBuffer; + char* szTimeLine = NULL; + +- ftime(&sTimeBuffer); ++ gettimeofday(&sTimeBuffer, NULL); + +- szTimeLine = ctime(&(sTimeBuffer.time)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + + if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18)) + { +@@ -115,7 +115,7 @@ string CTimeSpan::GetTimeStamp() + strTimeStamp += szTimeLine[i]; + strTimeStamp += "."; + char szMs[16]; +- sprintf(szMs, "%d", sTimeBuffer.millitm); ++ sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000)); + if (strlen(szMs) == 1) + strTimeStamp += "00"; + else if (strlen(szMs) == 2) +@@ -163,12 +163,12 @@ string CTimeSpan::GetDateStamp() + { + std::string strDateStamp = ""; + +- struct timeb sTimeBuffer; ++ struct timeval sTimeBuffer; + char* szTimeLine = NULL; + +- ftime(&sTimeBuffer); ++ gettimeofday(&sTimeBuffer, NULL); + +- szTimeLine = ctime(&(sTimeBuffer.time)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + + // Format is: + // Wed Jun 22 10:22:00 2005 diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp new file mode 100644 index 000000000000..2ba6fec10fff --- /dev/null +++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp @@ -0,0 +1,41 @@ +--- Src/DasherCore/UserLog.cpp.orig Tue Jan 17 01:49:12 2006 ++++ Src/DasherCore/UserLog.cpp Tue Jan 17 01:50:11 2006 +@@ -1,7 +1,7 @@ + + #include "UserLog.h" + #include <fstream> +-#include <sys/timeb.h> ++#include <sys/time.h> + + // Track memory leaks on Windows to the line that new'd the memory + #ifdef _WIN32 +@@ -624,12 +624,12 @@ void CUserLog::SetOuputFilename(const st + { + m_strFilename = USER_LOG_DETAILED_PREFIX; + +- struct timeb sTimeBuffer; ++ struct timeval sTimeBuffer; + char* szTimeLine = NULL; + +- ftime(&sTimeBuffer); ++ gettimeofday(&sTimeBuffer, NULL); + +- szTimeLine = ctime(&(sTimeBuffer.time)); ++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec)); + + if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18)) + { +@@ -829,10 +829,10 @@ bool CUserLog::UpdateMouseLocation() + { + //CFunctionLogger f1("CUserLog::UpdateMouseLocation", g_pLogger); + +- struct timeb sTimeBuffer; +- ftime(&sTimeBuffer); ++ struct timeval sTimeBuffer; ++ gettimeofday(&sTimeBuffer, NULL); + +- double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm; ++ double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000); + + if ((dTime - m_dLastMouseUpdate) > LOG_MOUSE_EVERY_MS) + { diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc index 7622867dbd57..9817b2f11bb1 100644 --- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc +++ b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc @@ -1,12 +1,10 @@ ---- Src/Gtk2/speech.cc.orig Fri Aug 19 09:57:44 2005 -+++ Src/Gtk2/speech.cc Mon Aug 22 20:23:21 2005 -@@ -78,7 +78,8 @@ void setup_speech() { +--- Src/Gtk2/speech.cc.orig Thu Jan 12 15:52:50 2006 ++++ Src/Gtk2/speech.cc Tue Jan 17 01:29:35 2006 +@@ -74,6 +74,7 @@ void setup_speech() { void teardown_speech() { - bonobo_object_release_unref (speaker, NULL); -- CORBA_free (voices); + bonobo_object_release_unref(speaker, NULL); + if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0) -+ CORBA_free (voices); + CORBA_free(voices); GNOME_Speech_SynthesisDriver_unref(rv, &ev); - CORBA_exception_free (&ev); - + CORBA_exception_free(&ev); diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure new file mode 100644 index 000000000000..982daaac6663 --- /dev/null +++ b/accessibility/dasher/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Tue Jan 31 01:13:42 2006 ++++ configure Tue Jan 31 01:14:07 2006 +@@ -24818,7 +24818,7 @@ + + + GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS" +-GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic," ++GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic" + + + |