# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1530659123 -10800
# Node ID fa742965cd05623b18e9e1d853461b1095dc30ac
# Parent  fa61cfb16a253a2e937b42bcb6b78a47aa54feb4
perl-texi2html -> texi2html (because it don't contain Perl modules, and not exists on the (meta)cpan, and old, and...); gcompris: up (11.12 -> 17.05)

diff -r fa61cfb16a25 -r fa742965cd05 gcompris/.icon.png
Binary file gcompris/.icon.png has changed
diff -r fa61cfb16a25 -r fa742965cd05 gcompris/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcompris/description.txt	Wed Jul 04 02:05:23 2018 +0300
@@ -0,0 +1,21 @@
+GCompris is an educational software suite comprising of numerous activities for
+children aged 2 to 10.
+
+Some of the activities are game orientated, but nonetheless still educational.
+
+Below you can find a list of categories with some of the activities available
+in that category.
+
+  * computer discovery: keyboard, mouse, different mouse gestures, ...
+  * arithmetic: table memory, enumeration, double entry table, mirror image, ...
+  * science: the canal lock, the water cycle, the submarine, electric
+    simulation, ...
+  * geography: place the country on the map
+  * games: chess, memory, connect 4, oware, sudoku, ...
+  * reading: reading practice
+  * other: learn to tell time, puzzle of famous paintings, vector drawing,
+    cartoon making, ...
+
+Currently GCompris offers in excess of 100 activities and more are being
+developed. GCompris is free software, that means that you can adapt it to your
+own needs, improve it and, most importantly, share it with children everywhere.
diff -r fa61cfb16a25 -r fa742965cd05 gcompris/receipt
--- a/gcompris/receipt	Mon Jul 02 22:39:08 2018 +0300
+++ b/gcompris/receipt	Wed Jul 04 02:05:23 2018 +0300
@@ -1,85 +1,113 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gcompris"
-VERSION="11.12"
+VERSION="17.05"
 CATEGORY="games"
-SHORT_DESC="Education games."
+SHORT_DESC="Educational software suite comprising of numerous activities for \
+children aged 2 to 10"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gcompris.net/"
-WGET_URL="$SF_MIRROR/project/$PACKAGE/$VERSION/$TARBALL"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://gcompris.net/download/gtk/src/$TARBALL"
 
 BUILD_DEPENDS="pygtk-dev libsdl-mixer-dev librsvg-dev libxml2-dev gnuchess \
-gnet-dev sqlite3-dev libcroco-dev intltool perl perl-texi2html optipng"
-SPLIT="gcompris-music gcompris-voices-de gcompris-voices-en \
-gcompris-voices-fr gcompris-voices"
+gnet-dev sqlite3-dev libcroco-dev intltool perl perl-texi2html texinfo \
+python-dev"
+gv="gcompris-voices"
+SPLIT="gcompris-music $gv-af $gv-ar $gv-ast $gv-bg $gv-br $gv-ca $gv-cs $gv-da \
+$gv-de $gv-el $gv-en $gv-eo $gv-es $gv-eu $gv-fi $gv-fr $gv-gd $gv-he $gv-hi \
+$gv-hu $gv-id $gv-it $gv-kn $gv-lt $gv-mr $gv-nb $gv-nl $gv-nn $gv-pa $gv-pl \
+$gv-pt $gv-pt_BR $gv-ro $gv-ru $gv-sk $gv-sl $gv-so $gv-sr $gv-sv $gv-th \
+$gv-ur $gv-zh_CN $gv-zh_TW $gv gcompris"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's/g_memmove/memmove/' src/goocanvas/src/goocanvastable.c
+compile_rules() {
+	sed -i.orig 's/g_memmove/memmove/' src/goocanvas/src/goocanvastable.c
+
 	./configure \
 		--enable-sdlmixer &&
+	fix libtool &&
 	make LDFLAGS="-Wl,--copy-dt-needed-entries -lgmodule-2.0" \
-	     CFLAGS="-DG_CONST_RETURN=const" && make install &&
-	find | grep .png | xargs optipng -o7 > /dev/null
+	     CFLAGS="-DG_CONST_RETURN=const" &&
+	make install || return 1
+
+	chown -R root:root $install
+	find $install -type f -perm 664 -exec chmod 644 '{}' \;
+	find $install -type f -perm 775 -exec chmod 755 '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
+	mo="locale/${PACKAGE##*-}/"
+	case ${PACKAGE##*-} in
+		af) lang="Afrikaans";;
+		ar) lang="Arabic";;
+		ast) lang="Asturian";;
+		bg) lang="Bulgarian";;
+		br) lang="Breton";;
+		ca) lang="Catalan";;
+		cs) lang="Czech";;
+		da) lang="Danish";;
+		de) lang="German";;
+		el) lang="Greek";;
+		en) lang="English"; mo="locale/en*/";;
+		eo) lang="Esperanto";;
+		es) lang="Spanish";;
+		eu) lang="Basque";;
+		fi) lang="Finnish";;
+		fr) lang="French";;
+		gd) lang="Scots Gaelic";;
+		he) lang="Hebrew";;
+		hi) lang="Hindi";;
+		hu) lang="Hungarian";;
+		id) lang="Indonesian";;
+		it) lang="Italian";;
+		kn) lang="Kannada";;
+		lt) lang="Lithuanian";;
+		mr) lang="Marathi";;
+		nb) lang="Norwegian";;
+		nl) lang="Dutch";;
+		nn) lang="Nynorsk";;
+		pa) lang="Punjabi";;
+		pl) lang="Polish";;
+		pt) lang="Portuguese";;
+		pt_BR) lang="Brasilian Portuguese";;
+		ro) lang="Romanian";;
+		ru) lang="Russian";;
+		sk) lang="Slovak";;
+		sl) lang="Slovenian";;
+		so) lang="Somali";;
+		sr) lang="Serbian"; mo="locale/sr*";;
+		sv) lang="Swedish";;
+		th) lang="Thai";;
+		ur) lang="Urdu";;
+		zh_CN) lang="Chinese (simplified)";;
+		zh_TW) lang="Chinese (traditional)";;
+	esac
+
 	case $PACKAGE in
-	gcompris)
-		DEPENDS="pygtk libsdl-mixer librsvg libxml2 gnuchess gnet \
+		gcompris-music)
+			copy boards/music/
+			CAT="games|music"
+			;;
+		gcompris-voices-*)
+			copy voices/${PACKAGE##*-}/ $mo
+			CAT="games|$lang voices and translations"
+			;;
+		gcompris-voices)
+			copy *.mo @rm # the rest of translations not belongs to any gcompris-voices-* package
+			CAT="meta|voices in all languages"
+			unset DEPENDS
+			for i in $SPLIT; do
+				case $i in
+					gcompris-voices-*) DEPENDS="$DEPENDS $i";;
+				esac
+			done
+			;;
+		gcompris)
+			copy @std @rm
+			DEPENDS="pygtk libsdl-mixer librsvg libxml2 gnuchess gnet \
 			sqlite3 libcroco"
-		mkdir -p $fs/usr/lib/gcompris $fs/usr/share
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/lib/gcompris/*.so* \
-			$fs/usr/lib/gcompris
-		cp -a $install/usr/share/gcompris $fs/usr/share
-		# Music and voices are splited (gcompris-music, gcompris-fr, etc)
-		rm -rf $fs/usr/share/gcompris/boards/music
-		rm -rf $fs/usr/share/gcompris/boards/voices
-		;;
-	gcompris-music)
-		CAT="games|Gcompris Education games Music."
-		DEPENDS="gcompris"
-		mkdir -p $fs/usr/share/gcompris/boards
-		cp -a $install/usr/share/gcompris/boards/music \
-		$fs/usr/share/gcompris/boards
-		;;
-	gcompris-voices-de)
-		CAT="games|Gcompris Education games - German voices."
-		DEPENDS="gcompris"
-		mkdir -p $fs/usr/share/gcompris/boards/voices
-		cp -a $install/usr/share/gcompris/boards/voices/de \
-			$fs/usr/share/gcompris/boards/voices
-		;;
-	gcompris-voices-en)
-		CAT="games|Gcompris Education games - English voices."
-		DEPENDS="gcompris"
-		mkdir -p $fs/usr/share/gcompris/boards/voices
-		cp -a $install/usr/share/gcompris/boards/voices/en \
-			$fs/usr/share/gcompris/boards/voices
-		;;
-	gcompris-voices-fr)
-		CAT="games|Gcompris Education games - French voices."
-		DEPENDS="gcompris"
-		mkdir -p $fs/usr/share/gcompris/boards/voices
-		cp -a $install/usr/share/gcompris/boards/voices/fr \
-			$fs/usr/share/gcompris/boards/voices
-		;;
-	gcompris-voices)
-		CAT="games|Gcompris Education games voices (All languages)."
-		DEPENDS="gcompris gcompris-voices-fr"
-		mkdir -p $fs/usr/share/gcompris/boards
-		cp -a $install/usr/share/gcompris/boards/voices \
-			$fs/usr/share/gcompris/boards
-		for l in de en fr
-		do
-			rm -rf $fs/usr/share/gcompris/boards/voices/$l
-		done
-		;;
+			;;
 	esac
 }
diff -r fa61cfb16a25 -r fa742965cd05 gcompris/stuff/patches/fix-svg.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcompris/stuff/patches/fix-svg.patch	Wed Jul 04 02:05:23 2018 +0300
@@ -0,0 +1,179 @@
+Fix the errors that prevents svgcleaner from optimizing the SVGs:
+
+${install}/usr/share/gcompris/boards/babymatch/fusee.svg:
+Error: the document does not have an SVG element.
+
+${install}/usr/share/gcompris/boards/play_piano.svg:
+Error: invalid color at 159:28.
+
+${install}/usr/share/gcompris/boards/louis_braille/piano.svg:
+Error: invalid color at 89:28.
+
+${install}/usr/share/gcompris/boards/instruments/piano.svg:
+Error: invalid color at 89:28.
+
+${install}/usr/share/gcompris/boards/memory/gcompris_band.svg:
+Error: invalid color at 3029:28.
+
+--- a/src/babymatch-activity/resources/babymatch/fusee.svg
++++ b/src/babymatch-activity/resources/babymatch/fusee.svg
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+-<svg:svg
++<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+@@ -16,9 +16,9 @@
+    inkscape:version="0.46"
+    inkscape:output_extension="org.inkscape.output.svg.inkscape"
+    version="1.0">
+-  <svg:metadata
++  <metadata
+      id="metadata16" />
+-  <svg:defs
++  <defs
+      id="defs550">
+     <inkscape:perspective
+        sodipodi:type="inkscape:persp3d"
+@@ -27,7 +27,7 @@
+        inkscape:vp_z="500 : 250 : 1"
+        inkscape:persp3d-origin="250 : 166.66667 : 1"
+        id="perspective20" />
+-  </svg:defs>
++  </defs>
+   <sodipodi:namedview
+      id="base"
+      showgrid="true"
+@@ -39,65 +39,65 @@
+      inkscape:window-x="115"
+      inkscape:window-y="25"
+      inkscape:current-layer="svg548" />
+-  <svg:g
++  <g
+      id="g846"
+      transform="matrix(0.2576836,0,0,0.2576836,-3.2999786,-6.7252894)">
+-    <svg:path
++    <path
+        style="fill:#ff4000;fill-rule:evenodd;stroke-width:3.75"
+        d="M 271.335,362.637 C 271.335,362.637 284.054,399.945 298.468,431.318 C 312.883,462.692 338.321,477.954 341.713,477.954 C 345.104,477.954 348.496,460.148 347.648,449.973 C 346.8,439.798 323.058,419.447 363.759,451.668 C 404.459,483.889 433.288,497.456 430.744,486.433 C 434.984,459.299 387.5,402.489 418.026,412.664 C 448.551,422.839 500.274,446.581 468.053,409.272 C 435.832,371.964 402.763,355.005 430.745,355.853 C 458.726,356.701 485.859,369.42 472.293,344.83 C 458.726,320.24 393.456,281.998 365.475,265.887 C 343.429,276.91 300.165,305.826 271.335,362.637 z"
+        id="path671"
+        sodipodi:nodetypes="cccccccccccc"
+        transform="matrix(1.004098,0,0,1.014736,-1.111864,-7.223473)" />
+-    <svg:path
++    <path
+        style="fill:#ffff33;fill-opacity:0.696296;fill-rule:evenodd;stroke-width:12.5;stroke-linejoin:round"
+        d="M 284.054,339.743 C 284.054,339.743 293.381,384.683 303.556,398.249 C 313.731,411.816 316.275,410.12 318.819,391.466 C 321.363,372.812 303.556,354.157 334.081,374.508 C 364.607,394.858 390.892,420.295 375.63,388.922 C 360.367,357.549 356.127,349.918 377.325,360.941 C 398.523,371.964 418.874,380.443 393.435,349.918 C 373.934,327.872 412.937,321.936 419.721,319.393 C 435.832,321.937 351.04,274.452 342.561,274.452 C 333.233,276.148 287.445,332.959 284.054,339.743 z"
+        id="path672"
+        sodipodi:nodetypes="cccccccccc" />
+-    <svg:path
++    <path
+        style="fill:#d9d9d9;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-dasharray:none"
+        d="M 43.244,60.7763 C 122.101,62.472 321.362,94.6929 397.675,290.563 C 371.389,295.651 306.948,358.397 296.773,393.161 C 102.599,293.955 47.4836,137.089 43.244,60.7763 z"
+        id="path663"
+        sodipodi:nodetypes="cccc"
+        transform="translate(-25.43768,-29.67728)" />
+-    <svg:path
++    <path
+        style="fill:#bfbfbf;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-dasharray:none"
+        d="M 189.087,321.936 C 189.087,321.936 192.478,408.424 192.478,409.272 C 192.478,410.12 296.773,457.604 302.708,460.148 L 297.621,392.314 C 288.294,393.162 205.197,339.743 189.087,321.936 z"
+        id="path664"
+        sodipodi:nodetypes="ccccc"
+        transform="translate(-25.43768,-29.67728)" />
+-    <svg:path
++    <path
+        style="fill:#bfbfbf;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-dasharray:none"
+        d="M 190.761,322.825 C 190.761,322.825 192.478,408.424 192.478,409.272 C 192.478,410.12 296.773,457.604 302.708,460.148 L 297.621,392.314 C 264.809,382.406 210.2,343.258 190.761,322.825 z"
+        id="path665"
+        sodipodi:nodetypes="ccccc"
+        transform="matrix(-2.457462e-2,0.999698,0.999698,2.457462e-2,-13.30614,-47.2839)" />
+-    <svg:path
++    <path
+        style="fill:#bfbfbf;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-dasharray:none"
+        d="M 235.31677,210.16905 C 235.31677,210.16905 249.57675,244.29165 251.98394,249.85491 C 254.93778,253.60324 329.57296,314.51127 335.05153,317.92908 L 331.87269,296.24835 C 323.87845,288.54971 255.06929,228.23237 235.31677,210.16905 z"
+        id="path666"
+        sodipodi:nodetypes="ccccc" />
+-    <svg:path
++    <path
+        style="fill:#bfbfbf;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-dasharray:none"
+        d="M 232.63653,209.39949 L 215.86803,233.67972 L 236.51282,269.41364 L 322.26679,337.15802 L 334.6544,318.61254 L 252.66302,249.37251 L 232.63653,209.39949 z"
+        id="path667"
+        sodipodi:nodetypes="ccccccc" />
+-    <svg:path
++    <path
+        style="fill:#bfbfbf;fill-rule:evenodd;stroke:#000000;stroke-width:12.5;stroke-linejoin:round"
+        d="M 124.645,131.154 C 95.8152,170.158 155.169,218.49 183.151,183.725 C 217.068,141.329 158.562,100.629 124.645,131.154 z"
+        id="path668"
+        sodipodi:nodetypes="ccc" />
+-    <svg:path
++    <path
+        style="fill:#aeffff;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-dasharray:none"
+        d="M 132.276,135.393 C 153.474,115.043 202.653,139.633 180.608,176.094 C 156.018,207.466 105.991,167.615 132.276,135.393 z"
+        id="path669"
+        sodipodi:nodetypes="ccc" />
+-    <svg:path
++    <path
+        style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke-width:12.5;stroke-linejoin:round"
+        d="M 148.386,134.502 C 141.52512,139.23955 123.48549,154.12588 138.211,171.854 C 150.93,175.246 168.736,136.198 148.386,134.502 z"
+        id="path670"
+        sodipodi:nodetypes="ccc" />
+-  </svg:g>
+-  <svg:metadata
++  </g>
++  <metadata
+      id="metadata18">
+     <rdf:RDF
+        id="RDF616">
+@@ -130,5 +130,5 @@
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+       </cc:Work>
+     </rdf:RDF>
+-  </svg:metadata>
+-</svg:svg>
++  </metadata>
++</svg>
+--- a/src/play_piano-activity/play_piano.svg
++++ b/src/play_piano-activity/play_piano.svg
+@@ -156,7 +156,7 @@
+          offset="0"
+          id="stop11328" />
+       <stop
+-         style="stop-color:none"
++         style="stop-color:#ffffff;stop-opacity:0;"
+          offset="1"
+          id="stop11330" />
+     </linearGradient>
+--- a/src/louis_braille-activity/resources/louis_braille/piano.svg
++++ b/src/louis_braille-activity/resources/louis_braille/piano.svg
+@@ -86,7 +86,7 @@
+          offset="0"
+          id="stop11328" />
+       <stop
+-         style="stop-color:none"
++         style="stop-color:#ffffff;stop-opacity:0;"
+          offset="1"
+          id="stop11330" />
+     </linearGradient>
+--- a/src/instruments-activity/resources/instruments/piano.svg
++++ b/src/instruments-activity/resources/instruments/piano.svg
+@@ -86,7 +86,7 @@
+          offset="0"
+          id="stop11328" />
+       <stop
+-         style="stop-color:none"
++         style="stop-color:#ffffff;stop-opacity:0;"
+          offset="1"
+          id="stop11330" />
+     </linearGradient>
+--- a/src/memory-activity/resources/memory/gcompris_band.svg
++++ b/src/memory-activity/resources/memory/gcompris_band.svg
+@@ -3026,7 +3026,7 @@
+          offset="0"
+          id="stop6049" />
+       <stop
+-         style="stop-color:none"
++         style="stop-color:#3f2f17;stop-opacity:0;"
+          offset="1"
+          id="stop6051" />
+     </linearGradient>
diff -r fa61cfb16a25 -r fa742965cd05 gcompris/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gcompris/stuff/patches/series	Wed Jul 04 02:05:23 2018 +0300
@@ -0,0 +1,1 @@
+fix-svg.patch
diff -r fa61cfb16a25 -r fa742965cd05 indent/receipt
--- a/indent/receipt	Mon Jul 02 22:39:08 2018 +0300
+++ b/indent/receipt	Wed Jul 04 02:05:23 2018 +0300
@@ -12,7 +12,7 @@
 #WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/i/indent/${PACKAGE}_$VERSION.orig.tar.gz"
 
-BUILD_DEPENDS="gettext perl-texi2html"
+BUILD_DEPENDS="gettext texi2html"
 
 compile_rules() {
 #	rm -f man/indent.1 # remove zero-size file to force rebuild it
diff -r fa61cfb16a25 -r fa742965cd05 perl-texi2html/receipt
--- a/perl-texi2html/receipt	Mon Jul 02 22:39:08 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="perl-texi2html"
-VERSION="1.82"
-CATEGORY="utilities"
-SHORT_DESC="Converts texinfo documents to HTML"
-MAINTAINER="gokhlayeh@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.nongnu.org/texi2html/"
-
-TARBALL="texi2html-$VERSION.tar.bz2"
-WGET_URL="http://download.savannah.gnu.org/releases/texi2html/$TARBALL"
-
-BUILD_DEPENDS="perl"
-
-compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install || return 1
-
-	sed -i 's|bin/env perl|bin/perl|' $install/usr/bin/texi2html
-}
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="perl"
-}
diff -r fa61cfb16a25 -r fa742965cd05 texi2html/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/texi2html/receipt	Wed Jul 04 02:05:23 2018 +0300
@@ -0,0 +1,25 @@
+# SliTaz package receipt v2.
+
+PACKAGE="texi2html"
+VERSION="1.82"
+CATEGORY="utilities"
+SHORT_DESC="Converts texinfo documents to HTML"
+MAINTAINER="gokhlayeh@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="http://www.nongnu.org/texi2html/"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://download.savannah.gnu.org/releases/texi2html/$TARBALL"
+
+BUILD_DEPENDS="perl"
+
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
+}
+
+genpkg_rules() {
+	copy @std
+	DEPENDS="perl"
+}