update to 4.6.1

This switches to the new gnome-2.20 branch.

5 files changed, 28 insertions, 15 deletions

diff --git a/editors/dasher/patches/patch-ac b/editors/dasher/patches/patch-ac
index 23928f7ae23..de3fb4c1276 100644
--- a/editors/dasher/patches/patch-ac
+++ b/editors/dasher/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2007/04/18 23:19:27 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2007/11/05 20:01:00 drochner Exp $
 
---- Src/DasherCore/BasicLog.cpp.orig	2007-04-16 16:06:42.000000000 +0200
+--- Src/DasherCore/BasicLog.cpp.orig	2007-10-15 15:55:00.000000000 +0200
 +++ Src/DasherCore/BasicLog.cpp
 @@ -79,6 +79,7 @@ std::string CBasicLog::GetDateStamp() {
  #else
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.3 2007/04/18 23:19:27 wiz Exp $
      szTimeLine = ctime(&(sTimeBuffer.time));
  #else
      gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
 +    help = sTimeBuffer.tv_sec;
 +    szTimeLine = ctime(&help);
  #endif
diff --git a/editors/dasher/patches/patch-ad b/editors/dasher/patches/patch-ad
index 669bebaaab6..a2d6d761455 100644
--- a/editors/dasher/patches/patch-ad
+++ b/editors/dasher/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2007/04/18 23:19:28 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2007/11/05 20:01:00 drochner Exp $
 
---- Src/DasherCore/FileLogger.cpp.orig	2007-04-18 13:11:35.000000000 +0200
+--- Src/DasherCore/FileLogger.cpp.orig	2007-10-15 15:55:01.000000000 +0200
 +++ Src/DasherCore/FileLogger.cpp
 @@ -503,6 +503,7 @@ std::string CFileLogger::GetTimeDateStam
  #else
@@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.1 2007/04/18 23:19:28 wiz Exp $
      szTimeLine = ctime(&(sTimeBuffer.time));
  #else
      gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
 +    help = sTimeBuffer.tv_sec;
 +    szTimeLine = ctime(&help);
  #endif
diff --git a/editors/dasher/patches/patch-ae b/editors/dasher/patches/patch-ae
index 67a0ecf66bf..cf1c911e4dc 100644
--- a/editors/dasher/patches/patch-ae
+++ b/editors/dasher/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2007/04/18 23:19:28 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2007/11/05 20:01:00 drochner Exp $
 
---- Src/DasherCore/TimeSpan.cpp.orig	2007-04-18 13:15:12.000000000 +0200
+--- Src/DasherCore/TimeSpan.cpp.orig	2007-10-15 15:55:01.000000000 +0200
 +++ Src/DasherCore/TimeSpan.cpp
 @@ -114,6 +114,7 @@ string CTimeSpan::GetTimeStamp()
  #else
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.1 2007/04/18 23:19:28 wiz Exp $
      szTimeLine = ctime(&(sTimeBuffer.time));
  #else
      gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
 +    help = sTimeBuffer.tv_sec;
 +    szTimeLine = ctime(&help);
  #endif
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.1 2007/04/18 23:19:28 wiz Exp $
      szTimeLine = ctime(&(sTimeBuffer.time));
  #else
      gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
 +    help = sTimeBuffer.tv_sec;
 +    szTimeLine = ctime(&help);
  #endif
diff --git a/editors/dasher/patches/patch-af b/editors/dasher/patches/patch-af
index efde0690c97..d33fc6ff49c 100644
--- a/editors/dasher/patches/patch-af
+++ b/editors/dasher/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2007/04/18 23:19:28 wiz Exp $
+$NetBSD: patch-af,v 1.2 2007/11/05 20:01:00 drochner Exp $
 
---- Src/DasherCore/UserLog.cpp.orig	2007-04-18 13:17:45.000000000 +0200
+--- Src/DasherCore/UserLog.cpp.orig	2007-10-15 15:55:02.000000000 +0200
 +++ Src/DasherCore/UserLog.cpp
-@@ -658,6 +658,7 @@ void CUserLog::SetOuputFilename(const st
+@@ -657,6 +657,7 @@ void CUserLog::SetOuputFilename(const st
  #else
      struct timeval sTimeBuffer;
      struct timezone sTimezoneBuffer;
@@ -10,11 +10,11 @@ $NetBSD: patch-af,v 1.1 2007/04/18 23:19:28 wiz Exp $
  #endif
      char* szTimeLine = NULL;
  
-@@ -666,7 +667,8 @@ void CUserLog::SetOuputFilename(const st
+@@ -665,7 +666,8 @@ void CUserLog::SetOuputFilename(const st
      szTimeLine = ctime(&(sTimeBuffer.time));
  #else
      gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
 +    help = sTimeBuffer.tv_sec;
 +    szTimeLine = ctime(&help);
  #endif
diff --git a/editors/dasher/patches/patch-ag b/editors/dasher/patches/patch-ag
new file mode 100644
index 00000000000..6326e7f62b0
--- /dev/null
+++ b/editors/dasher/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/11/05 20:01:00 drochner Exp $
+
+--- Src/DasherCore/DasherViewSquare.cpp.orig	2007-10-30 17:46:41.000000000 +0100
++++ Src/DasherCore/DasherViewSquare.cpp
+@@ -802,7 +802,7 @@ inline myint CDasherViewSquare::CustomID
+   else
+     return quot;
+ #else
+-  lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
++  lldiv_t res = ::lldiv(iNumerator, iDenominator);
+   
+   if(res.rem < 0)
+     return res.quot - 1;