[Gsrc-commit] /srv/bzr/gsrc/trunk r1065: clean up gnurobots and fix build, though the prog segfaults

[Brandon Invergo]

------------------------------------------------------------
revno: 1065
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-06 00:26:22 +0100
message:
  clean up gnurobots and fix build, though the prog segfaults
added:
  gnu/gnurobots/config.mk
  gnu/gnurobots/files/
  gnu/gnurobots/files/fix-build.diff
modified:
  gnu/gnurobots/Makefile
  gnu/gnurobots/sha256sums

=== modified file 'gnu/gnurobots/Makefile'
--- a/gnu/gnurobots/Makefile    2010-09-01 15:48:56 +0000
+++ b/gnu/gnurobots/Makefile    2012-11-05 23:26:22 +0000
@@ -1,16 +1,22 @@
 GARNAME = gnurobots
 GARVERSION = 1.2.0
+HOME_URL = http://www.gnu.org/software/gnurobots/
+DESCRIPTION = A game in which you program a robot
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnurobots/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-LIBDEPS = guile
-
-HOME_URL = http://www.gnu.org/software/gnurobots/
-DESCRIPTION = GNU Robots
+PATCHFILES = fix-build.diff
+
+BUILDDEPS = 
+LIBDEPS = guile glib readline
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += READLINE_CFLAGS="-I$(prefix)/include/readline"

=== added file 'gnu/gnurobots/config.mk'
--- a/gnu/gnurobots/config.mk   1970-01-01 00:00:00 +0000
+++ b/gnu/gnurobots/config.mk   2012-11-05 23:26:22 +0000
@@ -0,0 +1,4 @@
+## Configuration options for gnurobots ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/gnurobots/files'
=== added file 'gnu/gnurobots/files/fix-build.diff'
--- a/gnu/gnurobots/files/fix-build.diff        1970-01-01 00:00:00 +0000
+++ b/gnu/gnurobots/files/fix-build.diff        2012-11-05 23:26:22 +0000
@@ -0,0 +1,38 @@
+diff -x config.log -x config.status -ru work/gnurobots-1.2.0/configure.ac 
work/gnurobots-1.2.0/configure.ac
+--- work/gnurobots-1.2.0/configure.ac  2008-08-03 21:48:45.000000000 +0200
++++ work/gnurobots-1.2.0/configure.ac  2012-11-06 00:23:10.389667927 +0100
+@@ -91,7 +91,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
+-CFLAGS="-pedantic-errors -Werror -Wall -g"
++CFLAGS="-Wall -g"
+ 
+ dnl Done.
+ AC_CONFIG_FILES([Makefile
+diff -x config.log -x config.status -ru work/gnurobots-1.2.0/src/main.c 
work/gnurobots-1.2.0/src/main.c
+--- work/gnurobots-1.2.0/src/main.c    2008-08-03 17:19:46.000000000 +0200
++++ work/gnurobots-1.2.0/src/main.c    2012-11-06 00:23:31.126338327 +0100
+@@ -295,9 +295,8 @@
+               exit_nicely();
+       }
+ 
+-      g_thread_init(NULL);
+       gdk_threads_init();
+-      g_thread_create(callback, &loading, FALSE, NULL);
++      g_thread_create("main", callback, &loading, FALSE);
+ 
+       /* ensure the robot is placed properly */
+       MAP_SET_OBJECT(map, G_ROBOT_POSITION_Y(robot),
+diff -x config.log -x config.status -ru work/gnurobots-1.2.0/src/ui-cmdwin.c 
work/gnurobots-1.2.0/src/ui-cmdwin.c
+--- work/gnurobots-1.2.0/src/ui-cmdwin.c       2008-08-03 16:44:53.000000000 
+0200
++++ work/gnurobots-1.2.0/src/ui-cmdwin.c       2012-11-06 00:22:54.129665099 
+0100
+@@ -22,7 +22,7 @@
+ #include <pty.h>
+ 
+ #include <vte/vte.h>
+-#include <readline.h>
++#include <readline/readline.h>
+ #include <history.h>
+ 
+ struct _UICmdWinPrivate

=== modified file 'gnu/gnurobots/sha256sums'
--- a/gnu/gnurobots/sha256sums  2010-06-11 09:39:08 +0000
+++ b/gnu/gnurobots/sha256sums  2012-11-05 23:26:22 +0000
@@ -1,2 +1,3 @@
 8b6f4f0d40bef5cfdfb7eb7c82ea1402d2747c37b2c7b7aa92faff55351df11d  
download/gnurobots-1.2.0.tar.gz
+1d182f6dcfbfd7b0b1950293fb32bc8d7fe4ec8bf3742d56a130aae317e81321  
download/fix-build.diff
 33044de00d62eca070dc6633f8ab437541a0607eb5581c41f7c954f8532b644b  
download/gnurobots-1.2.0.tar.gz.sig