[gnash/gnash-git] More linkage fix for python mod

[Hicham HAOUARI]

commit e5b7a01d78489de47d525f4e9c8bf65424e51a72
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Tue Feb 1 13:07:01 2011 +0000

    More linkage fix for python mod

 0003-More-linkage-fix-for-python-mod.patch |   35 ++++++++++++++++++++++++++++
 gnash.spec                                 |   17 ++++++++-----
 2 files changed, 45 insertions(+), 7 deletions(-)
---
diff --git a/0003-More-linkage-fix-for-python-mod.patch b/0003-More-linkage-fix-for-python-mod.patch
new file mode 100644
index 0000000..3910568
--- /dev/null
+++ b/0003-More-linkage-fix-for-python-mod.patch
@@ -0,0 +1,35 @@
+From cbb9384b3cedb6214d651cb7f4d669569bfc8e1c Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Tue, 1 Feb 2011 13:04:25 +0000
+Subject: [PATCH 3/3] More linkage fix for python mod
+
+---
+ gui/pythonmod/Makefile.am |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
+index d3dfee8..6ca057d 100644
+--- a/gui/pythonmod/Makefile.am
++++ b/gui/pythonmod/Makefile.am
+@@ -63,14 +63,15 @@ instdir = $(includedir)/gnash
+ inst_HEADERS = gnash-view.h
+ 
+ if BUILD_OGL_RENDERER
+-RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_gtkglext.cpp
++RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_gtkglext.cpp
+ INCLUDES += $(GLEXT_CFLAGS)
++gnash_la_LIBADD += $(GLEXT_LIBS)
+ endif
+ if BUILD_AGG_RENDERER
+-RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_agg.cpp
++RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_agg.cpp
+ endif
+ if BUILD_CAIRO_RENDERER
+-RENDERER_GLUE = $(top_srcdir)/gui/gtk/gtk_glue_cairo.cpp
++RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_cairo.cpp
+ endif
+ 
+ if USE_PYTHON
+-- 
+1.7.3.5
+
diff --git a/gnash.spec b/gnash.spec
index 208616d..7fcbb8a 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -23,6 +23,12 @@ Patch0:         gnash-0.8.3-fix-kde4-port.patch
 # Remove superflous linkage in kde4 gnash
 Patch1:         0001-Remove-superfluous-linkage-in-kde4_gnash.patch
 
+# Fix the check for perl in docbook.m4
+Patch2:         0002-Fix-the-check-for-perl-in-docbook.m4.patch
+
+# More linkage fix for python mod
+Patch3:         0003-More-linkage-fix-for-python-mod.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -113,14 +119,10 @@ application.
 %setup -q
 %patch0 -p1 -b .fix-kde4
 %patch1 -p1 -b .remove-superfluous-linkage
+%patch2 -p1 -b .fix-check-perl-docbook
+%patch3 -p1 -b .more-linkage-fix-pythonmod
 
-# fix the check for the docbook2X tools being in Perl
-sed -i -e 's/" perl "/"perl "/g' configure
-# fix a typo in the doc generation (FTBFS #631181)
-sed -i -e 's/gnashref.texi gnash_user.texi/gnashref.texi gnash_ref.texi/g' \
-  doc/C/Makefile.in
-
-iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
+iconv -f iso-8859-1 -t utf8 < AUTHORS > AUTHORS.utf8
 touch -r AUTHORS AUTHORS.utf8
 mv AUTHORS.utf8 AUTHORS
 
@@ -311,6 +313,7 @@ fi
 - Drop the curl patches
 - Explicitly disable testsuite ( we don't have the necessary deps )
 - Enable jemalloc
+- Add more linkage fix to pythonmod
 
 * Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.8-4
 - backport 2 upstream commits to make it work with libcurl >= 7.21.x (#639737)