summaryrefslogtreecommitdiff
path: root/editors/dasher/patches
diff options
context:
space:
mode:
authorwiz <wiz>2009-03-22 15:30:51 +0000
committerwiz <wiz>2009-03-22 15:30:51 +0000
commit701792faf8521428295e0b557ba26951574b1b67 (patch)
tree15f116fbd8f66996e7f2bf295a5f58ce6baf6f61 /editors/dasher/patches
parent644dbbb9786a8377ec87bb25d652b9763fdefca2 (diff)
downloadpkgsrc-701792faf8521428295e0b557ba26951574b1b67.tar.gz
Update to 4.10.0, convert to user-destdir.
============ Dasher 4.10.0 ============ * Fix click modes where letters near the edge of the selection box to "leak" out so they could not be selected. * Fix UTF-8 bug so e.g., Japanese and Hebrew work.
Diffstat (limited to 'editors/dasher/patches')
-rw-r--r--editors/dasher/patches/patch-ac22
-rw-r--r--editors/dasher/patches/patch-ad22
-rw-r--r--editors/dasher/patches/patch-ae40
-rw-r--r--editors/dasher/patches/patch-af22
-rw-r--r--editors/dasher/patches/patch-ag18
5 files changed, 9 insertions, 115 deletions
diff --git a/editors/dasher/patches/patch-ac b/editors/dasher/patches/patch-ac
deleted file mode 100644
index de3fb4c1276..00000000000
--- a/editors/dasher/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/11/05 20:01:00 drochner Exp $
-
---- 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
- struct timeval sTimeBuffer;
- struct timezone sTimezoneBuffer;
-+ time_t help; /* workaround for bad NetBSD struct timeval */
- #endif
- char* szTimeLine = NULL;
-
-@@ -87,7 +88,8 @@ std::string CBasicLog::GetDateStamp() {
- szTimeLine = ctime(&(sTimeBuffer.time));
- #else
- gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-- szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-+ help = sTimeBuffer.tv_sec;
-+ szTimeLine = ctime(&help);
- #endif
-
- return std::string(szTimeLine).substr(0, 24);
diff --git a/editors/dasher/patches/patch-ad b/editors/dasher/patches/patch-ad
deleted file mode 100644
index a2d6d761455..00000000000
--- a/editors/dasher/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/11/05 20:01:00 drochner Exp $
-
---- 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
- struct timeval sTimeBuffer;
- struct timezone sTimezoneBuffer;
-+ time_t help; /* workaround for bad NetBSD struct timeval */
- #endif
- char* szTimeLine = NULL;
-
-@@ -511,7 +512,8 @@ std::string CFileLogger::GetTimeDateStam
- szTimeLine = ctime(&(sTimeBuffer.time));
- #else
- gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-- szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-+ help = sTimeBuffer.tv_sec;
-+ szTimeLine = ctime(&help);
- #endif
-
- // Format is:
diff --git a/editors/dasher/patches/patch-ae b/editors/dasher/patches/patch-ae
deleted file mode 100644
index cf1c911e4dc..00000000000
--- a/editors/dasher/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/11/05 20:01:00 drochner Exp $
-
---- 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
- struct timeval sTimeBuffer;
- struct timezone sTimezoneBuffer;
-+ time_t help; /* workaround for bad NetBSD struct timeval */
- #endif
- char* szTimeLine = NULL;
-
-@@ -122,7 +123,8 @@ string CTimeSpan::GetTimeStamp()
- szTimeLine = ctime(&(sTimeBuffer.time));
- #else
- gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-- szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-+ help = sTimeBuffer.tv_sec;
-+ szTimeLine = ctime(&help);
- #endif
-
- if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -188,6 +190,7 @@ string CTimeSpan::GetDateStamp()
- #else
- struct timeval sTimeBuffer;
- struct timezone sTimezoneBuffer;
-+ time_t help; /* workaround for bad NetBSD struct timeval */
- #endif
- char* szTimeLine = NULL;
-
-@@ -196,7 +199,8 @@ string CTimeSpan::GetDateStamp()
- szTimeLine = ctime(&(sTimeBuffer.time));
- #else
- gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-- 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
deleted file mode 100644
index d33fc6ff49c..00000000000
--- a/editors/dasher/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 2007/11/05 20:01:00 drochner Exp $
-
---- Src/DasherCore/UserLog.cpp.orig 2007-10-15 15:55:02.000000000 +0200
-+++ Src/DasherCore/UserLog.cpp
-@@ -657,6 +657,7 @@ void CUserLog::SetOuputFilename(const st
- #else
- struct timeval sTimeBuffer;
- struct timezone sTimezoneBuffer;
-+ time_t help; /* workaround for bad NetBSD struct timeval */
- #endif
- char* szTimeLine = NULL;
-
-@@ -665,7 +666,8 @@ void CUserLog::SetOuputFilename(const st
- szTimeLine = ctime(&(sTimeBuffer.time));
- #else
- gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-- szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-+ help = sTimeBuffer.tv_sec;
-+ szTimeLine = ctime(&help);
- #endif
-
- if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
diff --git a/editors/dasher/patches/patch-ag b/editors/dasher/patches/patch-ag
index 011747d9c62..545e8c1af32 100644
--- a/editors/dasher/patches/patch-ag
+++ b/editors/dasher/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2008/05/29 17:53:36 drochner Exp $
+$NetBSD: patch-ag,v 1.4 2009/03/22 15:30:51 wiz Exp $
---- Src/DasherCore/DasherViewSquare.cpp.orig 2008-04-07 19:25:34.000000000 +0200
+--- Src/DasherCore/DasherViewSquare.cpp.orig 2009-03-16 17:02:53.000000000 +0000
+++ Src/DasherCore/DasherViewSquare.cpp
-@@ -805,7 +805,7 @@ void CDasherViewSquare::GetScaleFactor(
- inline myint CDasherViewSquare::CustomIDiv(myint iNumerator, myint iDenominator) {
- // Integer division rounding away from zero
-
+@@ -41,7 +41,7 @@
+ using namespace Dasher;
+
+ // Track memory leaks on Windows to the line that new'd the memory
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__DragonFly__)
- myint quot = iNumerator / iDenominator;
- myint rem = (int64)iNumerator % (int64)iDenominator;
-
+ #ifdef _DEBUG_MEMLEAKS
+ #define DEBUG_NEW new( _NORMAL_BLOCK, THIS_FILE, __LINE__ )
+ #define new DEBUG_NEW