pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/gcompris gcompris: Update to 17.05. I think this...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/17d45c9b6002
branches:  trunk
changeset: 342354:17d45c9b6002
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Oct 18 13:41:34 2019 +0000

description:
gcompris: Update to 17.05. I think this is the last GTK-based verison.

Switch to SDL_mixer for audio decoding so we're not depending on
GStreamer 0.10 cruft.

diffstat:

 games/gcompris/MESSAGE                                                      |     9 -
 games/gcompris/Makefile                                                     |    72 +-
 games/gcompris/PLIST                                                        |  8586 +++++++++-
 games/gcompris/distinfo                                                     |    15 +-
 games/gcompris/patches/patch-configure                                      |     8 +-
 games/gcompris/patches/patch-src_chess__computer-activity_chess.c           |    13 -
 games/gcompris/patches/patch-src_chess__computer-activity_chess__notation.c |    13 -
 games/gcompris/patches/patch-src_goocanvas_src_goocanvassvg.h               |    14 -
 8 files changed, 8238 insertions(+), 492 deletions(-)

diffs (truncated from 10087 to 300 lines):

diff -r 394a69a33712 -r 17d45c9b6002 games/gcompris/MESSAGE
--- a/games/gcompris/MESSAGE    Fri Oct 18 13:30:41 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2007/12/17 18:55:31 drochner Exp $
-
-For sound output, you'll need the GStreamer plugins
-audio/gst-plugins0.10-vorbis, multimedia/gst-plugins0.10-ogg and
-some audio output support (eg. audio/gst-plugins0.10-esound or
-audio/gst-plugins0.10-oss).
-
-===========================================================================
diff -r 394a69a33712 -r 17d45c9b6002 games/gcompris/Makefile
--- a/games/gcompris/Makefile   Fri Oct 18 13:30:41 2019 +0000
+++ b/games/gcompris/Makefile   Fri Oct 18 13:41:34 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.94 2019/09/02 13:20:20 adam Exp $
+# $NetBSD: Makefile,v 1.95 2019/10/18 13:41:34 nia Exp $
 
-DISTNAME=      gcompris-12.11
-PKGREVISION=   41
+DISTNAME=      gcompris-17.05
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gcompris/}
+MASTER_SITES=  https://gcompris.net/download/gtk/src/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    reed%reedmedia.net@localhost
@@ -11,54 +10,47 @@
 COMMENT=       Educational games for children
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      gnuchess-[0-9]*:../../games/gnuchess
+TOOL_DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
 
-USE_TOOLS+=            gmake intltool gtar pkg-config msgfmt texi2html
-GNU_CONFIGURE=         YES
-USE_PKGLOCALEDIR=      YES
-GNU_CONFIGURE=         YES
-USE_LIBTOOL=           YES
-CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh
-INFO_FILES=            yes
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
 
-PTHREAD_AUTO_VARS=     yes
-
-PYTHON_VERSIONS_ACCEPTED=       27 # py-sqlite2, py-gtk2
-
-PKG_SUPPORTED_OPTIONS= gnet
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gcompris
-.include "../../mk/bsd.options.mk"
-.if empty(PKG_OPTIONS:Mgnet)
-CONFIGURE_ARGS+=       --disable-gnet
-.else
-.include "../../net/gnet/buildlink3.mk"
-.endif
+USE_TOOLS+=    pkg-config perl bash:run
+USE_TOOLS+=    intltool msgfmt msgmerge xgettext
+USE_TOOLS+=    texi2html
+USE_TOOLS+=    gmake
 
 CONFIGURE_ARGS+=       --enable-sdlmixer
 
-post-extract:
-       ${CHMOD} -R go-w ${WRKSRC}
+REPLACE_PYTHON+=       boards/voices/check_voices.py
+
+REPLACE_BASH+=         boards/voices/generate_voices_rcc.sh
+REPLACE_BASH+=         boards/voices/updateVoices.sh
+
+# Junk to clean up in post-install.
+TO_REMOVE+=            share/gcompris/boards/anim/Makefile
+TO_REMOVE+=            share/gcompris/boards/anim/Makefile.am
+TO_REMOVE+=            share/gcompris/boards/anim/Makefile.in
+TO_REMOVE+=            share/gcompris/boards/explore_world_animals/Makefile.am
+TO_REMOVE+=            share/gcompris/boards/geo_country/usa/Makefile.am
+TO_REMOVE+=            share/gcompris/boards/gnumch/Makefile.am
+
+# Basically not going to get ported to Python 3 ever
+# Current development is focused on the Qt version
+PYTHON_VERSIONS_ACCEPTED=      27
 
 post-install:
-       rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile
-       rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile.am
-       rm ${DESTDIR}${PREFIX}/share/gcompris/boards/anim/Makefile.in
-       rm ${DESTDIR}${PREFIX}/share/gcompris/boards/geo_country/usa/Makefile.am
-       rm ${DESTDIR}${PREFIX}/share/gcompris/boards/gnumch/Makefile.am
+.for file in ${TO_REMOVE}
+       ${RM} -f ${DESTDIR}${PREFIX}/${file}
+.endfor
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/py-sqlite2/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 394a69a33712 -r 17d45c9b6002 games/gcompris/PLIST
--- a/games/gcompris/PLIST      Fri Oct 18 13:30:41 2019 +0000
+++ b/games/gcompris/PLIST      Fri Oct 18 13:41:34 2019 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2012/12/15 16:07:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/10/18 13:41:34 nia Exp $
 bin/gcompris
+bin/gcompris-gnuchess
 lib/gcompris/libalgebra.la
 lib/gcompris/libalgebra_guesscount.la
 lib/gcompris/libawele.la
@@ -42,7 +43,7 @@
 lib/gcompris/libtraffic.la
 lib/gcompris/libwordprocessor.la
 lib/gcompris/libwordsgame.la
-man/man6/gcompris.6
+share/appdata/gcompris.appdata.xml
 share/applications/gcompris-edit.desktop
 share/applications/gcompris.desktop
 share/gcompris/boards/README
@@ -532,6 +533,8 @@
 share/gcompris/boards/click_on_letter/carriage.svgz
 share/gcompris/boards/click_on_letter/cloud.svgz
 share/gcompris/boards/click_on_letter/default-en.desktop
+share/gcompris/boards/click_on_letter/default-fr.desktop
+share/gcompris/boards/click_on_letter/default-gd.desktop
 share/gcompris/boards/click_on_letter/repeat.svg
 share/gcompris/boards/click_on_letter_up.svg
 share/gcompris/boards/click_on_letter_up.xml
@@ -645,8 +648,10 @@
 share/gcompris/boards/connect4/back.png
 share/gcompris/boards/connect4/sablier.gif
 share/gcompris/boards/connect4/sablier.txt
-share/gcompris/boards/connect4/stone_1.png
-share/gcompris/boards/connect4/stone_2.png
+share/gcompris/boards/connect4/score_1.svg
+share/gcompris/boards/connect4/score_2.svg
+share/gcompris/boards/connect4/stone_1.svg
+share/gcompris/boards/connect4/stone_2.svg
 share/gcompris/boards/connect4/tux-teacher.png
 share/gcompris/boards/crane.svg
 share/gcompris/boards/crane.xml
@@ -1022,6 +1027,7 @@
 share/gcompris/boards/explore/playbutton.png
 share/gcompris/boards/explore/ribbon.png
 share/gcompris/boards/explore/star.png
+share/gcompris/boards/explore/world.png
 share/gcompris/boards/explore_farm_animals.svg
 share/gcompris/boards/explore_farm_animals.xml
 share/gcompris/boards/explore_farm_animals/cat.jpg
@@ -1035,27 +1041,25 @@
 share/gcompris/boards/explore_farm_animals/dog.ogg
 share/gcompris/boards/explore_farm_animals/duck.jpg
 share/gcompris/boards/explore_farm_animals/duck.ogg
-share/gcompris/boards/explore_farm_animals/farm-animals.svg
+share/gcompris/boards/explore_farm_animals/farm-animals.svgz
 share/gcompris/boards/explore_farm_animals/horse.jpg
 share/gcompris/boards/explore_farm_animals/horse.ogg
 share/gcompris/boards/explore_farm_animals/owl.jpg
 share/gcompris/boards/explore_farm_animals/owl.ogg
 share/gcompris/boards/explore_farm_animals/pig.jpg
 share/gcompris/boards/explore_farm_animals/pig.ogg
-share/gcompris/boards/explore_farm_animals/questionpic.png
 share/gcompris/boards/explore_farm_animals/rooster.jpg
 share/gcompris/boards/explore_farm_animals/rooster.ogg
 share/gcompris/boards/explore_world_animals.svg
 share/gcompris/boards/explore_world_animals.xml
-share/gcompris/boards/explore_world_animals/Makefile.am
 share/gcompris/boards/explore_world_animals/bison.jpg
 share/gcompris/boards/explore_world_animals/content.desktop.in
+share/gcompris/boards/explore_world_animals/content.svgz
 share/gcompris/boards/explore_world_animals/giraffe.jpg
 share/gcompris/boards/explore_world_animals/hedgy.jpg
 share/gcompris/boards/explore_world_animals/jaggy.jpg
 share/gcompris/boards/explore_world_animals/narwhal.jpg
 share/gcompris/boards/explore_world_animals/tux.png
-share/gcompris/boards/explore_world_animals/world.jpg
 share/gcompris/boards/explore_world_music.svg
 share/gcompris/boards/explore_world_music.xml
 share/gcompris/boards/explore_world_music/africa.jpg
@@ -1066,6 +1070,7 @@
 share/gcompris/boards/explore_world_music/australia.ogg
 share/gcompris/boards/explore_world_music/beethoven.ogg
 share/gcompris/boards/explore_world_music/content.desktop.in
+share/gcompris/boards/explore_world_music/content.svgz
 share/gcompris/boards/explore_world_music/dancingWorld.png
 share/gcompris/boards/explore_world_music/ireland.jpg
 share/gcompris/boards/explore_world_music/ireland.ogg
@@ -1078,8 +1083,6 @@
 share/gcompris/boards/explore_world_music/middleeast.jpg
 share/gcompris/boards/explore_world_music/middleeast.ogg
 share/gcompris/boards/explore_world_music/orchestra.jpg
-share/gcompris/boards/explore_world_music/suitcase.svg
-share/gcompris/boards/explore_world_music/worldmap.jpg
 share/gcompris/boards/eye_colors.svg
 share/gcompris/boards/fifteen.svg
 share/gcompris/boards/fifteen.xml
@@ -1134,6 +1137,10 @@
 share/gcompris/boards/geo_country/board12_0.xml
 share/gcompris/boards/geo_country/board13_0.xml
 share/gcompris/boards/geo_country/board14_0.xml
+share/gcompris/boards/geo_country/board15_0.xml
+share/gcompris/boards/geo_country/board15_1.xml
+share/gcompris/boards/geo_country/board15_2.xml
+share/gcompris/boards/geo_country/board15_3.xml
 share/gcompris/boards/geo_country/board1_0.xml
 share/gcompris/boards/geo_country/board2_0.xml
 share/gcompris/boards/geo_country/board3_0.xml
@@ -1529,6 +1536,48 @@
 share/gcompris/boards/geo_country/poland/warminsko-mazurskie.png
 share/gcompris/boards/geo_country/poland/wielkopolskie.png
 share/gcompris/boards/geo_country/poland/zachodnio-pomorskie.png
+share/gcompris/boards/geo_country/scotland/bg_north.png
+share/gcompris/boards/geo_country/scotland/bg_north_blank.png
+share/gcompris/boards/geo_country/scotland/bg_south.png
+share/gcompris/boards/geo_country/scotland/bg_south_blank.png
+share/gcompris/boards/geo_country/scotland/n_aberdeen.png
+share/gcompris/boards/geo_country/scotland/n_aberdeenshire.png
+share/gcompris/boards/geo_country/scotland/n_eileanan_siar.png
+share/gcompris/boards/geo_country/scotland/n_hl_caithness.png
+share/gcompris/boards/geo_country/scotland/n_hl_inverness_nairn.png
+share/gcompris/boards/geo_country/scotland/n_hl_lochaber.png
+share/gcompris/boards/geo_country/scotland/n_hl_lochalsh_badenoch_stra.png
+share/gcompris/boards/geo_country/scotland/n_hl_ross.png
+share/gcompris/boards/geo_country/scotland/n_hl_skye.png
+share/gcompris/boards/geo_country/scotland/n_hl_sutherland.png
+share/gcompris/boards/geo_country/scotland/n_moray.png
+share/gcompris/boards/geo_country/scotland/n_orkney.png
+share/gcompris/boards/geo_country/scotland/n_shetland.png
+share/gcompris/boards/geo_country/scotland/s_angus.png
+share/gcompris/boards/geo_country/scotland/s_argyll_bute.png
+share/gcompris/boards/geo_country/scotland/s_borders.png
+share/gcompris/boards/geo_country/scotland/s_clackmannanshire.png
+share/gcompris/boards/geo_country/scotland/s_dumfries_galloway.png
+share/gcompris/boards/geo_country/scotland/s_dundee.png
+share/gcompris/boards/geo_country/scotland/s_east_ayrshire.png
+share/gcompris/boards/geo_country/scotland/s_east_dunbartonshire.png
+share/gcompris/boards/geo_country/scotland/s_east_lothian.png
+share/gcompris/boards/geo_country/scotland/s_east_renfrewshire.png
+share/gcompris/boards/geo_country/scotland/s_edinburgh.png
+share/gcompris/boards/geo_country/scotland/s_falkirk.png
+share/gcompris/boards/geo_country/scotland/s_fife.png
+share/gcompris/boards/geo_country/scotland/s_glasgow.png
+share/gcompris/boards/geo_country/scotland/s_inverclyde.png
+share/gcompris/boards/geo_country/scotland/s_midlothian.png
+share/gcompris/boards/geo_country/scotland/s_north_ayrshire.png
+share/gcompris/boards/geo_country/scotland/s_north_lanarkshire.png
+share/gcompris/boards/geo_country/scotland/s_perth_kinross.png
+share/gcompris/boards/geo_country/scotland/s_renfrewshire.png
+share/gcompris/boards/geo_country/scotland/s_south_ayrshire.png
+share/gcompris/boards/geo_country/scotland/s_south_lanarkshire.png
+share/gcompris/boards/geo_country/scotland/s_stirling.png
+share/gcompris/boards/geo_country/scotland/s_west_dunbartonshire.png
+share/gcompris/boards/geo_country/scotland/s_west_lothian.png
 share/gcompris/boards/geo_country/turkey/adana.png
 share/gcompris/boards/geo_country/turkey/adiyaman.png
 share/gcompris/boards/geo_country/turkey/afyon.png
@@ -1625,7 +1674,7 @@
 share/gcompris/boards/geo_country/usa/delaware.png
 share/gcompris/boards/geo_country/usa/florida.png
 share/gcompris/boards/geo_country/usa/georgia.png
-share/gcompris/boards/geo_country/usa/hawai.png
+share/gcompris/boards/geo_country/usa/hawaii.png
 share/gcompris/boards/geo_country/usa/idaho.png
 share/gcompris/boards/geo_country/usa/illinois.png
 share/gcompris/boards/geo_country/usa/indiana.png
@@ -1813,15 +1862,34 @@
 share/gcompris/boards/geography/asia/uzbekistan.png
 share/gcompris/boards/geography/asia/vietnam.png
 share/gcompris/boards/geography/asia/yemen.png
+share/gcompris/boards/geography/board10_0.xml
+share/gcompris/boards/geography/board11_0.xml
 share/gcompris/boards/geography/board1_0.xml
 share/gcompris/boards/geography/board2_0.xml
 share/gcompris/boards/geography/board3_0.xml
+share/gcompris/boards/geography/board3_1.xml
 share/gcompris/boards/geography/board4_0.xml
 share/gcompris/boards/geography/board5_0.xml
 share/gcompris/boards/geography/board6_0.xml
 share/gcompris/boards/geography/board7_0.xml
 share/gcompris/boards/geography/board8_0.xml
 share/gcompris/boards/geography/board9_0.xml
+share/gcompris/boards/geography/centralamerica/bahamas.png
+share/gcompris/boards/geography/centralamerica/belize.png
+share/gcompris/boards/geography/centralamerica/bg_central_america.png
+share/gcompris/boards/geography/centralamerica/bg_central_america_blank.png
+share/gcompris/boards/geography/centralamerica/costa_rica.png



Home | Main Index | Thread Index | Old Index