[Gsrc-commit] /srv/bzr/gsrc/trunk r1365: fix gnash build

[Brandon Invergo]

------------------------------------------------------------
revno: 1365
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-12-09 13:30:57 +0100
message:
  fix gnash build
added:
  gnu/gnash/files/
  gnu/gnash/files/gnash-0.8.10-fix-build.diff
modified:
  TODO
  gnu/gnash/Makefile
  gnu/gnash/sha256sums

=== modified file 'TODO'
--- a/TODO      2012-12-08 19:22:00 +0000
+++ b/TODO      2012-12-09 12:30:57 +0000
@@ -156,7 +156,6 @@
 ** gleem: extremely unflexible Makefile needs to be replaced
 ** gmediaserver: libupnp errors
 ** gcompris 12.05: .so hell
-** gnash: dependency hell (gstreamer)
 ** gnucap: major C++ errors
 ** gnusound: gnome hell
 ** greg: requires ancient libtool

=== modified file 'gnu/gnash/Makefile'
--- a/gnu/gnash/Makefile        2012-11-17 18:24:07 +0000
+++ b/gnu/gnash/Makefile        2012-12-09 12:30:57 +0000
@@ -9,6 +9,7 @@
 MASTER_SUBDIR = $(GARNAME)/$(GARVERSION)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = $(DISTNAME)-fix-build.diff
 
 LIBDEPS = 
 LIBDEPS = boost zlib libpng gtk2 pango atk cairo zlib libpng glib  \
@@ -17,6 +18,8 @@
 
 ######################################################################
 
+USE_AUTORECONF = y
+
 include ../../gar.lib/auto.mk
 include config.mk
 

=== added directory 'gnu/gnash/files'
=== added file 'gnu/gnash/files/gnash-0.8.10-fix-build.diff'
--- a/gnu/gnash/files/gnash-0.8.10-fix-build.diff       1970-01-01 00:00:00 
+0000
+++ b/gnu/gnash/files/gnash-0.8.10-fix-build.diff       2012-12-09 12:30:57 
+0000
@@ -0,0 +1,12 @@
+diff -x config.log -x config.status -ru work/gnash-0.8.10/macros/boost.m4 
work/gnash-0.8.10/macros/boost.m4
+--- work/gnash-0.8.10/macros/boost.m4  2012-01-19 19:17:49.000000000 +0000
++++ work/gnash-0.8.10/macros/boost.m4  2012-11-02 23:33:06.968258838 +0000
+@@ -37,7 +37,7 @@
+   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp 
multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp 
program_options/options_description.hpp iostreams/stream.hpp"
+   dnl this is a list of *required* libraries. If any of these are missing, 
this
+   dnl test will return a failure, and Gnash won't build.
+-  boost_libs="thread program_options iostreams"
++  boost_libs="thread program_options iostreams system"
+ 
+   dnl this is a list of *recommended* libraries. If any of these are missing, 
this
+   dnl test will return a warning, and Gnash will build, but testing won't 
work.

=== modified file 'gnu/gnash/sha256sums'
--- a/gnu/gnash/sha256sums      2012-11-06 08:26:27 +0000
+++ b/gnu/gnash/sha256sums      2012-12-09 12:30:57 +0000
@@ -1,2 +1,3 @@
 7d69d36d143ba9e2fd639decbde44f31d17cd1ef1a80ff9c350aecbd78404875  
download/gnash-0.8.10.tar.gz
+5d277c4ec8a5df58110a56466230bbc2f9d52f36a7496b507a73dc4e4ffab1c1  
download/gnash-0.8.10-fix-build.diff
 6db36faaaf7c4a396d36778487612ff42847d83ddcfb8eb4010d6791c2f1b680  
download/gnash-0.8.10.tar.gz.sig