diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-05-07 04:42:52 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-05-07 04:42:52 +0000 |
commit | e0789cda5928bddb6b025fd6cec0c93b31ee378f (patch) | |
tree | 5cb55dfb16da55bf0955655049eda06d88d08492 /games/gcompris2 | |
parent | 1fef869d752b078c599a54e064c2bb5bd0f26cd3 (diff) | |
download | ports-e0789cda5928bddb6b025fd6cec0c93b31ee378f.tar.gz ports-e0789cda5928bddb6b025fd6cec0c93b31ee378f.zip |
Notes
Diffstat (limited to 'games/gcompris2')
-rw-r--r-- | games/gcompris2/Makefile | 8 | ||||
-rw-r--r-- | games/gcompris2/files/patch-src_gcompris_anim.c | 54 |
2 files changed, 55 insertions, 7 deletions
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index 709f945c00a1..611c7804ca7e 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -36,14 +36,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ INFO= gcompris -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" -.endif - post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-DGNOME_DISABLE_DEPRECATED||g' -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/gcompris2/files/patch-src_gcompris_anim.c b/games/gcompris2/files/patch-src_gcompris_anim.c new file mode 100644 index 000000000000..806ad7adae58 --- /dev/null +++ b/games/gcompris2/files/patch-src_gcompris_anim.c @@ -0,0 +1,54 @@ +--- src/gcompris/anim.c.orig Sat May 7 00:02:54 2005 ++++ src/gcompris/anim.c Sat May 7 00:04:16 2005 +@@ -33,6 +33,14 @@ static gboolean anim_tick(void*); + GcomprisAnimation *gcompris_load_animation(char *filename) + { + FILE *f; ++ char tmp[100]; ++ GSList *files = NULL; ++ GcomprisAnimation *anim = NULL; ++ /* open the animations and assign them */ ++ GError *error = NULL; ++ GSList *cur; ++ char *name; ++ int i; + if(filename[0] == '/') /* we were probably called by load_animation_asset */ + { + f = fopen(filename, "r"); +@@ -50,9 +58,6 @@ GcomprisAnimation *gcompris_load_animati + return NULL; + } + +- char tmp[100]; +- GSList *files = NULL; +- GcomprisAnimation *anim = NULL; + + /* read filenames, one per line, from the animation spec-file */ + while(fscanf(f, "%99s", tmp) == 1) +@@ -65,11 +70,6 @@ GcomprisAnimation *gcompris_load_animati + anim->numstates = g_slist_length(files); + anim->anim = g_malloc(sizeof(GdkPixbuf*) * anim->numstates); + +- /* open the animations and assign them */ +- GError *error = NULL; +- GSList *cur; +- char *name; +- int i; + for(cur=files, i=0; cur; cur = g_slist_next(cur), i++) + { + name = (char*) cur->data; +@@ -169,13 +169,13 @@ void gcompris_set_anim_state(GcomprisAni + + static gboolean anim_tick(void *ignore) + { ++ GSList *cur; + if(active == NULL) + { + printf("deactivating anim_tick\n"); + return FALSE; + } + +- GSList *cur; + for(cur=active; cur; cur = g_slist_next(cur)) + { + GcomprisAnimCanvasItem *a = (GcomprisAnimCanvasItem*)cur->data; |