add patch for building with gcc46 (bug #362371)

Package-Manager: portage-2.1.9.42/cvs/Linux i686

6 files changed, 31 insertions, 15 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index bf5de1bc5a1f..d7ca513d2630 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.48 2011/03/04 12:59:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.49 2011/04/08 03:21:08 mr_bones_ Exp $
+
+  08 Apr 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  irrlicht-1.7.2.ebuild, files/irrlicht-1.7.2-config.patch,
+  +files/irrlicht-1.7.2-gcc46.patch, files/irrlicht-1.7.2-gentoo.patch:
+  add patch for building with gcc46 (bug #362371)
 
   04 Mar 2011; Brent Baude <ranger@gentoo.org> irrlicht-1.7.2.ebuild:
   stable ppc, bug 353991
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 1df7df3037bb..e1f1dbc0eef4 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,7 +1,8 @@
-AUX irrlicht-1.7.2-config.patch 1524 RMD160 605b3e87e1a979614cd47e1d9939d75556e744a4 SHA1 70a01ddfe947f8abf4a8b23f195eba7a1928158b SHA256 57da1c0af56b5a2145e3befa16c227f2222aeccd2fe050bd93d484a22643ab1d
+AUX irrlicht-1.7.2-config.patch 1452 RMD160 225018641a064ddb7c7786a50a2c2afb67a4fd3a SHA1 f7409d423976547eb51b1bfa800c8a66761e9380 SHA256 462261491e7e07656b2bccf5ffef3cb5a04326e4ec43416391758adbfc0f81c4
 AUX irrlicht-1.7.2-demoMake.patch 19873 RMD160 61ad654a0824a1bde18a26ff642de412082166dd SHA1 582b60ef94fe93d458322429b4622da6e122ada2 SHA256 f4686dceb39913fb26035f970e999dff7b8dd82e87de6b999f3dfb5aacf846d0
-AUX irrlicht-1.7.2-gentoo.patch 4073 RMD160 57907659545220088d41dd6ad436495ba01c4dd6 SHA1 9a4457bdc167d679eca4900969f26449ff294024 SHA256 18999f431b19ac5b18fe74a8ca08fd42b21239b6717c510c753c423b107863bd
+AUX irrlicht-1.7.2-gcc46.patch 461 RMD160 7e545b45b090277aff713c47dd81c61271122624 SHA1 aa9d90200f1e3d9ccc3da7502695ffca653623a5 SHA256 fc3affd77a77b1f2fb31b5d4224755250374369207866c2c60d114772e04b829
+AUX irrlicht-1.7.2-gentoo.patch 3719 RMD160 011a66c1c17a4ea31a4d67d3364304d1aa89ad75 SHA1 0e1fdba537052809e265a5c5b0048530be36683f SHA256 2f9424314ed9b1845741f0df85839cf5293de74dcb796a67c7f0dd6e74613fa0
 DIST irrlicht-1.7.2.zip 24603866 RMD160 066a2a664cced9ba92c2dd0337f7ca779bad8b75 SHA1 2f064cb4c712e1d7aca90a116485b5b166ae6218 SHA256 be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d
-EBUILD irrlicht-1.7.2.ebuild 1372 RMD160 3eeb70ee1427753a51d4925df943cfc3f385c167 SHA1 727ff9aaeba718e1ac358b4685179d9a3cdc8d18 SHA256 ec69247b5c6f63a44a8e7f351c1cf04404ebebd5a64bb54089b94e102c71b50e
-MISC ChangeLog 7844 RMD160 a26c5e913a8e46c843ca707d37512630170616e0 SHA1 5cd886811d1065ad928e83aa885314029c0ca13c SHA256 320c4b77749d0dfb3f8214f3f32ae63a40cf663e3cf97d26197e7a48c074b994
+EBUILD irrlicht-1.7.2.ebuild 1410 RMD160 b5e44d3bfba63a88b9335c6c4fc6724857a042da SHA1 fb341e3ebf1bfc68995fc9453ede40e9e158f2e7 SHA256 b2ff633a476eb9891d78b62a2db4fe4955c79182cf3796ee157b38813506e314
+MISC ChangeLog 8085 RMD160 8450c13a5ee0e50c7113a9ea2508b6ea38d2dbcf SHA1 48a98624a35d8b526f467f109940fb97f9780378 SHA256 ac273e669bd672637368b56f7271a05ee879698a9bac82a8f68e20821b86fac2
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch
index d71044e502f3..da553ed8ab58 100644
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch
+++ b/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch
@@ -1,5 +1,5 @@
---- include/IrrCompileConfig.h.old	2010-03-14 17:36:10.000000000 +0100
-+++ include/IrrCompileConfig.h	2010-03-14 18:25:01.000000000 +0100
+--- include/IrrCompileConfig.h.old
++++ include/IrrCompileConfig.h
 @@ -176,7 +176,7 @@
  //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
  /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch
new file mode 100644
index 000000000000..bb7ef961238b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch
@@ -0,0 +1,11 @@
+--- ./source/Irrlicht/Makefile.orig
++++ ./source/Irrlicht/Makefile
+@@ -75,7 +75,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)

+ INSTALL_DIR = /usr/local/lib

+ sharedlib install: SHARED_LIB = libIrrlicht.so

+-staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias

++staticlib sharedlib: LDFLAGS += --Wl,--add-stdcall-alias

+ sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm

+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include

+ 

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch
index 781b0aa89add..e23c98f243ae 100644
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch
+++ b/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp
---- irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp	2010-10-24 09:42:46.000000000 -0400
-+++ irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp	2011-01-03 12:14:01.213269510 -0500
+--- irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp
++++ irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp
 @@ -162,7 +162,7 @@
  	if (BitDepth < 8)

  	{

@@ -10,9 +9,8 @@ diff -ru irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp irrlicht-1.7.2/
  		else

  			png_set_packing(png_ptr);

  	}

-diff -ru irrlicht-1.7.2.orig/source/Irrlicht/Makefile irrlicht-1.7.2/source/Irrlicht/Makefile
---- irrlicht-1.7.2.orig/source/Irrlicht/Makefile	2010-10-31 17:53:30.000000000 -0400
-+++ irrlicht-1.7.2/source/Irrlicht/Makefile	2011-01-03 12:15:41.593882605 -0500
+--- irrlicht-1.7.2.orig/source/Irrlicht/Makefile
++++ irrlicht-1.7.2/source/Irrlicht/Makefile
 @@ -39,11 +39,7 @@
  IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

  IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

diff --git a/dev-games/irrlicht/irrlicht-1.7.2.ebuild b/dev-games/irrlicht/irrlicht-1.7.2.ebuild
index 79361a5250f2..fb89de0dab23 100644
--- a/dev-games/irrlicht/irrlicht-1.7.2.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.4 2011/03/04 12:59:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.5 2011/04/08 03:21:08 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -32,7 +32,8 @@ src_prepare() {
 	edos2unix include/IrrCompileConfig.h
 	epatch \
 		"${FILESDIR}"/${P}-config.patch \
-		"${FILESDIR}"/${P}-demoMake.patch
+		"${FILESDIR}"/${P}-demoMake.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
 
 	sed -i \
 		-e 's:\.\./\.\./media:../media:g' \