[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1053: clean up gnuit
From: |
Brandon Invergo |
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1053: clean up gnuit |
Date: |
Sun, 04 Nov 2012 23:17:58 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1053
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-04 23:17:58 +0100
message:
clean up gnuit
added:
gnu/gnuit/config.mk
modified:
TODO
gar.conf.mk
gnu/gcompris/Makefile
gnu/gcompris/sha256sums
gnu/gnash/Makefile
gnu/gnash/sha256sums
gnu/gnuit/Makefile
=== modified file 'TODO'
--- a/TODO 2012-10-29 12:01:38 +0000
+++ b/TODO 2012-11-04 22:17:58 +0000
@@ -121,4 +121,9 @@
** xaos
** xhippo
* Known build failures
-** gcl: configure hangs during "checking for
+** gcl: configure hangs during "checking for
+** ggradebook: requires ancient GTK+
+** gleem: extremely unflexible Makefile needs to be replaced
+** gnash: .so hell
+** gcompris 12.05: .so hell
+** gnucap: major C++ errors
=== modified file 'gar.conf.mk'
--- a/gar.conf.mk 2010-12-20 14:13:01 +0000
+++ b/gar.conf.mk 2012-11-04 22:17:58 +0000
@@ -4,7 +4,7 @@
GARBALLDIR = $(GARDIR)/cache/garstow/garballs
# Flags to pass to make to build in parallel.
-MAKE_ARGS_PARALLEL ?=
+MAKE_ARGS_PARALLEL ?= -j1
# List of packages that should not be installed automatically as dependencies
# by GARStow -- for example, if they're provided by an underlying operating
=== modified file 'gnu/gcompris/Makefile'
--- a/gnu/gcompris/Makefile 2010-06-25 16:04:31 +0000
+++ b/gnu/gcompris/Makefile 2012-11-04 22:17:58 +0000
@@ -1,16 +1,26 @@
GARNAME = gcompris
-GARVERSION = 1.1.0
-
-MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gcompris/
-
-DISTFILES = $(DISTNAME).tgz
-# SIGFILES =
-
-# BUILDDEPS =
-# LIBDEPS =
-
-HOME_URL = http://www.gnu.org/software/gcompris
-# DESCRIPTION =
+GARVERSION = 12.05
+HOME_URL = http://gcompris.net
+DESCRIPTION = An educational software suite for kids
+
+######################################################################
+
+MASTER_SITES = $(MASTER_SOURCEFORGE)
+MASTER_SUBDIR = $(GARNAME)/files/$(GARVERSION)/
+DISTFILES = $(DISTNAME).tar.bz2
+SIGFILES =
+
+BUILDDEPS =
+LIBDEPS = libsdl_mixer chess glib
+
+######################################################################
include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-sysroot=$(prefix)
+LIBS += -lgmodule-2.0
+LDLIBS += -lgmodule-2.0
+
+
+
=== modified file 'gnu/gcompris/sha256sums'
--- a/gnu/gcompris/sha256sums 2010-06-25 16:04:31 +0000
+++ b/gnu/gcompris/sha256sums 2012-11-04 22:17:58 +0000
@@ -1,1 +1,1 @@
-b29ed5749c0e034253df2d4651d377527569d5292d3ad2682b866008ebd58648
download/gcompris-1.1.0.tgz
+a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0
download/gcompris-12.05.tar.bz2
=== modified file 'gnu/gnash/Makefile'
--- a/gnu/gnash/Makefile 2012-08-27 18:51:28 +0000
+++ b/gnu/gnash/Makefile 2012-11-04 22:17:58 +0000
@@ -1,24 +1,36 @@
GARNAME = gnash
GARVERSION = 0.8.10
+HOME_URL = http://www.gnu.org/software/gnash/
+DESCRIPTION = GNU Flash movie player
+
+######################################################################
MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnash/$(GARVERSION)/
-
+MASTER_SUBDIR = $(GARNAME)/$(GARVERSION)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-LIBDEPS =
-LIBDEPS = boost zlib libpng #gtk pango atk cairo netcat zlib jpeg libpng
freetype2 fontconfig libxml2 expat gstreamer gst-plugins-base agg curl boost
glib sdl giflib speex
-#TESTDEPS = dejagnu
+BUILDDEPS =
+LIBDEPS = boost zlib libpng gtk libpng curl boost glib libsdl #pango \
+ atk cairo netcat zlib jpeg freetype2 fontconfig libxml2 \
+ expat gstreamer gst-plugins-base agg giflib speex
-HOME_URL = http://www.gnu.org/software/gnash/
-DESCRIPTION = GNU Flash movie player
+######################################################################
include ../../gar.lib/auto.mk
+include config.mk
-CONFIGURE_OPTS = --enable-gui=gtk --enable-media=GST
--with-libiconv-prefix=$(prefix) \
- --with-boost-incl=$(prefix)/include
--with-boost-lib=$(prefix)/lib
+CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) \
+ --with-boost-incl=$(prefix)/include/boost \
+ --with-boost-lib=$(prefix)/lib \
+ --with-curl-incl=$(prefix)/include \
+ --with-curl-lib=$(prefix)/lib \
+ --with-glib-incl=$(prefix)/include/glib-2.0 \
+ --with-glib-lib=$(prefix)/lib \
+ --with-sdl-incl=$(prefix)/include/SDL \
+ --with-sdl-lib=$(prefix)/lib
pre-configure:
- @sed -i -e 's/\(^BOOST_LIBS = @address@hidden)/\1 -lboost_system/'
$(WORKSRC)/Makefile.in
+ @sed -i -e 's/\(^BOOST_LIBS = @address@hidden)/\1 -lboost_system/' \
+ $(WORKSRC)/Makefile.in
$(MAKECOOKIE)
=== modified file 'gnu/gnash/sha256sums'
--- a/gnu/gnash/sha256sums 2012-08-27 18:44:38 +0000
+++ b/gnu/gnash/sha256sums 2012-11-04 22:17:58 +0000
@@ -1,2 +1,3 @@
7d69d36d143ba9e2fd639decbde44f31d17cd1ef1a80ff9c350aecbd78404875
download/gnash-0.8.10.tar.gz
+de9cb7e49048ea3b213937c98142bc0369a4cec78a1d931467a5d9897b1117cb
download/fix-build.diff
6db36faaaf7c4a396d36778487612ff42847d83ddcfb8eb4010d6791c2f1b680
download/gnash-0.8.10.tar.gz.sig
=== modified file 'gnu/gnuit/Makefile'
--- a/gnu/gnuit/Makefile 2010-06-10 20:16:29 +0000
+++ b/gnu/gnuit/Makefile 2012-11-04 22:17:58 +0000
@@ -1,16 +1,19 @@
GARNAME = gnuit
GARVERSION = 4.9.5
+HOME_URL = http://www.gnu.org/software/gnuit/
+DESCRIPTION = A set of interactive text-mode tools
+
+######################################################################
MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnuit/
-
+MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-# BUILDDEPS =
-# LIBDEPS =
+BUILDDEPS =
+LIBDEPS =
-HOME_URL = http://www.gnu.org/software/gnuit/
-DESCRIPTION = GNU Interactive Tools
+######################################################################
include ../../gar.lib/auto.mk
+include config.mk
=== added file 'gnu/gnuit/config.mk'
--- a/gnu/gnuit/config.mk 1970-01-01 00:00:00 +0000
+++ b/gnu/gnuit/config.mk 2012-11-04 22:17:58 +0000
@@ -0,0 +1,4 @@
+## Configuration options for gnuit ##
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1053: clean up gnuit,
Brandon Invergo <=