Fix build with gcc-4.5. Bug #318495

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

diff --git a/games-fps/openarena/ChangeLog b/games-fps/openarena/ChangeLog
index dbee8e125fcf92095e67b019a31e37844ff76728..ef73b8093f2f40b5f78b2c2fba6fd29ca7fe0079 100644 (file)
--- a/games-fps/openarena/ChangeLog
+++ b/games-fps/openarena/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/openarena
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.15 2010/04/27 14:27:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.16 2010/05/20 12:39:55 tupone Exp $
+
+  20 May 2010; Tupone Alfredo <tupone@gentoo.org> openarena-0.8.1-r1.ebuild,
+  files/openarena-0.8.1-makefile.patch:
+  Fix build with gcc-4.5. Bug #318495 by flameeyes@gentoo.org
 
   27 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   openarena-0.8.1-r1.ebuild:

diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
index 50a8b4f04f1aeb0e2987b67b6a3ce385564ede06..e8f440ff9b9139ed5f0390ffa972875607d97301 100644 (file)
--- a/games-fps/openarena/Manifest
+++ b/games-fps/openarena/Manifest
@@ -1,7 +1,7 @@
-AUX openarena-0.8.1-makefile.patch 8512 RMD160 edbcbaa2f55604ae16b4142edfd24233d1bba843 SHA1 94c4d7ee9ca61be4e9cc4083e053cb178d8c3efb SHA256 7e04a9c34bb3a169d0ecec6911e2b679ba3f3e56b052a713e9c8acfefa47f531
+AUX openarena-0.8.1-makefile.patch 8516 RMD160 648b0f450fd59e0799ea80f0223d1737b104d1d0 SHA1 60ba8a00a01d19eacb8b3174e8ff9a03b0b2f607 SHA256 7ae39495718541f423f4f4fa641c5dd0c38087c3994d444ecd8029f27fd3bd88
 AUX openarena-0.8.1-unbundling.patch 5905 RMD160 4dcbe1ce8ddb0a694030f265f73ff6a5fb9aa102 SHA1 009701fd4dc8323416818b45b20acb197e37c86e SHA256 ad2965612329e5d817bb3b21b6b1b373cea474f268d85d6b79b1f164ff44f0aa
 DIST oa081.zip 318927645 RMD160 9009eaf581ad0bf19296418da1a16e2d43daec16 SHA1 526c39e51d0b53177b02bd490bf830f622f35ad5 SHA256 c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d
 DIST openarena-engine-0.8.1-1.tar.bz2 2951703 RMD160 123e9f70621fd856385c6ca7ad0580b81454d687 SHA1 6de345c0bebd87e1406cb07189537db99a422808 SHA256 430ba9b691c8085b946e004f0cc890995c7f8295498bd8c8ce744293a87274d2
-EBUILD openarena-0.8.1-r1.ebuild 2173 RMD160 275bd296bf9a23a2bceecc9b6c2251ba63ac8f4a SHA1 43f85ff0bd2b5c81a30d5f981a7a06f17a9950c6 SHA256 750e9b93a9c30bcbab315a17bcedd7f9e4bb333b44a69a0f9706822dae15184c
-MISC ChangeLog 2886 RMD160 d35d392223c5839d57039a5b0ba6a89fd0b2cfa1 SHA1 76f95c39404f36ff8516bc04be53ff3a78aa193f SHA256 709d9eb4bff91839a2bfa401a7bb919f3975eee418a79e7d9b2fd3b383b98cf8
+EBUILD openarena-0.8.1-r1.ebuild 2200 RMD160 ea982d4b5458b2be4d7fa65bd369c946dba5fe4e SHA1 2249cd2305c2c87feef1b0d94c1ce9df1641fa22 SHA256 9744e72af5e32434f3895ce6fb9f600941367a7bedc18a150d507c1921fa438b
+MISC ChangeLog 3062 RMD160 3b3b04d9d5390b4dea4f9f2ec81cf6ced866093c SHA1 3b09c4ebd75f7f48a0089928bfc8e5598d53688b SHA256 b108417970d3bf3e824c2b945b50c244272af1a28abe2a0ae067129599cedda1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-fps/openarena/files/openarena-0.8.1-makefile.patch b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
index 12a7d6d26e1b71725ad4eadfa2d6cac504756432..a716763d84f616120977488834c1431abd587d4c 100644 (file)
--- a/games-fps/openarena/files/openarena-0.8.1-makefile.patch
+++ b/games-fps/openarena/files/openarena-0.8.1-makefile.patch
@@ -17,7 +17,7 @@
  
 -  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
 -    -pipe -DUSE_ICON $(shell sdl-config --cflags)
-+  BASE_CFLAGS = -fno-strict-aliasing -DUSE_ICON $(shell sdl-config --cflags)
++  BASE_CFLAGS = -fno-strict-aliasing -DUSE_ICON $(shell sdl-config --cflags) -I.
  
    ifeq ($(USE_OPENAL),1)
      BASE_CFLAGS += -DUSE_OPENAL

diff --git a/games-fps/openarena/openarena-0.8.1-r1.ebuild b/games-fps/openarena/openarena-0.8.1-r1.ebuild
index e29529a36876d384856e9adbc632058b1e7f48ff..8ece14a0849f84f834d5d3ae10f7161fe168aca4 100644 (file)
--- a/games-fps/openarena/openarena-0.8.1-r1.ebuild
+++ b/games-fps/openarena/openarena-0.8.1-r1.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/games-fps/openarena/openarena-0.8.1-r1.ebuild,v 1.4 2010/04/27 14:27:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/openarena-0.8.1-r1.ebuild,v 1.5 2010/05/20 12:39:55 tupone Exp $
 
 EAPI=2
 inherit eutils flag-o-matic versionator games
@@ -43,6 +43,8 @@ src_prepare() {
                -e '/ALDRIVER_DEFAULT/s/libopenal.so.0/libopenal.so/' \
                "${MY_S}"/code/client/snd_openal.c \
                || die "sed failed"
+       cd "${MY_S}"
+       touch jpegint.h
 }
 
 src_compile() {