Update to 6.4

7 files changed, 156 insertions, 11 deletions

diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index b45c55980a93..17bd5a811ce1 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gcompris2
-PORTVERSION=	6.3.r3
-PORTREVISION=	1
+PORTVERSION=	6.4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
diff --git a/games/gcompris2/distinfo b/games/gcompris2/distinfo
index 0f204d27d83e..f037c8c89f1e 100644
--- a/games/gcompris2/distinfo
+++ b/games/gcompris2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcompris-6.3RC3.tar.gz) = 0be1f9d685a81bbfb081e5739925086a
-SIZE (gcompris-6.3RC3.tar.gz) = 38869677
+MD5 (gcompris-6.4.tar.gz) = 6e77dbe3fdaecd9d039695f59985b9c9
+SIZE (gcompris-6.4.tar.gz) = 39243690
diff --git a/games/gcompris2/files/patch-src_boards_click_on_letter.c b/games/gcompris2/files/patch-src_boards_click_on_letter.c
new file mode 100644
index 000000000000..181e68e22f7a
--- /dev/null
+++ b/games/gcompris2/files/patch-src_boards_click_on_letter.c
@@ -0,0 +1,27 @@
+--- src/boards/click_on_letter.c.orig	Tue Nov 30 04:04:02 2004
++++ src/boards/click_on_letter.c	Tue Nov 30 04:14:48 2004
+@@ -275,21 +275,20 @@
+ static GnomeCanvasItem *click_on_letter_create_item(GnomeCanvasGroup *parent)
+ {
+ 
+-  int xOffset,yOffset,i,j;
++  int xOffset,yOffset,i,j,length_of_aphabet,numbers[number_of_letters];
+   GdkPixbuf *button_pixmap = NULL;
++  gchar *letters[number_of_letters];
+ 
+   /* TRANSLATORS: Put here the alphabet in your language */
+   gchar *alphabet=_("abcdefghijklmnopqrstuvwxyz");
+   assert(g_utf8_validate(alphabet,-1,NULL)); // require by all utf8-functions
+ 
+ 
+-  int length_of_aphabet=g_utf8_strlen (alphabet,-1);
++  length_of_aphabet=g_utf8_strlen (alphabet,-1);
+ 
+   number_of_letters=gcomprisBoard->level+1;
+   if (number_of_letters>MAX_NUMBER_OF_LETTERS) number_of_letters=MAX_NUMBER_OF_LETTERS;
+ 
+-  int numbers[number_of_letters];
+-  gchar *letters[number_of_letters];
+   assert(number_of_letters<=length_of_aphabet); // because we must set unique letter on every "vagon"
+ 
+   for (i=0;i<number_of_letters;i++){
diff --git a/games/gcompris2/files/patch-src_boards_gletters.c b/games/gcompris2/files/patch-src_boards_gletters.c
new file mode 100644
index 000000000000..6ea1c1520f80
--- /dev/null
+++ b/games/gcompris2/files/patch-src_boards_gletters.c
@@ -0,0 +1,32 @@
+--- src/boards/gletters.c.orig	Tue Nov 30 04:16:40 2004
++++ src/boards/gletters.c	Tue Nov 30 04:18:51 2004
+@@ -690,9 +690,9 @@
+   GnomeCanvasItem *item;
+   gchar *str  = NULL;
+   gchar *str2 = NULL;
+-  gint i,j,k;
++  gint i,j,k,attempt;
+   guint c, x;
+-  gchar *lettersItem, *str_p;
++  gchar *lettersItem, *str_p, *letter_no_caps;
+ 
+   if (!letters_table)
+     {
+@@ -709,7 +709,7 @@
+   k=g_utf8_strlen(letters_array[gcomprisBoard->level-1],-1);
+ 
+   lettersItem = g_new(gchar,6);
+-  gint attempt=0;
++  attempt=0;
+   do {
+ 
+     attempt++;
+@@ -726,7 +726,7 @@
+ 
+   if (item_find_by_title(lettersItem)!=NULL)  {g_free(lettersItem); return NULL;}
+ 
+-  gchar *letter_no_caps=g_utf8_strdown(lettersItem,-1);
++  letter_no_caps=g_utf8_strdown(lettersItem,-1);
+   str = g_strdup_printf("%s%s", letter_no_caps, ".ogg");
+   str2 = gcompris_get_asset_file("gcompris alphabet", NULL, "audio/x-ogg", str);
+   gcompris_play_ogg(str2, NULL);
diff --git a/games/gcompris2/files/patch-src_boards_wordsgame.c b/games/gcompris2/files/patch-src_boards_wordsgame.c
new file mode 100644
index 000000000000..53ee05895607
--- /dev/null
+++ b/games/gcompris2/files/patch-src_boards_wordsgame.c
@@ -0,0 +1,76 @@
+--- src/boards/wordsgame.c.orig	Tue Nov 30 04:22:16 2004
++++ src/boards/wordsgame.c	Tue Nov 30 04:27:02 2004
+@@ -223,7 +223,7 @@
+ static gint key_press(guint keyval)
+ {
+     gchar *letter; 
+-    gint i;
++    gint i, count;
+     LettersItem *item;
+ 
+     if(!gcomprisBoard)
+@@ -293,7 +293,7 @@
+     if(item_on_focus==NULL) 
+ 	{
+ 	g_static_rw_lock_reader_lock (&items_lock);
+-	gint count=items->len;
++	count=items->len;
+ 	g_static_rw_lock_reader_unlock (&items_lock);
+ 
+ 	for (i=0;i<count;i++)
+@@ -451,6 +451,8 @@
+     }
+ }
+ 
++    gint i;
++    LettersItem *item;
+ /*
+  * This does the moves of the game items on the play canvas
+  *
+@@ -458,8 +460,6 @@
+ static gint wordsgame_move_items (GtkWidget *widget, gpointer data)
+ {
+     assert (items!=NULL);
+-    gint i;
+-    LettersItem *item;
+     
+     for (i=items->len-1;i>=0;i--)
+ 	{
+@@ -554,7 +554,8 @@
+ 
+     GnomeCanvasItem *item2;
+     LettersItem *item;
+-
++    double x1, y1, x2, y2;    
++    
+     // create and init item
+     item = g_new(LettersItem,1);
+     item->word = g_strdup(g_ptr_array_index(words,rand()%words->len));
+@@ -594,9 +595,7 @@
+ 			   "fill_color", "blue",
+ 			   NULL);
+ 			   
+-   /*set right x position */
+ 
+-    double x1, y1, x2, y2;
+                                                                                                           
+                                                                                                                           
+     gnome_canvas_item_get_bounds    (item->rootitem,
+@@ -638,7 +637,7 @@
+ 
+ static void player_win(LettersItem *item)
+ {
+-
++  gint count;
+   gcompris_play_ogg ("gobble", NULL);
+ 
+   assert(gcomprisBoard!=NULL);
+@@ -677,7 +676,7 @@
+                                                                                                                               
+       /* Drop a new item now to speed up the game */
+     g_static_rw_lock_reader_lock (&items_lock);
+-    gint count=items->len;
++    count=items->len;
+     g_static_rw_lock_reader_unlock (&items_lock);
+                                                                                                                               
+       if(count==0)
diff --git a/games/gcompris2/pkg-descr b/games/gcompris2/pkg-descr
index c8e76087d2ee..d86316573ffa 100644
--- a/games/gcompris2/pkg-descr
+++ b/games/gcompris2/pkg-descr
@@ -12,4 +12,4 @@ games: chess, memory
 reading: reading practice
 other: learn to tell time, puzzle of famous paintings, vector drawing
 
-WWW: http://www.ofset.org/gcompris/
+WWW: http://gcompris.net/
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index d16668860c36..3ef5faf5e167 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -162,12 +162,18 @@ share/gnome/gcompris/boards/anim.xml
 share/gnome/gcompris/boards/anim/camera.png
 share/gnome/gcompris/boards/anim/minibutton.png
 share/gnome/gcompris/boards/babymatch.xml
+share/gnome/gcompris/boards/babymatch/bell.png
 share/gnome/gcompris/boards/babymatch/board1_0.xml
 share/gnome/gcompris/boards/babymatch/board2_0.xml
 share/gnome/gcompris/boards/babymatch/board3_0.xml
 share/gnome/gcompris/boards/babymatch/board4_0.xml
 share/gnome/gcompris/boards/babymatch/board5_0.xml
 share/gnome/gcompris/boards/babymatch/board6_0.xml
+share/gnome/gcompris/boards/babymatch/board7_0.xml
+share/gnome/gcompris/boards/babymatch/gramophone.png
+share/gnome/gcompris/boards/babymatch/lifebuoy.png
+share/gnome/gcompris/boards/babymatch/sun.png
+share/gnome/gcompris/boards/babymatch/umbrella.png
 share/gnome/gcompris/boards/babyshapes.xml
 share/gnome/gcompris/boards/babyshapes/T_baby_bottle.png
 share/gnome/gcompris/boards/babyshapes/T_banana.png
@@ -575,6 +581,8 @@ share/gnome/gcompris/boards/gcompris/animals/tigerplay001.jpg
 share/gnome/gcompris/boards/gcompris/bonus/README
 share/gnome/gcompris/boards/gcompris/bonus/flower_bad.png
 share/gnome/gcompris/boards/gcompris/bonus/flower_good.png
+share/gnome/gcompris/boards/gcompris/bonus/gnu_bad.png
+share/gnome/gcompris/boards/gcompris/bonus/gnu_good.png
 share/gnome/gcompris/boards/gcompris/bonus/smiley_bad.png
 share/gnome/gcompris/boards/gcompris/bonus/smiley_good.png
 share/gnome/gcompris/boards/gcompris/bonus/tux_bad.png
@@ -607,7 +615,6 @@ share/gnome/gcompris/boards/gcompris/food/pear.png
 share/gnome/gcompris/boards/gcompris/food/round_cookie.png
 share/gnome/gcompris/boards/gcompris/food/suggar_box.png
 share/gnome/gcompris/boards/gcompris/food/yahourt.png
-share/gnome/gcompris/boards/gcompris/gcompris-shapelabel.jpg
 share/gnome/gcompris/boards/gcompris/misc/README
 share/gnome/gcompris/boards/gcompris/misc/apple.png
 share/gnome/gcompris/boards/gcompris/misc/backcard.png
@@ -804,6 +811,7 @@ share/gnome/gcompris/boards/geography/southamerica/venezuela.png
 share/gnome/gcompris/boards/gletters.xml
 share/gnome/gcompris/boards/gletters/README
 share/gnome/gcompris/boards/gletters/gletters.ja
+share/gnome/gcompris/boards/gletters/gletters.ru
 share/gnome/gcompris/boards/hanoi.xml
 share/gnome/gcompris/boards/hexagon.xml
 share/gnome/gcompris/boards/imageid.xml
@@ -913,7 +921,7 @@ share/gnome/gcompris/boards/money/euro/p20e.jpg
 share/gnome/gcompris/boards/money/euro/p500e.jpg
 share/gnome/gcompris/boards/money/euro/p50e.jpg
 share/gnome/gcompris/boards/money/euro/p5e.jpg
-share/gnome/gcompris/boards/money/money-bg.jpg
+share/gnome/gcompris/boards/money/money-bg.png
 share/gnome/gcompris/boards/money_cents.xml
 share/gnome/gcompris/boards/mrpatate/README
 share/gnome/gcompris/boards/mrpatate/barbe1.png
@@ -1173,6 +1181,7 @@ share/gnome/gcompris/boards/skins/default/gcompris-about.png
 share/gnome/gcompris/boards/skins/default/gcompris-bg.jpg
 share/gnome/gcompris/boards/skins/default/gcompris-init.jpg
 share/gnome/gcompris/boards/skins/default/gcompris-shapebg.jpg
+share/gnome/gcompris/boards/skins/default/gcompris-shapelabel.png
 share/gnome/gcompris/boards/skins/default/gcomprislogo.png
 share/gnome/gcompris/boards/skins/default/help.png
 share/gnome/gcompris/boards/skins/default/help_bg.png
@@ -2314,14 +2323,12 @@ share/gnome/gcompris/boards/sounds/ru/geography/uruguay.ogg
 share/gnome/gcompris/boards/sounds/ru/geography/usa.ogg
 share/gnome/gcompris/boards/sounds/ru/geography/venezuela.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/about.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/awesome.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/back.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/by.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/click_on_letter.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/configuration.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/congratulation.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/equal.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/fantastic.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/good.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/great.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/help.ogg
@@ -2329,11 +2336,9 @@ share/gnome/gcompris/boards/sounds/ru/misc/level.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/minus.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/ok.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/outof.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/perfect.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/plus.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/quit.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/super.ogg
-share/gnome/gcompris/boards/sounds/ru/misc/waytogo.ogg
 share/gnome/gcompris/boards/sounds/ru/misc/welcome.ogg
 share/gnome/gcompris/boards/sounds/train.ogg
 share/gnome/gcompris/boards/submarine.xml
@@ -2390,10 +2395,12 @@ share/gnome/gcompris/boards/wordsgame/wordslevel1.fr
 share/gnome/gcompris/boards/wordsgame/wordslevel1.hu
 share/gnome/gcompris/boards/wordsgame/wordslevel1.it
 share/gnome/gcompris/boards/wordsgame/wordslevel1.lt
+share/gnome/gcompris/boards/wordsgame/wordslevel1.nb
 share/gnome/gcompris/boards/wordsgame/wordslevel1.nn
 share/gnome/gcompris/boards/wordsgame/wordslevel1.pt
 share/gnome/gcompris/boards/wordsgame/wordslevel1.pt_BR
 share/gnome/gcompris/boards/wordsgame/wordslevel1.ro
+share/gnome/gcompris/boards/wordsgame/wordslevel1.ru
 share/gnome/gcompris/boards/wordsgame/wordslevel1.sk
 share/gnome/gcompris/boards/wordsgame/wordslevel1.sl
 share/gnome/gcompris/boards/wordsgame/wordslevel2.da
@@ -2405,10 +2412,12 @@ share/gnome/gcompris/boards/wordsgame/wordslevel2.fi
 share/gnome/gcompris/boards/wordsgame/wordslevel2.fr
 share/gnome/gcompris/boards/wordsgame/wordslevel2.it
 share/gnome/gcompris/boards/wordsgame/wordslevel2.lt
+share/gnome/gcompris/boards/wordsgame/wordslevel2.nb
 share/gnome/gcompris/boards/wordsgame/wordslevel2.nn
 share/gnome/gcompris/boards/wordsgame/wordslevel2.pt
 share/gnome/gcompris/boards/wordsgame/wordslevel2.pt_BR
 share/gnome/gcompris/boards/wordsgame/wordslevel2.ro
+share/gnome/gcompris/boards/wordsgame/wordslevel2.ru
 share/gnome/gcompris/boards/wordsgame/wordslevel2.sk
 share/gnome/gcompris/boards/wordsgame/wordslevel2.sl
 share/gnome/gcompris/boards/wordsgame/wordslevel3.fr
@@ -2423,11 +2432,13 @@ share/gnome/gcompris/boards/wordsgame/wordslevelmax.fr
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.hu
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.it
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.lt
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.nb
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.nl
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.nn
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.pt
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.pt_BR
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.ro
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.ru
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.sk
 share/gnome/gcompris/boards/wordsgame/wordslevelmax.sl
 share/gnome/help/gcompris/C/gcompris.html