diff options
author | wiz <wiz> | 2009-03-22 15:30:51 +0000 |
---|---|---|
committer | wiz <wiz> | 2009-03-22 15:30:51 +0000 |
commit | 701792faf8521428295e0b557ba26951574b1b67 (patch) | |
tree | 15f116fbd8f66996e7f2bf295a5f58ce6baf6f61 | |
parent | 644dbbb9786a8377ec87bb25d652b9763fdefca2 (diff) | |
download | pkgsrc-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.
-rw-r--r-- | editors/dasher/Makefile | 12 | ||||
-rw-r--r-- | editors/dasher/PLIST | 68 | ||||
-rw-r--r-- | editors/dasher/distinfo | 14 | ||||
-rw-r--r-- | editors/dasher/patches/patch-ac | 22 | ||||
-rw-r--r-- | editors/dasher/patches/patch-ad | 22 | ||||
-rw-r--r-- | editors/dasher/patches/patch-ae | 40 | ||||
-rw-r--r-- | editors/dasher/patches/patch-af | 22 | ||||
-rw-r--r-- | editors/dasher/patches/patch-ag | 18 |
8 files changed, 88 insertions, 130 deletions
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index c2b87148e20..cba8a83435f 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,14 +1,16 @@ -# $NetBSD: Makefile,v 1.48 2008/10/29 02:37:05 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2009/03/22 15:30:51 wiz Exp $ -DISTNAME= dasher-4.9.0 +DISTNAME= dasher-4.10.0 CATEGORIES= editors gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dasher/4.9/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dasher/4.10/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.inference.phy.cam.ac.uk/dasher/ COMMENT= Easy typing without using keyboard +PKG_DESTDIR_SUPPORT= user-destdir + USE_DIRS+= gnome2-1.5 USE_LANGUAGES= c c++ USE_LIBTOOL= yes @@ -16,6 +18,8 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +INSTALLATION_DIRS= ${GCONF_SCHEMAS_DIR} + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" @@ -29,7 +33,7 @@ post-build: cd ${WRKSRC}/Data && ../Src/Gtk2/generate-schema >dasher.schemas post-install: - ${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${GCONF_SCHEMAS_DIR} + ${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${DESTDIR}${GCONF_SCHEMAS_DIR} .include "../../audio/gnome-speech/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST index d2c4569a416..b8dcc7ec639 100644 --- a/editors/dasher/PLIST +++ b/editors/dasher/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2008/10/29 02:37:05 wiz Exp $ +@comment $NetBSD: PLIST,v 1.21 2009/03/22 15:30:51 wiz Exp $ bin/dasher man/man1/dasher.1 share/applications/dasher.desktop @@ -205,6 +205,38 @@ share/gnome/help/dasher/C/figures/prefs2.png share/gnome/help/dasher/C/figures/prefs3.png share/gnome/help/dasher/C/figures/prefs4.png share/gnome/help/dasher/C/figures/prefs5.png +share/gnome/help/dasher/de/dasher.xml +share/gnome/help/dasher/de/figures/a-z.gif +share/gnome/help/dasher/de/figures/aa-az.gif +share/gnome/help/dasher/de/figures/ala-alz.gif +share/gnome/help/dasher/de/figures/exampleHad2.png +share/gnome/help/dasher/de/figures/exampleHad2a.png +share/gnome/help/dasher/de/figures/exampleHad3a.png +share/gnome/help/dasher/de/figures/exampleHad4.png +share/gnome/help/dasher/de/figures/figure2.png +share/gnome/help/dasher/de/figures/main.png +share/gnome/help/dasher/de/figures/object.gif +share/gnome/help/dasher/de/figures/prefs1.png +share/gnome/help/dasher/de/figures/prefs2.png +share/gnome/help/dasher/de/figures/prefs3.png +share/gnome/help/dasher/de/figures/prefs4.png +share/gnome/help/dasher/de/figures/prefs5.png +share/gnome/help/dasher/en_GB/dasher.xml +share/gnome/help/dasher/en_GB/figures/a-z.gif +share/gnome/help/dasher/en_GB/figures/aa-az.gif +share/gnome/help/dasher/en_GB/figures/ala-alz.gif +share/gnome/help/dasher/en_GB/figures/exampleHad2.png +share/gnome/help/dasher/en_GB/figures/exampleHad2a.png +share/gnome/help/dasher/en_GB/figures/exampleHad3a.png +share/gnome/help/dasher/en_GB/figures/exampleHad4.png +share/gnome/help/dasher/en_GB/figures/figure2.png +share/gnome/help/dasher/en_GB/figures/main.png +share/gnome/help/dasher/en_GB/figures/object.gif +share/gnome/help/dasher/en_GB/figures/prefs1.png +share/gnome/help/dasher/en_GB/figures/prefs2.png +share/gnome/help/dasher/en_GB/figures/prefs3.png +share/gnome/help/dasher/en_GB/figures/prefs4.png +share/gnome/help/dasher/en_GB/figures/prefs5.png share/gnome/help/dasher/es/dasher.xml share/gnome/help/dasher/es/figures/a-z.gif share/gnome/help/dasher/es/figures/aa-az.gif @@ -221,6 +253,22 @@ share/gnome/help/dasher/es/figures/prefs2.png share/gnome/help/dasher/es/figures/prefs3.png share/gnome/help/dasher/es/figures/prefs4.png share/gnome/help/dasher/es/figures/prefs5.png +share/gnome/help/dasher/eu/dasher.xml +share/gnome/help/dasher/eu/figures/a-z.gif +share/gnome/help/dasher/eu/figures/aa-az.gif +share/gnome/help/dasher/eu/figures/ala-alz.gif +share/gnome/help/dasher/eu/figures/exampleHad2.png +share/gnome/help/dasher/eu/figures/exampleHad2a.png +share/gnome/help/dasher/eu/figures/exampleHad3a.png +share/gnome/help/dasher/eu/figures/exampleHad4.png +share/gnome/help/dasher/eu/figures/figure2.png +share/gnome/help/dasher/eu/figures/main.png +share/gnome/help/dasher/eu/figures/object.gif +share/gnome/help/dasher/eu/figures/prefs1.png +share/gnome/help/dasher/eu/figures/prefs2.png +share/gnome/help/dasher/eu/figures/prefs3.png +share/gnome/help/dasher/eu/figures/prefs4.png +share/gnome/help/dasher/eu/figures/prefs5.png share/gnome/help/dasher/fr/dasher.xml share/gnome/help/dasher/fr/figures/a-z.gif share/gnome/help/dasher/fr/figures/aa-az.gif @@ -287,6 +335,7 @@ share/gnome/help/dasher/sv/figures/prefs4.png share/gnome/help/dasher/sv/figures/prefs5.png share/icons/hicolor/48x48/apps/dasher.png share/icons/hicolor/scalable/apps/dasher.svg +share/locale/af/LC_MESSAGES/dasher.mo share/locale/ar/LC_MESSAGES/dasher.mo share/locale/as/LC_MESSAGES/dasher.mo share/locale/az/LC_MESSAGES/dasher.mo @@ -342,6 +391,7 @@ share/locale/oc/LC_MESSAGES/dasher.mo share/locale/or/LC_MESSAGES/dasher.mo share/locale/pa/LC_MESSAGES/dasher.mo share/locale/pl/LC_MESSAGES/dasher.mo +share/locale/ps/LC_MESSAGES/dasher.mo share/locale/pt/LC_MESSAGES/dasher.mo share/locale/pt_BR/LC_MESSAGES/dasher.mo share/locale/ro/LC_MESSAGES/dasher.mo @@ -352,9 +402,10 @@ share/locale/sk/LC_MESSAGES/dasher.mo share/locale/sl/LC_MESSAGES/dasher.mo share/locale/sq/LC_MESSAGES/dasher.mo share/locale/sr/LC_MESSAGES/dasher.mo -share/locale/sr@Latn/LC_MESSAGES/dasher.mo +share/locale/sr@latin/LC_MESSAGES/dasher.mo share/locale/sv/LC_MESSAGES/dasher.mo share/locale/ta/LC_MESSAGES/dasher.mo +share/locale/te/LC_MESSAGES/dasher.mo share/locale/th/LC_MESSAGES/dasher.mo share/locale/tk/LC_MESSAGES/dasher.mo share/locale/tr/LC_MESSAGES/dasher.mo @@ -366,7 +417,10 @@ share/locale/zh_CN/LC_MESSAGES/dasher.mo share/locale/zh_HK/LC_MESSAGES/dasher.mo share/locale/zh_TW/LC_MESSAGES/dasher.mo share/omf/dasher/dasher-C.omf +share/omf/dasher/dasher-de.omf +share/omf/dasher/dasher-en_GB.omf share/omf/dasher/dasher-es.omf +share/omf/dasher/dasher-eu.omf share/omf/dasher/dasher-fr.omf share/omf/dasher/dasher-oc.omf share/omf/dasher/dasher-ru.omf @@ -374,8 +428,11 @@ share/omf/dasher/dasher-sv.omf @dirrm share/omf/dasher @comment in rarian: @dirrm share/omf @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor +@comment in xdg-dirs: @dirrm share/icons @dirrm share/gnome/help/dasher/sv/figures @dirrm share/gnome/help/dasher/sv @dirrm share/gnome/help/dasher/ru/figures @@ -384,12 +441,19 @@ share/omf/dasher/dasher-sv.omf @dirrm share/gnome/help/dasher/oc @dirrm share/gnome/help/dasher/fr/figures @dirrm share/gnome/help/dasher/fr +@dirrm share/gnome/help/dasher/eu/figures +@dirrm share/gnome/help/dasher/eu @dirrm share/gnome/help/dasher/es/figures @dirrm share/gnome/help/dasher/es +@dirrm share/gnome/help/dasher/en_GB/figures +@dirrm share/gnome/help/dasher/en_GB +@dirrm share/gnome/help/dasher/de/figures +@dirrm share/gnome/help/dasher/de @dirrm share/gnome/help/dasher/C/figures @dirrm share/gnome/help/dasher/C @dirrm share/gnome/help/dasher @comment in gnome2-dirs: @dirrm share/gnome/help +@comment in gnome2-dirs: @dirrm share/gnome @comment in GConf: @dirrm share/gconf/schemas @dirrm share/dasher @comment in xdg-dirs: @dirrm share/applications diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo index 16b938a1d82..961d1027870 100644 --- a/editors/dasher/distinfo +++ b/editors/dasher/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.27 2008/10/29 02:37:05 wiz Exp $ +$NetBSD: distinfo,v 1.28 2009/03/22 15:30:51 wiz Exp $ -SHA1 (dasher-4.9.0.tar.bz2) = c897804aa4701cee00b50c6dd83bf8003a3ae4a5 -RMD160 (dasher-4.9.0.tar.bz2) = 7540daeeb48f97dccd50c45593e20f228f57a3f7 -Size (dasher-4.9.0.tar.bz2) = 6734895 bytes -SHA1 (patch-ac) = 9c21bac777158e564a69b5f2735380c6a2b985e8 -SHA1 (patch-ad) = 8261c0e7de41fd2729413ee24c24e07cb939a1ae -SHA1 (patch-ae) = 6e16f33e9ae2a75e0a11294af478cf5d0ab08cdc -SHA1 (patch-af) = 63b6bb074834cc8203cfe2fdaddd838439ac5b60 -SHA1 (patch-ag) = b8948dc2a0f2c52db3cd697c6b9eaef7abb650f2 +SHA1 (dasher-4.10.0.tar.bz2) = 07d35933aeaf8d911abb221135e9dd2118dd8e19 +RMD160 (dasher-4.10.0.tar.bz2) = 5b2bcc5298bbbaeca1f030e62e54ba2aa6e59bc2 +Size (dasher-4.10.0.tar.bz2) = 6645541 bytes +SHA1 (patch-ag) = f5f5c519d6ae9f5ec3f5b04688a0930b02bcbd2e 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 |