diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-02-19 01:36:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-02-19 01:36:47 +0000 |
| commit | b7b3d2e3f9ba0d1c0ae6290d6806dd6ccbdbc0bf (patch) | |
| tree | 7734d06a72077c7f8f103b161ef795c1dd9e7e9e /games-fps | |
| parent | Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528. (diff) | |
| download | historical-b7b3d2e3f9ba0d1c0ae6290d6806dd6ccbdbc0bf.tar.gz historical-b7b3d2e3f9ba0d1c0ae6290d6806dd6ccbdbc0bf.tar.bz2 historical-b7b3d2e3f9ba0d1c0ae6290d6806dd6ccbdbc0bf.zip | |
Fix building with sanitized kernel headers #193107.
Package-Manager: portage-2.2_pre2
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/quake2-icculus/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/Manifest | 11 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch | 25 | ||||
| -rw-r--r-- | games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild | 3 |
4 files changed, 39 insertions, 7 deletions
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog index 5a4d83d82083..15287da49481 100644 --- a/games-fps/quake2-icculus/ChangeLog +++ b/games-fps/quake2-icculus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/quake2-icculus # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.29 2008/02/15 01:06:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.30 2008/02/19 01:36:46 vapier Exp $ + + 19 Feb 2008; Mike Frysinger <vapier@gentoo.org> + +files/quake2-icculus-0.16.1-no-asm-io.patch, + quake2-icculus-0.16.1-r1.ebuild: + Fix building with sanitized kernel headers #193107. 15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> quake2-icculus-0.16.1.ebuild, quake2-icculus-0.16.1-r1.ebuild: diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest index 2892dfbdcf04..9a39cd66ece3 100644 --- a/games-fps/quake2-icculus/Manifest +++ b/games-fps/quake2-icculus/Manifest @@ -7,19 +7,20 @@ AUX README-postinstall 3083 RMD160 fc8094e39bf5ed779fdd4c5e2b911422e69d03da SHA1 AUX quake2-icculus-0.16.1-amd64.patch 534 RMD160 ad9193d1977ac2c0036e30022b198e5ff8b850dd SHA1 16776e9c7edf09e190393dd5c6646db1c4680bd1 SHA256 e95aeace865f089b6c1c9e0c362da407d1bd603147fb6886b9c13b37218c3a37 AUX quake2-icculus-0.16.1-gcc41.patch 364 RMD160 b85910d79a8e7e2cc71da21f5f22e331b94c0719 SHA1 3c80e62267223fbf83aa2f7ce73fcf6eba0297c9 SHA256 1010f97c15f202de682f56ac372cc342299f1e6c20e9072d8fa346a1469adf72 AUX quake2-icculus-0.16.1-gentoo-paths.patch 7688 RMD160 db521205c1d787fb31262d1710a57b7da50194a9 SHA1 dcf87cd07cade4b31251a63834819c131cfb81c2 SHA256 22d47f76fe1f06028088d2b7d9b1bc0bf1c91c559149859373af29f467ed2ea9 +AUX quake2-icculus-0.16.1-no-asm-io.patch 513 RMD160 0ae685e8f5d02511013b6f5b9106e11c024cc2a9 SHA1 53651b2175b9e547e8f01215bf9e6f94f3cee539 SHA256 05a648b32ce0c260046706ee2f4c6f49a0e7049ed07cd02fd895f6fd83556012 AUX quake2.xpm 1234 RMD160 4afa56af8446c288b5779cf7e2c0b8dfe98e9bba SHA1 7adcc4c3242ea6468c259d181e9cd251ce1fd570 SHA256 0a5232384c56ccead145345a30e4ed7004bf36fe7656d43c46f1bed34d8fc2a9 DIST maxpak.pak 3282742 RMD160 6b5223fee63dbb2c886e3c1e39d9e157d65f589f SHA1 ecafe118f20b96c7ba74842839702fde6965d640 SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770 DIST quake2-r0.16.1.tar.gz 1525384 RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 SHA1 9226acadc896ddc9924c6b7f9b71857078af5dba SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642 DIST roguesrc320.shar.Z 626769 RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba SHA1 7c5cadde75f5353622552cd28501ce60ac83dca2 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919 DIST xatrixsrc320.shar.Z 455917 RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 SHA1 ec67b6d2be623dd344c100869fc48bcbadea927a SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589 -EBUILD quake2-icculus-0.16.1-r1.ebuild 5557 RMD160 373e4b9c7fcafc569b5c8b56a606440898c53ad2 SHA1 516f081011cffde1b7092fdee5240fd58d944434 SHA256 6ebfb2ed5607ab83c00c72e2dbeaae022024f5e8479642aef9b841d08d5b4036 +EBUILD quake2-icculus-0.16.1-r1.ebuild 5607 RMD160 bcb388d5251ee5fe3239a7f855a585ac68ca441f SHA1 e524263e4cc12cee1bb3aae52d0eddcc851a16eb SHA256 03b74e9fb2f453c5a425a61c20428eaf6f04bc1efe3803150ef62205d5abaaf3 EBUILD quake2-icculus-0.16.1.ebuild 4844 RMD160 b5814a4298168d41c2ed8e6ed4143fc906fe69a5 SHA1 914099325450714f38c89b4d7d46e5cae29cb6e9 SHA256 711dc6ce5ad5e0baf71879d3739523c662c1f99a68f91e1dc23606206804a1ae -MISC ChangeLog 5514 RMD160 14b9115ff389da18f97b5550954ef8c9b668e137 SHA1 00b31ff04ecfb0d2c1a4c447652c1e99b005f698 SHA256 f6eebe057424798d7ed241817391dcfc94b101ce6cf8049442dcb700aeb62966 +MISC ChangeLog 5700 RMD160 fc21a9fb1364c0f7907a368ccaf25d563ffb9db7 SHA1 c56d7a1386e6e82e1955a9d73b4e3bb80813ec77 SHA256 430c9c477003f5ca650fbb046190287b950157e9474a48a9cd5f37303d50a991 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHtOWfkT4lNIS36YERAk4gAJ95qr9EkvipjOq9+ZCFuiDXdE0IbQCgg/Nb -HvpKMnDTZyCE1/3qMfq/9iQ= -=P3cG +iD8DBQFHujK0j9hvisErhMIRAh5XAJ4qDIKPn83oB+uO96YcxuJBTTjh/wCgxxb2 +ATXtzHixy+PIT+NPLygxYxo= +=mhWL -----END PGP SIGNATURE----- diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch new file mode 100644 index 000000000000..d94925b83e4b --- /dev/null +++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/193107 + +asm/io.h does not exist with sanitized kernel headers, nor do these source +files actually need the header, so punt it + +--- src/linux/rw_in_aa.c ++++ src/linux/rw_in_aa.c +@@ -46,7 +46,6 @@ + #include <sys/mman.h>
+
+ #if defined (__linux__)
+-#include <asm/io.h>
+ #include <sys/vt.h>
+ #endif
+
+--- src/linux/rw_aa.c ++++ src/linux/rw_aa.c +@@ -63,7 +63,6 @@ + #include <dlfcn.h>
+ #if defined (__linux__)
+ #include <sys/vt.h>
+-#include <asm/io.h>
+ #endif
+ #include <aalib.h>
+
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild index 42ba607cde79..cfd3a96a02d1 100644 --- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild +++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.9 2008/02/15 01:06:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.10 2008/02/19 01:36:46 vapier Exp $ inherit eutils toolchain-funcs games @@ -67,6 +67,7 @@ src_unpack() { sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die epatch "${FILESDIR}"/${P}-amd64.patch # make sure this is still needed in future versions epatch "${FILESDIR}"/${P}-gentoo-paths.patch + epatch "${FILESDIR}"/${P}-no-asm-io.patch #193107 # Now we deal with the silly rogue / xatrix addons ... this is ugly :/ ln -s $(type -P echo) "${T}"/more |