Add patch for CXXFLAGS and RPATH thanks to vapier in bug 139457 and 139459

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 75 insertions, 12 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index e82e95bbc177..7548ca1f0473 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.14 2006/07/04 17:48:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.15 2006/07/07 00:51:16 genstef Exp $
+
+  07 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/gnash-fix-cxxflags-rpath.patch, gnash-0.7.1_p20060704.ebuild:
+  Add patch for CXXFLAGS and RPATH thanks to vapier in bug 139457 and 139459
 
 *gnash-0.7.1_p20060704 (04 Jul 2006)
 
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index d0cc3592df4e..412fd6190ee8 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -14,6 +14,10 @@ AUX gnash-as-needed.diff 1359 RMD160 e3caac39b725724bb3d31cde6f0a9bae7788363e SH
 MD5 5758f8309a9738a69b55dc2f8de7c7eb files/gnash-as-needed.diff 1359
 RMD160 e3caac39b725724bb3d31cde6f0a9bae7788363e files/gnash-as-needed.diff 1359
 SHA256 beae9755cc8c45b4675b562dd57da720e5b24b56dfebe5a7e7220e4dadc019c7 files/gnash-as-needed.diff 1359
+AUX gnash-fix-cxxflags-rpath.patch 2189 RMD160 b092e04727a686bd971c77e3619a418a5dbcc37f SHA1 3af2848fda6c761859315ae89ea0badbc567d207 SHA256 553fcad662bec090d2739bb3d69becb05b3d4f299cb79108f9cfd1969a4af418
+MD5 9e955f27087ffa5ef139acfa2c05b7d1 files/gnash-fix-cxxflags-rpath.patch 2189
+RMD160 b092e04727a686bd971c77e3619a418a5dbcc37f files/gnash-fix-cxxflags-rpath.patch 2189
+SHA256 553fcad662bec090d2739bb3d69becb05b3d4f299cb79108f9cfd1969a4af418 files/gnash-fix-cxxflags-rpath.patch 2189
 DIST gnash-0.7.1.tar.bz2 1089794 RMD160 db7817a80d41a9e1a7168bc8554c64c66f23eb98 SHA1 df52437321c976be132dd85b64d32d6b9a975bdb SHA256 48fcb533e3989757c23af2b9130c8b490a4d40375be4813ce425efea82ae0f62
 DIST gnash-0.7.1_p20060528.tar.gz 3436546 RMD160 bb2aeb547a56158cdfd28103438bee9d848e5a14 SHA1 999093780f1c562ab826643683e9909576a37e06 SHA256 9cd5917a33c07a2708fde5c97a9e01fea6608088dcfdb15848965bbcadb757b6
 DIST gnash-0.7.1_p20060704.tar.bz2 3287215 RMD160 708ebf8a2a4d26c8a1ba14465ab12662e00a5f11 SHA1 48bff4683b48611874844c406baca7f12cf64a4c SHA256 e236556ab800adad5dfd37aa55bb1b12ba2a8ecb4d0de277505e7a7eb7446d88
@@ -25,14 +29,14 @@ EBUILD gnash-0.7.1_p20060528.ebuild 2706 RMD160 97c68894c439886a2692926970a18d4a
 MD5 38802422e368ed19b4fc49a5175cb5ec gnash-0.7.1_p20060528.ebuild 2706
 RMD160 97c68894c439886a2692926970a18d4a770a6a33 gnash-0.7.1_p20060528.ebuild 2706
 SHA256 dceb811c3beb8f14f00c5f53e7f1467611d097db8574e73363d3471020b038c3 gnash-0.7.1_p20060528.ebuild 2706
-EBUILD gnash-0.7.1_p20060704.ebuild 2514 RMD160 9c2b5833613b6aa375e97652ebf6cf731877ab1f SHA1 5f956d5a2702052408ebc0df912afe151054b13c SHA256 e481c3c402542e3412a7ff79dfda3309696344477d2738b65ef8942cd553fe10
-MD5 047d53bb822eac824ab477cc1e0f8ddf gnash-0.7.1_p20060704.ebuild 2514
-RMD160 9c2b5833613b6aa375e97652ebf6cf731877ab1f gnash-0.7.1_p20060704.ebuild 2514
-SHA256 e481c3c402542e3412a7ff79dfda3309696344477d2738b65ef8942cd553fe10 gnash-0.7.1_p20060704.ebuild 2514
-MISC ChangeLog 2690 RMD160 344d13d93566106ce5b3e2a8130e8bc276b8987c SHA1 96f8c2b5b782c22b01f91f41fe26abe3a4b5b10c SHA256 53c955c7fe155ea1335cec2c532a376fc31af8ea62c489aa977e54db04229a4d
-MD5 15d2ce6cab26d38501435adf007e77ab ChangeLog 2690
-RMD160 344d13d93566106ce5b3e2a8130e8bc276b8987c ChangeLog 2690
-SHA256 53c955c7fe155ea1335cec2c532a376fc31af8ea62c489aa977e54db04229a4d ChangeLog 2690
+EBUILD gnash-0.7.1_p20060704.ebuild 2749 RMD160 1f3ae8605fdc555b09025435896a5469025afce5 SHA1 3e3a1ee49690d5b0f318402a002af628a50e8593 SHA256 58f2d2d09e1acceb9f3a822a176e027242d72994d29bf3b181147fbf486142fb
+MD5 479b9747eb69b09d83375f409258c73c gnash-0.7.1_p20060704.ebuild 2749
+RMD160 1f3ae8605fdc555b09025435896a5469025afce5 gnash-0.7.1_p20060704.ebuild 2749
+SHA256 58f2d2d09e1acceb9f3a822a176e027242d72994d29bf3b181147fbf486142fb gnash-0.7.1_p20060704.ebuild 2749
+MISC ChangeLog 2892 RMD160 4267a4c762c72d179d55d88f6e71b9518266dfbe SHA1 26e391b42ed3d86eec2892c878e737f33751571a SHA256 80847e5e3be50a6d1baf1fb8a81748f4108b0d9fe35f5474ef387b0f130376f2
+MD5 8c6d2f54c90c895052b3440d549a573b ChangeLog 2892
+RMD160 4267a4c762c72d179d55d88f6e71b9518266dfbe ChangeLog 2892
+SHA256 80847e5e3be50a6d1baf1fb8a81748f4108b0d9fe35f5474ef387b0f130376f2 ChangeLog 2892
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
diff --git a/net-www/gnash/files/gnash-fix-cxxflags-rpath.patch b/net-www/gnash/files/gnash-fix-cxxflags-rpath.patch
new file mode 100644
index 000000000000..c490ca0216c3
--- /dev/null
+++ b/net-www/gnash/files/gnash-fix-cxxflags-rpath.patch
@@ -0,0 +1,50 @@
+diff -u gnash/libgeometry/Makefile.am.orig gnash/libgeometry/Makefile.am
+--- gnash/libgeometry/Makefile.am.orig	2006-07-07 01:39:00.000000000 +0200
++++ gnash/libgeometry/Makefile.am	2006-07-07 01:39:23.000000000 +0200
+@@ -38,7 +38,7 @@
+ 
+ AUTOMAKE_OPTIONS = 
+ 
+-AM_CXXFLAGS =  $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
++AM_CXXFLAGS =  $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
+ AM_CPPFLAGS = #-Wall
+ # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)
+ 
+diff -u gnash/libamf/Makefile.am.orig gnash/libamf/Makefile.am
+--- gnash/libamf/Makefile.am.orig	2006-07-07 01:39:06.000000000 +0200
++++ gnash/libamf/Makefile.am	2006-07-07 01:39:37.000000000 +0200
+@@ -38,7 +38,7 @@
+ 
+ AUTOMAKE_OPTIONS = 
+ 
+-AM_CXXFLAGS =  $(CFLAGS) $(SDL_CFLAGS) $(INCLUDES)
++AM_CXXFLAGS =  $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
+ AM_CPPFLAGS = 
+ AM_LDFLAGS = \
+ 	../libbase/libgnashbase.la \
+diff -u gnash/plugin/mozilla-sdk/Makefile.am.orig gnash/plugin/mozilla-sdk/Makefile.am
+--- gnash/plugin/mozilla-sdk/Makefile.am.orig	2006-07-07 01:39:12.000000000 +0200
++++ gnash/plugin/mozilla-sdk/Makefile.am	2006-07-07 01:39:52.000000000 +0200
+@@ -42,7 +42,7 @@
+         -I$(srcdir) \
+ 	-I$(srcdir)/include
+ 
+-AM_CXXFLAGS = $(CFLAGS) $(INCLUDES)
++AM_CXXFLAGS = $(CXXFLAGS) $(INCLUDES)
+ AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS)
+ # AM_LDFLAGS  = $(FIREFOX_LIBS)
+ 
+diff -u gnash/plugin/Makefile.am.orig gnash/plugin/Makefile.am
+--- gnash/plugin/Makefile.am.orig	2006-07-07 01:40:02.000000000 +0200
++++ gnash/plugin/Makefile.am	2006-07-07 01:40:16.000000000 +0200
+@@ -152,8 +152,8 @@
+ # won't load due to errors with an undefined MaiAtkObject.
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ 	test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) "$(DESTDIR)$(plugindir)"
+-	cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
+-#	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
++#	cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
++	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
+ 	$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a
+ 
+ 
diff --git a/net-www/gnash/gnash-0.7.1_p20060704.ebuild b/net-www/gnash/gnash-0.7.1_p20060704.ebuild
index 9bf02f7bd106..259a8daec030 100644
--- a/net-www/gnash/gnash-0.7.1_p20060704.ebuild
+++ b/net-www/gnash/gnash-0.7.1_p20060704.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060704.ebuild,v 1.1 2006/07/04 17:48:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060704.ebuild,v 1.2 2006/07/07 00:51:16 genstef Exp $
 
 inherit nsplugins kde-functions autotools
 
@@ -50,10 +50,15 @@ set-kdedir
 
 src_unpack() {
 	unpack ${A}
-
-	#Fix a busted opengl as-needed
 	cd ${S}
+
+	# as-needed patch
+	# http://savannah.gnu.org/bugs/?func=detailitem&item_id=16684
 	epatch ${FILESDIR}/${P}-opengl.diff
+	# CXXFLAGS should be ussed for cpp code and libtool for installation
+	# http://savannah.gnu.org/bugs/?func=detailitem&item_id=17049
+	epatch ${FILESDIR}/gnash-fix-cxxflags-rpath.patch
+
 
 	# we want sound
 	sed -i -e "s:bool do_sound = .*:bool do_sound = true;:" backend/gnash.cpp