update to 4.6.1

This switches to the new gnome-2.20 branch.

8 files changed, 70 insertions, 29 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 5a35abe19a1..24c66c60501 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2007/09/21 13:03:39 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2007/11/05 20:01:00 drochner Exp $
 
-DISTNAME=	dasher-4.4.2
-PKGREVISION=	2
+DISTNAME=	dasher-4.6.1
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -55,4 +54,5 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index 5a0cb9ec0ec..84f8ed733be 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.16 2007/09/25 10:54:11 hira Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/11/05 20:01:00 drochner Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
 share/dasher/alphabet.AfaanOromo.xml
 share/dasher/alphabet.Armenian.xml
 share/dasher/alphabet.Assamese.xml
+share/dasher/alphabet.Austen.xml
 share/dasher/alphabet.Azerbaijani.xml
 share/dasher/alphabet.Belarusian.xml
 share/dasher/alphabet.Bulgarian.xml
@@ -106,7 +107,6 @@ share/dasher/alphabet.latvian.xml
 share/dasher/alphabet.lithuanian.xml
 share/dasher/alphabet.luxembourgish.xml
 share/dasher/alphabet.macedonian.xml
-share/dasher/alphabet.malagasy.xml
 share/dasher/alphabet.maltese.xml
 share/dasher/alphabet.mongolian.xml
 share/dasher/alphabet.myanmar.xml
@@ -115,8 +115,10 @@ share/dasher/alphabet.norwegian.xml
 share/dasher/alphabet.occitan.xml
 share/dasher/alphabet.ogham.xml
 share/dasher/alphabet.pashto.xml
+share/dasher/alphabet.perl.xml
 share/dasher/alphabet.persian.xml
 share/dasher/alphabet.pinyin.xml
+share/dasher/alphabet.pinyin2.xml
 share/dasher/alphabet.polish.xml
 share/dasher/alphabet.portuguese.xml
 share/dasher/alphabet.romansch.xml
@@ -158,6 +160,7 @@ share/dasher/dashermaemofullscreen.glade
 share/dasher/training_albanian_SQ.txt
 share/dasher/training_basque_EU.txt
 share/dasher/training_bengali_BD.txt
+share/dasher/training_bengali_bn.txt
 share/dasher/training_canna_JP.txt
 share/dasher/training_czech_CS.txt
 share/dasher/training_danish_DK.txt
@@ -231,6 +234,22 @@ share/gnome/help/dasher/fr/figures/prefs2.png
 share/gnome/help/dasher/fr/figures/prefs3.png
 share/gnome/help/dasher/fr/figures/prefs4.png
 share/gnome/help/dasher/fr/figures/prefs5.png
+share/gnome/help/dasher/ru/dasher.xml
+share/gnome/help/dasher/ru/figures/a-z.gif
+share/gnome/help/dasher/ru/figures/aa-az.gif
+share/gnome/help/dasher/ru/figures/ala-alz.gif
+share/gnome/help/dasher/ru/figures/exampleHad2.png
+share/gnome/help/dasher/ru/figures/exampleHad2a.png
+share/gnome/help/dasher/ru/figures/exampleHad3a.png
+share/gnome/help/dasher/ru/figures/exampleHad4.png
+share/gnome/help/dasher/ru/figures/figure2.png
+share/gnome/help/dasher/ru/figures/main.png
+share/gnome/help/dasher/ru/figures/object.gif
+share/gnome/help/dasher/ru/figures/prefs1.png
+share/gnome/help/dasher/ru/figures/prefs2.png
+share/gnome/help/dasher/ru/figures/prefs3.png
+share/gnome/help/dasher/ru/figures/prefs4.png
+share/gnome/help/dasher/ru/figures/prefs5.png
 share/gnome/help/dasher/sv/dasher.xml
 share/gnome/help/dasher/sv/figures/a-z.gif
 share/gnome/help/dasher/sv/figures/aa-az.gif
@@ -252,6 +271,7 @@ share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
 share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
+share/locale/be@latin/LC_MESSAGES/dasher.mo
 share/locale/bg/LC_MESSAGES/dasher.mo
 share/locale/bn/LC_MESSAGES/dasher.mo
 share/locale/bn_IN/LC_MESSAGES/dasher.mo
@@ -297,6 +317,7 @@ share/locale/nb/LC_MESSAGES/dasher.mo
 share/locale/ne/LC_MESSAGES/dasher.mo
 share/locale/nl/LC_MESSAGES/dasher.mo
 share/locale/nn/LC_MESSAGES/dasher.mo
+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
@@ -305,6 +326,7 @@ share/locale/pt_BR/LC_MESSAGES/dasher.mo
 share/locale/ro/LC_MESSAGES/dasher.mo
 share/locale/ru/LC_MESSAGES/dasher.mo
 share/locale/rw/LC_MESSAGES/dasher.mo
+share/locale/si/LC_MESSAGES/dasher.mo
 share/locale/sk/LC_MESSAGES/dasher.mo
 share/locale/sl/LC_MESSAGES/dasher.mo
 share/locale/sq/LC_MESSAGES/dasher.mo
@@ -317,6 +339,7 @@ share/locale/tk/LC_MESSAGES/dasher.mo
 share/locale/tr/LC_MESSAGES/dasher.mo
 share/locale/ug/LC_MESSAGES/dasher.mo
 share/locale/uk/LC_MESSAGES/dasher.mo
+share/locale/uz@cyrillic/LC_MESSAGES/dasher.mo
 share/locale/vi/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
@@ -324,14 +347,18 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 share/omf/dasher/dasher-C.omf
 share/omf/dasher/dasher-es.omf
 share/omf/dasher/dasher-fr.omf
+share/omf/dasher/dasher-ru.omf
 share/omf/dasher/dasher-sv.omf
 @dirrm share/omf/dasher
 @comment in scrollkeeper: @dirrm share/omf
+@dirrm share/locale/uz@cyrillic/LC_MESSAGES
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/dasher/sv/figures
 @dirrm share/gnome/help/dasher/sv
+@dirrm share/gnome/help/dasher/ru/figures
+@dirrm share/gnome/help/dasher/ru
 @dirrm share/gnome/help/dasher/fr/figures
 @dirrm share/gnome/help/dasher/fr
 @dirrm share/gnome/help/dasher/es/figures
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index a17fc493a25..24d94a7efb1 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.22 2007/07/17 10:29:55 drochner Exp $
+$NetBSD: distinfo,v 1.23 2007/11/05 20:01:00 drochner Exp $
 
-SHA1 (dasher-4.4.2.tar.bz2) = 9b82e11ef0104e7acf9add78e48d59a67516c531
-RMD160 (dasher-4.4.2.tar.bz2) = 17d33eb2db6f2e7dc9e7e227509f8254ae732baf
-Size (dasher-4.4.2.tar.bz2) = 6880246 bytes
+SHA1 (dasher-4.6.1.tar.bz2) = 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3
+RMD160 (dasher-4.6.1.tar.bz2) = 77a765ddc623895a2a121732848f00c5a82652d0
+Size (dasher-4.6.1.tar.bz2) = 6473483 bytes
 SHA1 (patch-aa) = 52a3e82bef8595efcf9aab0d5c53931fd9c9f7a7
 SHA1 (patch-ab) = a5dac2d9f8a59ee4ea4370fa5b75e8e0f008fdbd
-SHA1 (patch-ac) = 134c514feb9488387e2bdf39e5cfff5054340634
-SHA1 (patch-ad) = b4b26a7b5520f5ce42937386a4a2f7a05c1f5d21
-SHA1 (patch-ae) = 5dfa6e3ba3a86d5eddfb37265a2bb0f9e58ca8fa
-SHA1 (patch-af) = 7ce150f6d4d6112a70bd390fcd02a1b879e9a906
+SHA1 (patch-ac) = 9c21bac777158e564a69b5f2735380c6a2b985e8
+SHA1 (patch-ad) = 8261c0e7de41fd2729413ee24c24e07cb939a1ae
+SHA1 (patch-ae) = 6e16f33e9ae2a75e0a11294af478cf5d0ab08cdc
+SHA1 (patch-af) = 63b6bb074834cc8203cfe2fdaddd838439ac5b60
+SHA1 (patch-ag) = 7d39c59a8e590bde584b98fc09647acd6839b1b8
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;