Version bump. Drop old buildfix, add different one.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 29 insertions, 25 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 24c980aa3fc9..13538217d03d 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.5 2010/05/25 09:04:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.6 2010/06/07 13:17:29 chithanh Exp $
+
+*lightspark-0.4.1 (07 Jun 2010)
+
+  07 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/lightspark-0.3.3-llvm-datatypes.patch, -lightspark-0.3.9.ebuild,
+  +lightspark-0.4.1.ebuild, +files/lightspark-0.4.1-debug-defines.patch:
+  Version bump. Drop old buildfix, add different one.
 
 *lightspark-0.3.9 (25 May 2010)
 
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 27a008ccdaca..2fa210b1aede 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,5 +1,5 @@
-AUX lightspark-0.3.3-llvm-datatypes.patch 411 RMD160 f9eec992ea5dfe091d916dc950e07855bf2f0bd0 SHA1 1f0bde76e3680387bbdeb8acefd6b58e4efc334c SHA256 d6a03dd0510f000a32cf2de14e21c64e2a6eda0be0b047d565d63f42cad052cd
-DIST lightspark_0.3.9.orig.tar.gz 201649 RMD160 fab0c79939bfb0f909442164c6b22c090e700d3c SHA1 ff1976e26d80492fca80ac480cb7fcc87503b6af SHA256 be2cd34130f37c9b1c57d608408e6fd7eee2676506ff9c2205e161a83afcfdfb
-EBUILD lightspark-0.3.9.ebuild 1465 RMD160 f96acca1ced8a29ddf8fe867b9c93d89858c11f0 SHA1 57e256dfdd34e95f9d3ee8ab16808455120c165e SHA256 59f837d2581ad8a5623a866beca40ee3a5089d1770b866d13a25ad2ff8b3183d
-MISC ChangeLog 1159 RMD160 c28c867575ffbe888026a6eec6006964fbac4e29 SHA1 9a01219bde98da22e508f88c8b3304920b441fd3 SHA256 eb5da82d44c0975ebafb6005d6b666c46f696bc1dbcb43b0c963da90d20c0505
+AUX lightspark-0.4.1-debug-defines.patch 420 RMD160 28efcc029f4395d85972aebb34567dcd0287d4b8 SHA1 c1af3267b539b8466aa0e0e160145e580bc74c78 SHA256 702d80d63e65bef5bee1b4e98a969cfb45c7b76e28d0bd2c69745c91e04a0736
+DIST lightspark_0.4.1.orig.tar.gz 222597 RMD160 1a330bf2b4aa747b82f87f44f5ae8d2f9edfda71 SHA1 f1890f6fa502e57ceb6873c18a9b0e782caeb58e SHA256 1f927fa59f2f0fbd8e0de9e3aa1c11e50b75eb0b7e4081a1277cfbcc58ba03f2
+EBUILD lightspark-0.4.1.ebuild 1469 RMD160 2ed0a82cfac2a7989209fac3b07c6dc94e6e7132 SHA1 aab1fa37fe156c70f6019816163ff719ac2f6998 SHA256 cd130696724173201b4423523358c59336caeb7419b6690a891fad117359004d
+MISC ChangeLog 1463 RMD160 2fae969f657128b97356e403acd2feb98ff0f7f0 SHA1 59c3853772fdfa07fac107593a7dba67e46f8ee8 SHA256 71e3914b334aac8f891d39ca2863983466fab4e91034041d4008b99888fe9e31
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/www-plugins/lightspark/files/lightspark-0.3.3-llvm-datatypes.patch b/www-plugins/lightspark/files/lightspark-0.3.3-llvm-datatypes.patch
deleted file mode 100644
index 2bf56f29f64c..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.3.3-llvm-datatypes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur a/abc.h b/abc.h
---- a/abc.h	2010-05-19 05:32:38.000000000 +0200
-+++ b/abc.h	2010-05-19 15:30:13.000000000 +0200
-@@ -20,6 +20,13 @@
- #ifndef _SWF_H
- #define _SWF_H
- 
-+#ifndef INT64_C
-+# define INT64_C(C)  ((int64_t) C ## LL)
-+#endif
-+#ifndef UINT64_C
-+# define UINT64_C(C) ((uint64_t) C ## ULL)
-+#endif
-+
- #include "compat.h"
- #include <llvm/Module.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
diff --git a/www-plugins/lightspark/files/lightspark-0.4.1-debug-defines.patch b/www-plugins/lightspark/files/lightspark-0.4.1-debug-defines.patch
new file mode 100644
index 000000000000..61e5692e72bf
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.4.1-debug-defines.patch
@@ -0,0 +1,14 @@
+diff -ur a/swftypes.h b/swftypes.h
+--- a/swftypes.h	2010-06-05 03:14:06.000000000 +0200
++++ b/swftypes.h	2010-06-07 15:06:33.013468239 +0200
+@@ -471,9 +471,9 @@
+ public:
+ #ifndef NDEBUG
+ 	//Stuff onyl used in debugging
+-	bool initialized;
+ 	int getRefCount(){ return ref_count; }
+ #endif
++	bool initialized;
+ 	bool implEnable;
+ 	void setPrototype(Class_base* c);
+ 	Class_base* getPrototype() const { return prototype; }
diff --git a/www-plugins/lightspark/lightspark-0.3.9.ebuild b/www-plugins/lightspark/lightspark-0.4.1.ebuild
index 6be2f6b9950b..9f7afa2f819d 100644
--- a/www-plugins/lightspark/lightspark-0.3.9.ebuild
+++ b/www-plugins/lightspark/lightspark-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.3.9.ebuild,v 1.1 2010/05/25 09:04:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.1.ebuild,v 1.1 2010/06/07 13:17:29 chithanh Exp $
 
 EAPI=3
 inherit cmake-utils nsplugins multilib
@@ -35,8 +35,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	# TODO: have to think of a less ugly solution
-	epatch "${FILESDIR}"/${PN}-0.3.3-llvm-datatypes.patch
+	# Fix gcc complaint about undefined debug variable
+	epatch "${FILESDIR}"/${PN}-0.4.1-debug-defines.patch
 
 	# Adjust plugin permissions
 	sed -i "s|FILES|PROGRAMS|" plugin-dir/CMakeLists.txt || die