From 014e7cb261c108e1b5f02db7c2342cbf0e57fe3b Mon Sep 17 00:00:00 2001 From: Niklas Nille Ã…kerström Date: Tue, 11 May 2010 22:22:59 +0200 Subject: games/chromium: Updated for version 0.9.13.3 --- games/chromium/README | 6 +- games/chromium/chromium.6.gz | Bin 1122 -> 0 bytes games/chromium/chromium.SlackBuild | 73 +- games/chromium/chromium.desktop | 10 - games/chromium/chromium.info | 14 +- games/chromium/chromium.xpm | 1049 -------------------------- games/chromium/doinst.sh | 1 + games/chromium/patches/05_wall_flag.diff | 15 - games/chromium/patches/10_buildfixes.dpatch | 79 -- games/chromium/patches/15_soundfix.dpatch | 18 - games/chromium/patches/20_badcode.dpatch | 33 - games/chromium/patches/25_gcc4.dpatch | 53 -- games/chromium/patches/30_new_openAL.dpatch | 83 -- games/chromium/patches/35_powerup_crash.diff | 19 - games/chromium/patches/40_sdl_quit.diff | 13 - games/chromium/slack-desc | 10 +- 16 files changed, 66 insertions(+), 1410 deletions(-) delete mode 100644 games/chromium/chromium.6.gz delete mode 100644 games/chromium/chromium.desktop delete mode 100644 games/chromium/chromium.xpm delete mode 100644 games/chromium/patches/05_wall_flag.diff delete mode 100644 games/chromium/patches/10_buildfixes.dpatch delete mode 100644 games/chromium/patches/15_soundfix.dpatch delete mode 100644 games/chromium/patches/20_badcode.dpatch delete mode 100644 games/chromium/patches/25_gcc4.dpatch delete mode 100644 games/chromium/patches/30_new_openAL.dpatch delete mode 100644 games/chromium/patches/35_powerup_crash.diff delete mode 100644 games/chromium/patches/40_sdl_quit.diff (limited to 'games') diff --git a/games/chromium/README b/games/chromium/README index 55600e56f4..f50b6a0945 100644 --- a/games/chromium/README +++ b/games/chromium/README @@ -1,4 +1,4 @@ -Chromium B.S.U. is a fast paced, arcade-style, top-scrolling space shooter. +Chromium B.S.U. is a fast paced, arcade-style, top-scrolling shooter. +It uses OpenGL for graphics, and OpenAL for sound effects. -Requires OpenAL and libglpng and optionally SMPEG for MP3 background music. -These are available at SlackBuilds.org. +Chromium requires OpenAL, libglpng and ftgl, available at SlackBuilds.org diff --git a/games/chromium/chromium.6.gz b/games/chromium/chromium.6.gz deleted file mode 100644 index a35256ee53..0000000000 Binary files a/games/chromium/chromium.6.gz and /dev/null differ diff --git a/games/chromium/chromium.SlackBuild b/games/chromium/chromium.SlackBuild index 906b88c0ae..c8a63d2680 100644 --- a/games/chromium/chromium.SlackBuild +++ b/games/chromium/chromium.SlackBuild @@ -1,10 +1,31 @@ #!/bin/sh -# Slackware build script for Chromium B.S.U. -# Written by Erik Hanson erik@slackbuilds.org +# Slackware build script for chromium +# +# Copyright 2007 Niklas "Nille" Åkerström +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified by Erik Hanson PRGNAM=chromium -VERSION=0.9.12 +VERSION=0.9.13.3 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -18,40 +39,46 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . - -# Patch the hell out of this old dog, courtesy debian. -for patch in $CWD/patches/* ; do patch -p1 < $patch || exit 1 ; done +chmod -R a-s,u+rw,go+r-w . CFLAGS="$SLKCFLAGS" \ -./configure --disable-setup || exit 1 +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-glut \ + --disable-openal + +# --enable doesn't work, use --disable instead. +# Use --disable-sdl to use glut instead of SDL. +# --disable-sdl --disable-sdlmixer -make || exit 1 +make +make install-strip DESTDIR=$PKG -# Manual installation -mkdir -p $PKG/usr/{games,share/{games/chromium,pixmaps,applications},man/man6} -/usr/bin/ginstall -s -m 755 bin/chromium $PKG/usr/games -/usr/bin/ginstall -m 644 $CWD/chromium.xpm $PKG/usr/share/pixmaps -/usr/bin/ginstall -m 644 $CWD/chromium.6.gz $PKG/usr/man/man6 -cp -a data/fonts data/png data/wav $PKG/usr/share/games/chromium/ +gzip -9 $PKG/usr/man/man?/*.? -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html $PKG/install -cp -a AUTHORS CHANGES INSTALL LICENSE README README.vorbis \ - $PKG/usr/doc/$PRGNAM-$VERSION -cp -a data/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/html +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS COPYING NEWS README* TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/chromium.desktop > $PKG/usr/share/applications/chromium.desktop -cat $CWD/doinst.sh > $PKG/install/doinst.sh + +mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/games/chromium/chromium.desktop b/games/chromium/chromium.desktop deleted file mode 100644 index 0e12f3389e..0000000000 --- a/games/chromium/chromium.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Chromium -Comment=Scrolling space shooter -Exec=chromium -Icon=chromium -Terminal=false -Type=Application -Categories=Application;Game; -StartupNotify=false diff --git a/games/chromium/chromium.info b/games/chromium/chromium.info index 6606577676..f3c7653cb6 100644 --- a/games/chromium/chromium.info +++ b/games/chromium/chromium.info @@ -1,8 +1,8 @@ PRGNAM="chromium" -VERSION="0.9.12" -HOMEPAGE="http://www.reptilelabour.com/software/chromium/" -DOWNLOAD="http://slackbuilds.org/sources/12.0/chromium-0.9.12.tar.bz2" -MD5SUM="e788db7aeec1e0407474da1ad10bb504" -MAINTAINER="Erik Hanson" -EMAIL="erik@slackbuilds.org" -APPROVED="David Somero" +VERSION="0.9.13.3" +HOMEPAGE="http://chromium-bsu.sourceforge.net" +DOWNLOAD="http://downloads.sourceforge.net/chromium-bsu/chromium-0.9.13.3.tar.gz" +MD5SUM="877a0412ae3839f5c1174922a655b405" +MAINTAINER="Niklas 'Nille' Åkerström" +EMAIL="nille.kungen[AT]gmail.com" +APPROVED="Erik Hanson" diff --git a/games/chromium/chromium.xpm b/games/chromium/chromium.xpm deleted file mode 100644 index 0877018416..0000000000 --- a/games/chromium/chromium.xpm +++ /dev/null @@ -1,1049 +0,0 @@ -/* XPM */ -static char *chromium[]={ -"32 32 1014 2", -"fk c #080400", -"ff c #0d0701", -"fP c #0d0a03", -"fK c #0f0904", -"fJ c #17140d", -"fQ c #1a1812", -"gc c #1b170a", -"gh c #1e1c0f", -"fL c #1f1810", -"hk c #202218", -"fO c #211b0e", -"fl c #221f16", -"hP c #272821", -"hQ c #292b20", -"jL c #2b281e", -"hl c #2e3028", -"cJ c #2f2a27", -"dp c #2f3128", -"fn c #30312b", -"gb c #353126", -"iI c #363729", -"jI c #37342d", -"hf c #383222", -"fe c #39332b", -"cU c #3a392c", -"bv c #3b2957", -"gd c #3d3729", -"ad c #3e2e5f", -"gL c #3e382a", -"hG c #3e3e34", -"jg c #3f3e29", -"gi c #3f3e31", -"jo c #42354a", -"kb c #423a45", -"au c #432d5e", -"do c #434237", -"iM c #43432b", -"jd c #434333", -"hS c #444340", -"eo c #44443c", -"dJ c #45413b", -"ke c #47433f", -"jM c #484444", -"iL c #484a2e", -"gg c #494637", -"iO c #49463f", -"dV c #494a47", -"fg c #4a4236", -"iK c #4b4d34", -"iG c #4b4d44", -"ha c #4c4c42", -"hR c #4d4e46", -"m1 c #4e4078", -"nu c #4e427d", -"ii c #4e4c42", -"ed c #4f4b44", -"gK c #504a3f", -"hH c #504d42", -"mv c #513f7f", -"mw c #513f88", -"jJ c #514f42", -".D c #523e96", -"m2 c #524388", -"ce c #524b43", -"jh c #525043", -"ic c #525144", -"fR c #525146", -"ia c #525348", -"nt c #55438e", -"nZ c #554692", -"nv c #55478e", -"he c #554f40", -"eU c #55554f", -"il c #555553", -"kd c #565150", -"cV c #56584b", -"fI c #57554b", -"m0 c #584393", -".C c #5844a0", -"je c #585843", -"ji c #595653", -"ih c #595747", -"mx c #5a449c", -"dU c #5a5a51", -".6 c #5b42ad", -"l2 c #5b4598", -".7 c #5b46a8", -"m3 c #5c48a2", -"ib c #5c5c50", -"fS c #5c5d57", -"mZ c #5d449e", -"l1 c #5d469b", -"kf c #5d5755", -"iN c #5d5c4b", -"j7 c #5e5461", -"av c #5f4983", -"ig c #5f5d48", -"mu c #6047a3", -"eJ c #605c55", -"jK c #605f4f", -"mt c #6146a6", -"ns c #614aa7", -"nw c #614da7", -"aY c #614f66", -"ae c #615180", -".5 c #6247ba", -"l3 c #624ba0", -"jT c #625471", -"hj c #636457", -"#A c #644abf", -".B c #654db1", -"gF c #65665e", -"l0 c #6649b9", -"#B c #664eb9", -"fd c #666359", -"ij c #66645f", -"eV c #66686b", -"#z c #674bc7", -"nY c #6752b7", -"bZ c #675876", -"iJ c #696956", -"mY c #6a4db3", -"bA c #6a4fb8", -"b0 c #6a578c", -"bI c #6a606d", -"cK c #6a635b", -"lZ c #6b4ab8", -"b5 c #6b50bc", -"im c #6b6b66", -"iS c #6b6b67", -"ms c #6c4cb3", -"lw c #6c52b4", -"nx c #6c53bf", -"jS c #6c6474", -"hL c #6c6756", -"ep c #6c6d6d", -"gR c #6c6e6b", -"nU c #6e4dc6", -"my c #6e54be", -"m4 c #6e54c4", -"lx c #6e55ad", -"hO c #6e6d60", -"gj c #6e6e62", -"nT c #704fc2", -"cf c #70675f", -"cc c #706a6b", -"jb c #70706a", -".b c #714fce", -".c c #7151cd", -"lv c #7155c0", -"nr c #7155c2", -"l4 c #7158b4", -"dq c #71716d", -"Qt c #724fcb", -".a c #724fcf", -".y c #7255d0", -"a6 c #7258c4", -".A c #7258c5", -"kg c #726b70", -"jl c #727071", -"nV c #7352d2", -"ny c #7354cf", -".4 c #7356cf", -"#7 c #7359c8", -"kn c #735f95", -"kL c #736a74", -"lY c #7451c0", -"#y c #7456d5", -"#6 c #7457d3", -"fj c #746e62", -"g# c #74736c", -".# c #7551d0", -".d c #7558d0", -"dd c #75706a", -"#5 c #7657da", -"nX c #765bd3", -"ly c #765fb0", -"iV c #766c73", -"jN c #767176", -"i# c #76776e", -"gk c #767770", -".E c #774fde", -"lu c #7755da", -".z c #775cd0", -"aB c #775dcc", -"fM c #777062", -"fm c #77756a", -"in c #777671", -"nz c #7854d8", -"nW c #7859db", -"kC c #786a86", -"b4 c #795ece", -"cz c #795fcc", -"j9 c #79717c", -".x c #7a5bdb", -"lt c #7b58d7", -"cn c #7b766c", -"jG c #7b777a", -"h# c #7b7b73", -"i1 c #7c63c3", -"km c #7c6d8d", -"cr c #7c777a", -"cW c #7c7d75", -"gQ c #7c7e74", -"nS c #7d5ccd", -"#4 c #7d5dde", -"gN c #7d7b6d", -"iH c #7d7f73", -"nn c #7e5bd6", -"bz c #7e61d6", -"bN c #7e7674", -"mr c #7f5dce", -"nq c #7f5fd8", -"aI c #7f6e92", -"bs c #7f7175", -".F c #8058e6", -".e c #8064db", -".8 c #8155ed", -"mX c #815fd1", -"gJ c #817b6e", -"hK c #817c6c", -"gI c #817d70", -".9 c #8256ed", -"lX c #825dd1", -"no c #825fdc", -"cy c #8267d2", -"ju c #8267d4", -"a0 c #826f91", -"jp c #82709d", -"j6 c #82729c", -"bQ c #827975", -"bO c #827976", -"kK c #827981", -"bd c #827a8a", -"gM c #827f70", -"nA c #835ce4", -".H c #835de5", -"ls c #835ed9", -"aA c #8365e1", -"ba c #836e98", -"bR c #837b79", -"iP c #837e80", -"jE c #838084", -"jf c #83836b", -".G c #845de8", -"m5 c #8460e8", -"mz c #8465e0", -".3 c #8466e0", -"iv c #846bd0", -"be c #847d8d", -"j8 c #847e7c", -"fH c #84837b", -"jc c #84847b", -"#x c #8567df", -"a5 c #8568e0", -".K c #856add", -"aK c #857896", -"ge c #857f6f", -"bK c #857f82", -"jD c #858080", -"cX c #858184", -"j# c #85847f", -"fo c #858688", -"k0 c #8661ef", -"nm c #8663dd", -"k3 c #866acf", -"bH c #86778f", -"bP c #867d7a", -"gO c #868679", -"jv c #8761dc", -".I c #8766e6", -"nP c #8768ea", -".J c #8769e1", -"cm c #878177", -"jH c #878382", -"ga c #87857b", -"np c #8864e3", -"k2 c #886adc", -"#3 c #886bdd", -"l5 c #886dd5", -"k4 c #886fc4", -"hM c #888676", -"j0 c #8968ea", -"j1 c #8a66e4", -"az c #8a6bed", -"kD c #8a7c9b", -"en c #8a887c", -"iE c #8a8a86", -"kZ c #8b66ef", -"nR c #8b6be2", -"k1 c #8b6be7", -"lz c #8b73c7", -"ac c #8b78b4", -"jA c #8b7ba0", -"cs c #8b8196", -"ku c #8c68f5", -"nQ c #8c6dea", -"a1 c #8c77b0", -"ld c #8c7e99", -"le c #8c8096", -"aL c #8c819e", -"kJ c #8c838f", -"jR c #8c8591", -"dT c #8c897d", -"m6 c #8d67f2", -".w c #8d6eef", -"kI c #8d8294", -"gf c #8d8777", -"ik c #8d8d8b", -"cp c #8d8e7e", -"#C c #8e5ffb", -"nK c #8e6fd2", -"b3 c #8e73e1", -"kB c #8e7fa3", -"bY c #8e828e", -"kc c #8e868b", -"cd c #8e8983", -"id c #8e8c7a", -"lr c #8f69e2", -"ay c #8f72eb", -"bb c #8f8197", -"kM c #8f8594", -"bS c #8f8988", -"bL c #8f898a", -"nB c #9066f0", -"kv c #906ded", -"i8 c #908895", -"eT c #908e81", -"#. c #9165f6", -"## c #916af2", -"mA c #916ef3", -"i0 c #9174df", -"cx c #9176dd", -"io c #918c8d", -"gH c #918d82", -"hg c #918e7f", -"i9 c #918e8d", -"gl c #919392", -"lW c #926be7", -"mU c #926dee", -".2 c #9272ea", -".f c #9276eb", -"iu c #9277e0", -"ja c #92918c", -"#E c #9364f2", -"by c #9376ed", -"jn c #938c90", -"bW c #938e8b", -"kY c #946df0", -"mT c #946fee", -"c5 c #9475e7", -"a4 c #9476f4", -"fc c #94938b", -"#D c #9566fa", -"mW c #9570ec", -"nO c #9574f6", -"nL c #9576de", -"h1 c #957aec", -"bw c #957dcb", -"bX c #958e8e", -"mq c #9670ec", -"mV c #9670f1", -"#w c #9679ea", -"k5 c #967fc8", -"dK c #969188", -"i2 c #976eed", -"kt c #9772fb", -"#a c #9775f0", -"nl c #9776f0", -"jt c #9778ee", -"ax c #977be1", -"iT c #97958b", -"#b c #987beb", -"de c #989188", -"m7 c #9970f8", -"nj c #997af6", -"#c c #997fe5", -"iU c #99948c", -"j. c #999793", -"jw c #9a73f0", -"bG c #9a86ad", -"i7 c #9a8db0", -"fN c #9a9484", -"mB c #9b75fc", -"jZ c #9b78fa", -"c4 c #9b7ce9", -"l6 c #9b7cf1", -"hm c #9b9b9a", -"#8 c #9c6bff", -"lq c #9c74f0", -"kx c #9c7dec", -"hv c #9c7ef3", -"#2 c #9c80e2", -"#u c #9c80e6", -"lf c #9c8fa7", -"k. c #9c93a5", -"hb c #9c9a8f", -"cq c #9c9c92", -"j2 c #9d78f7", -"#G c #9d7ced", -"nk c #9d7df8", -".L c #9d81f0", -"bu c #9d8da3", -"jB c #9d959b", -"hd c #9d9789", -"#9 c #9e6cfd", -"kX c #9e78f3", -"iW c #9e8faf", -"ip c #9e94a5", -"bJ c #9e969e", -"ee c #9e9a91", -"iF c #9ea096", -"nC c #9f70f8", -"b6 c #9f73fa", -"kw c #9f7cf6", -"#v c #9f83ec", -"ct c #9f8fb8", -"bM c #9f9997", -"bB c #a072fc", -"i3 c #a078f1", -"a2 c #a086de", -"kz c #a088d2", -"cT c #a09b90", -"g1 c #a17cf7", -"ks c #a17cfd", -"mS c #a17ff8", -".g c #a180f7", -".t c #a182f9", -"nN c #a182fd", -"nM c #a183f4", -"a3 c #a183f6", -"h0 c #a185f1", -"lA c #a186e5", -"ie c #a1a08b", -"nJ c #a280e3", -"ni c #a283fb", -"ne c #a285dd", -"dn c #a29e93", -"jm c #a29e9c", -"mp c #a37afc", -"mC c #a37dfe", -"it c #a388ee", -"aH c #a38dc4", -"if c #a3a18b", -"hN c #a3a193", -"a# c #a47cf0", -"dz c #a481f8", -".v c #a484ff", -"aw c #a48dd9", -"k6 c #a48fd4", -"iD c #a49dae", -"hi c #a4a496", -"aC c #a573ff", -"#F c #a57cfa", -"fz c #a584f0", -"iZ c #a589f4", -"cw c #a58be8", -"fh c #a59d8f", -"cL c #a59d94", -"hJ c #a5a092", -"em c #a5a195", -"gP c #a5a599", -"m8 c #a67bf7", -"mn c #a681fc", -"dA c #a682f8", -"c3 c #a687ec", -"b2 c #a68bef", -"a7 c #a776ff", -"lV c #a77efc", -"mo c #a77ffc", -".s c #a786f7", -"l7 c #a786fe", -".u c #a787ff", -"bx c #a78af7", -"dS c #a7a397", -"kW c #a881f7", -".h c #a885fc", -"jY c #a886ff", -".j c #a887f7", -"nf c #a88ce9", -"#H c #a88cee", -"b1 c #a890de", -"kH c #a89dae", -"nD c #a979fd", -"a. c #a97afc", -"gv c #a980fd", -".i c #a987fc", -"cb c #a99db0", -"iR c #a9a9ac", -"aD c #aa79ff", -"iw c #aa7ffe", -"b7 c #aa82fb", -"j3 c #aa87f6", -"f3 c #aa88f7", -"e6 c #aa8af5", -"js c #aa8afb", -".1 c #aa8bfb", -"iC c #aaa0ba", -"hI c #aaa799", -"kr c #ab87fd", -"d6 c #ab8bfb", -"mR c #ab8bff", -"#d c #ab91f2", -"lc c #ab9bbd", -"d5 c #ac83fe", -"mm c #ac8bfd", -".m c #ac8cf5", -"mQ c #ac8efd", -"ky c #ac91ed", -"dL c #aca49b", -"hF c #acaca5", -"cA c #ad84fe", -"lp c #ad86fd", -"c6 c #ad87fc", -"i4 c #ad89f6", -".M c #ad8ffa", -"#1 c #ad94e9", -"cg c #ada399", -"kh c #ada5b3", -"aE c #ae81fb", -"jx c #ae8afe", -"eA c #ae8efb", -"hu c #ae8ffb", -"#I c #ae97ec", -"hT c #aeaaac", -"l8 c #af8eff", -"eR c #afaa9d", -"eS c #afac9f", -"nE c #b081ff", -"ez c #b083ff", -"bC c #b084fd", -"nG c #b085fe", -"mD c #b089fa", -"dy c #b08cfa", -".0 c #b090ff", -".n c #b091f9", -".N c #b091fb", -"nh c #b092ff", -"mP c #b094fe", -"hZ c #b095f6", -"m9 c #b185fc", -".r c #b190fb", -"#J c #b19be8", -"a8 c #b281ff", -"nF c #b283ff", -"nI c #b28ef7", -"g0 c #b28ffd", -"nd c #b293ea", -"lB c #b295fa", -"at c #b29bcd", -"k7 c #b29ce1", -"kA c #b2a0d5", -"cl c #b2aa9f", -"eM c #b2aca0", -"cI c #b2adae", -"h2 c #b389ff", -"nH c #b38cfd", -"ix c #b38dfc", -"kq c #b391fb", -"dB c #b392fa", -"#t c #b395fb", -"ng c #b396fb", -"c2 c #b397f0", -"#0 c #b39ae9", -"k8 c #b39ddf", -"ca c #b3a3c0", -"bc c #b3a8b5", -"hw c #b48bff", -"lU c #b48dff", -".Y c #b496fb", -".Z c #b496ff", -"#Z c #b499e8", -"gG c #b4b3a9", -"e5 c #b586ff", -"jX c #b594ff", -"aG c #b597e6", -"cu c #b5a1dd", -"eO c #b5ab9d", -"fi c #b5ae9e", -"cS c #b5afa3", -"dm c #b5b1a5", -"hh c #b5b3a5", -"cB c #b68ffe", -"fA c #b698f4", -"#e c #b69bf6", -"mL c #b69ce7", -"jU c #b6a3d2", -"aJ c #b6a9c3", -"ck c #b6ada2", -"cR c #b6aea2", -"dR c #b6b0a3", -"fy c #b788ff", -"lT c #b793ff", -".k c #b796ff", -"jy c #b797ff", -"lS c #b798fe", -"ml c #b799ff", -"cv c #b79eed", -"eN c #b7aea2", -"gu c #b890ff", -"g2 c #b891ff", -"kV c #b895fa", -"lo c #b895ff", -".q c #b896ff", -".O c #b899fd", -"d7 c #b89afb", -"e7 c #b89cf8", -"is c #b89ef6", -"ko c #b89fe6", -"ej c #b8afa0", -"co c #b8b6aa", -"i. c #b8b8b5", -"a9 c #b98cfb", -"d4 c #b991ff", -"gw c #b995fe", -"eB c #b99cfa", -"iY c #b99efc", -"j5 c #b9a1ea", -"dl c #b9b2a5", -"eL c #b9b2a8", -"eQ c #b9b3a5", -"el c #b9b4a7", -"ec c #b9b5b4", -"gE c #b9b7b7", -"n. c #ba8fff", -"mE c #ba93fb", -"iy c #ba98ef", -".l c #ba99fd", -"i5 c #ba9bf6", -"lC c #ba9dfe", -"mM c #baa1f1", -"jz c #baa3eb", -"dQ c #bab2a5", -"bD c #bb93fc", -"aF c #bb93fd", -"h3 c #bb95fc", -"c7 c #bb98ff", -".p c #bb9bff", -"f4 c #bb9cf9", -"jr c #bb9dfe", -"mO c #bba1ff", -"ab c #bba2ee", -"eK c #bbb7ae", -"f2 c #bc91ff", -"na c #bc95ff", -"b8 c #bc98fe", -"dx c #bc99fc", -"b# c #bc9de0", -"ch c #bcb0a5", -"ef c #bcb6ac", -"ey c #bd92ff", -"n# c #bd93ff", -"nb c #bd9afe", -".o c #bd9cff", -".Q c #bd9ffd", -".X c #bda0fc", -"ht c #bda0fe", -"mk c #bda2ff", -"ek c #bdb5a8", -"eP c #bdb6a6", -"dI c #bdbab9", -"hx c #be99ff", -"l9 c #be9bfd", -"j4 c #be9ffc", -"kp c #bea0f7", -"#s c #bea0ff", -".S c #bea1fc", -"ci c #beb2a6", -"jj c #beb9c0", -"nc c #bf9dfb", -"k9 c #bfabdf", -"cj c #bfb3a6", -"dg c #bfb6ab", -"hc c #bfbbaf", -".P c #c0a2fe", -"mN c #c0a7fd", -"mj c #c0a7ff", -"dP c #c0b7a9", -"dk c #c0b8ab", -"df c #c0b8ae", -"cC c #c19efd", -"aa c #c1a0f9", -"kU c #c1a2fb", -"jW c #c1a3fe", -"mK c #c1a5f0", -"lR c #c1a6fe", -"c1 c #c1a7f1", -"#h c #c1a7f3", -"#L c #c1abed", -"kE c #c1b3d0", -"e4 c #c296ff", -"gZ c #c2a1ff", -".T c #c2a5fe", -"iz c #c2a7eb", -"#q c #c2a7fb", -"hY c #c2a8fb", -"fx c #c397ff", -"mF c #c39dff", -"g3 c #c39eff", -"#r c #c3a5ff", -"dC c #c3a6fa", -"#f c #c3a8fb", -".W c #c4a7ff", -"lm c #c4aafd", -"aZ c #c4b3c7", -"jC c #c4c2b7", -"b. c #c59efd", -"d3 c #c5a0ff", -"gt c #c5a2ff", -"m. c #c5a4fb", -"br c #c5b7c2", -"bT c #c5c0bf", -"gx c #c6a5fe", -"#Y c #c6aafa", -"jV c #c6adef", -"#K c #c6b0f6", -"eI c #c6c2c2", -".V c #c7aaff", -"bF c #c7abe7", -"fB c #c7aef7", -"e8 c #c7aff9", -"iq c #c7b7dd", -"ei c #c7bdaf", -"dM c #c7bfb4", -"ex c #c8a1ff", -"f1 c #c8a2ff", -"mG c #c8a3ff", -"mH c #c8a6ff", -"ln c #c8a7ff", -"dw c #c8a9fd", -"lD c #c8abf8", -"jq c #c8aef9", -"mi c #c8b1ff", -"ir c #c8b2f3", -"dj c #c8bfb0", -"bl c #c8c1cb", -"bE c #c9a6fd", -"mI c #c9a9fd", -".U c #c9abff", -"cD c #c9acf8", -"mJ c #c9acfa", -"#p c #c9affb", -"d8 c #c9affc", -"eC c #c9b1fc", -"eg c #c9c1b6", -"hy c #caa9fb", -"c8 c #caabff", -".R c #caadff", -"lQ c #cab2ff", -"bh c #cac3cb", -"kT c #cbb0fd", -"mf c #cbb5ef", -"iX c #cbb5f5", -"dO c #cbc1b3", -"eh c #cbc1b5", -"bm c #cbc3cf", -"b9 c #ccabfc", -"#g c #ccb1fc", -"#l c #ccb2fc", -"mg c #ccb7f7", -"c# c #ccb8e1", -"bj c #ccc5cc", -"bi c #ccc5ce", -"h4 c #cdabfa", -"m# c #cdacff", -"g4 c #cdadfc", -"f5 c #cdb2fb", -"hs c #cdb2fe", -"mh c #cdb6fe", -"ll c #cdb7f7", -"lP c #cdb9ff", -"af c #cdbdec", -"bk c #cdc7ce", -"e3 c #cea4ff", -"lE c #ceb3f7", -"iB c #cec0e2", -"fw c #cfa6ff", -"#X c #cfb2ff", -"h5 c #cfb4ef", -"#i c #cfb5fc", -"#N c #cfb8f9", -"me c #cfb9f3", -"gY c #d0b3ff", -"#k c #d0b7fe", -"#m c #d0b7ff", -"as c #d0b9f1", -"hX c #d0bafc", -"lg c #d0c2df", -"cM c #d0c5bb", -"dN c #d0c6ba", -"d2 c #d1b0ff", -"gy c #d1b4fe", -"c0 c #d1bdf6", -"bt c #d1c3c9", -"dh c #d1c7bb", -"bV c #d1cbc8", -"g. c #d1cfce", -"dv c #d2b8fc", -"#o c #d2b9ff", -"dD c #d2bafb", -"lO c #d2befe", -"ew c #d3b0fe", -"ma c #d3b3ff", -"#W c #d3bbff", -"i6 c #d3bdf3", -"#V c #d3befa", -"aX c #d3c0df", -"ag c #d3c4ef", -"mb c #d4b7ff", -"mc c #d4b9fd", -"lF c #d4bafd", -"c9 c #d4baff", -"md c #d4bbfa", -"#n c #d4bbff", -"iA c #d4c0ee", -"kl c #d4c9e5", -"fT c #d4d5d8", -"gs c #d5b5ff", -"hz c #d5b9f6", -"cE c #d5bff4", -"fC c #d5c0f8", -"e9 c #d5c2f9", -"cY c #d5cbe1", -"dW c #d5d5d7", -"f0 c #d6b4fd", -"c. c #d6bdf5", -"#M c #d6c0fb", -"d9 c #d6c0fd", -"lk c #d6c3fa", -"lK c #d6c5ed", -"kN c #d6cbe3", -"cQ c #d6cdc1", -"#j c #d7beff", -"eD c #d7c3fd", -"lJ c #d7c4f1", -"lL c #d7c6ef", -"kR c #d7c6f0", -"e2 c #d8b6fe", -"g5 c #d8bef8", -"lN c #d8c5fd", -"cO c #d8ccbf", -"fv c #d9b7fe", -"h6 c #d9c3ee", -"du c #d9c3f6", -"f6 c #d9c3fa", -"d1 c #dabffb", -"hr c #dac2ff", -"l. c #dac4f4", -"#P c #dac5fc", -"#U c #dac5fd", -"lM c #dac8f8", -"cP c #dacec0", -"cN c #dacec2", -"lG c #dbc1fe", -"lI c #dbc5f8", -"kS c #dbc7fc", -"li c #dbcbfa", -"dr c #dbd7db", -"ev c #dcc1f8", -"gz c #dcc4fd", -"hW c #dccbf9", -"kQ c #dccef3", -"hV c #dccfee", -"dc c #dcd8d7", -"lH c #ddc5fd", -"l# c #ddc8f7", -"#Q c #ddc8fb", -"#S c #ddc8ff", -"d. c #ddcafb", -"gX c #dec5fe", -"ar c #dec7fe", -"#R c #dec9fd", -"lb c #deccf2", -"ap c #decdf7", -"cZ c #decef6", -"di c #ded3c5", -"#T c #dfcaff", -"dE c #dfcdfa", -"e. c #dfcefa", -"ai c #dfcff8", -"e1 c #e0c4f9", -"gr c #e0c5fc", -"aq c #e0cdff", -"lj c #e0cefe", -"kG c #e0d2ef", -"eE c #e0d2f9", -"hU c #e0d7e7", -"jO c #e0d9e3", -"hA c #e1cbf4", -"d0 c #e1ccf8", -"#O c #e1ccff", -"cF c #e1d1f7", -"ao c #e1d2fa", -"fZ c #e2c7fa", -"fu c #e3c7fa", -"al c #e3d4f8", -"bf c #e3dcea", -"e0 c #e4cef2", -"dt c #e4d3f5", -"fG c #e4e4e3", -"g6 c #e5d1f8", -"ah c #e5d5fa", -"f. c #e5d6fb", -"kP c #e5d7f9", -"jQ c #e5deeb", -"la c #e6d3f8", -"aW c #e6d4f6", -"hq c #e6d4fe", -"f7 c #e6d6fb", -"bn c #e6dfea", -"gq c #e7d3f7", -"gA c #e7d5fb", -"lh c #e7d7f8", -"an c #e7d8fe", -"gW c #e8d4f8", -"am c #e8d8fc", -"cG c #e8daf6", -"aN c #e8dcf4", -"eu c #e9d3f9", -"h7 c #e9d8f7", -"kF c #e9daf4", -"d# c #e9dafb", -"kk c #e9def5", -"ft c #ead4f6", -"hB c #ead8f6", -"ak c #eadaf9", -"bq c #eadcee", -"aM c #eadff6", -"h. c #eae9e9", -"gV c #ebdbf7", -"aV c #ebdcfc", -"kj c #ebe1fa", -"dY c #ebe2f3", -"fY c #ecd7f9", -"et c #ecdcf5", -"aj c #ecdcfd", -"dZ c #ecddf9", -"h8 c #ecdef9", -"kO c #ecdffe", -"fW c #ece3f3", -"jk c #eceaf1", -"g7 c #edddf9", -"da c #ede1fa", -"dF c #ede1fe", -"jF c #edeaef", -"fb c #edebea", -"hE c #edeceb", -"gB c #eee0fa", -"f8 c #eee1fb", -"e# c #eee1fe", -"ds c #eee3f7", -"fD c #eee3fc", -"eF c #eee3fe", -"aP c #eee4f9", -"aO c #eee4fa", -"go c #eee5f5", -"hp c #efe0fc", -"f# c #efe4fd", -"k# c #efe6f5", -"bg c #efe9f4", -"iQ c #efedf3", -"eq c #efeff3", -"eZ c #f0e0f8", -"jP c #f0e8fa", -"fs c #f1e1f7", -"hn c #f1ecf2", -"fX c #f2e3f9", -"bp c #f2e7f9", -"aU c #f2e7ff", -"es c #f2e9f6", -"h9 c #f2e9fd", -"gT c #f2eef5", -"fq c #f2f0f8", -"hC c #f3e5fc", -"ki c #f3e9ff", -"dG c #f3eaff", -"ka c #f3ebf9", -"eX c #f3f1f7", -"ho c #f4eafc", -"aT c #f4eafe", -"eY c #f4ecfa", -"ea c #f4ecff", -"dX c #f4f1f5", -"fp c #f4f4fa", -"aS c #f5eafb", -"gC c #f5eafd", -"f9 c #f5ecfe", -"eG c #f5edff", -"aQ c #f6ecfe", -"fa c #f6eeff", -"gp c #f7e9fd", -"g8 c #f7eafd", -"cH c #f7ecfb", -"gU c #f7edfc", -"db c #f7eefd", -"fE c #f7efff", -"fU c #f8f8fe", -"aR c #f9eefd", -"bo c #f9f1fd", -"fr c #f9f3fc", -"er c #f9f7fb", -"gS c #f9f8fa", -"eW c #f9fafc", -"bU c #faf5f5", -"eH c #faf6ff", -"hD c #fbf0fe", -"gD c #fbf3ff", -"gn c #fbf6fd", -"eb c #fbf7ff", -"dH c #fcf5ff", -"fV c #fcf9ff", -"g9 c #fdf5ff", -"gm c #fdfdff", -"fF c #fef9ff", -"Qt.#.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D", -".E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.0.1.2.J.J.3.4.5.6.7", -".8.9#.###a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B", -"#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#0#1#2#3#4#5#6#7", -"#8#9a.a#aaabacadaeafagahaiajakalamanaoapaqarasatauavawaxayazaAaB", -"aCaDaEaFaGaHaIaJaKaLaMaNaOaOaPaQaRaSaTaUaVaWaXaYaZa0a1a2a3a4a5a6", -"a7a8a9b.b#babbbcbdbebfbgbhbibjbkblbmbnbobpbqbrbsbtbubvbwbxbybzbA", -"bBbCbDbEbFbGbHbIbJbKbLbMbNbObPbQbRbRbSbTbUbVbWbXbYbZb0b1b2b3b4b5", -"b6b7b8b9c.c#cacbcccdcecfcgchcicjckclcmcncocpcqcrcsctcucvcwcxcycz", -"cAcBcCcDcEcFcGcHcIcJcKcLcMcNcOcPcQcRcScTcUcVcWcXcYcZc0c1c2c3c4c5", -"c6c7c8c9d.d#dadbdcdddedfdgdhdidjdkdldmdndodpdqdrdsdtdudvdwdxdydz", -"dAdBdCdDdEdFdGdHdIdJdKdLdMdNdOdPdQdRdSdTdUdVdWdXdYdZd0d1d2d3d4d5", -"d6d7d8d9e.e#eaebecedeeefegeheiejekelemeneoepeqereseteuevewexeyez", -"eAeBeCeDeEeFeGeHeIeJeKeLeMeNeOePeQeReSeTeUeVeWeXeYeZe0e1e2e3e4e5", -"e6e7e8e9f.f#faebfbfcfdfefffgfhfifjfkflfmfnfofpfqfrfsftfufvfwfxfy", -"fzfAfBfCf.fDfEfFfGfHfIfJfKfLfMfNfOfPfQfRfSfTfUfVfWfXfYfZf0f1f2ez", -"f3f4f5f6f7f8f9dHg.g#gagbgcgdgegfggghgigjgkglgmgngogpgqgrgsgtgugv", -"gwgxgygzgAgBgCgDgEgFgGgHgIgJgKgLgMgNgOgPgQgRgSgTgUgVgWgXgYgZg0g1", -"g2g3g4g5g6g7g8g9h.h#hahbhchdhehfhghhhihjhkhlhmhnhohphqhrhshthuhv", -"hwhxhyhzhAhBhChDhEhFhGhHhIhJhKhLhMhNhOhPhQhRhShThUhVhWhXhYhZh0h1", -"h2h3h4h5h6h7h8h9i.i#iaibicidieifigihiiijikiliminioipiqirisitiuiv", -"iwixiyiziAiBiCiDiEiFiGiHiIiJiKiLiMiNiOiPiQiRiSiTiUiViWiXiYiZi0i1", -"i2i3i4i5i6i7i8i9j.j#jajbjcjdjejfjgjhjijjgnjkjljmjnjojpjqjrjsjtju", -"jvjwjxjyjzjAjBjCjDjEjFjGjHjIjJjKjLjMjNjOjPjQjRjSjTjUjVjWjXjYjZj0", -"j1j2j3j4j5j6j7j8j9k.k#kakbkckdkekfkgkhkikjkkklkmknkokpkqkrksktku", -"kvkwkxkykzkAkBkCkDkEkFkGkHkIkJkKkLkMkNkOkPkQkRkSkTkUkVkWkXkYkZk0", -"k1k2k3k4k5k6k7k8k9l.l#lalblcldlelflglhliljlklllmlnlolplqlrlsltlu", -"lvlwlxlylzlAlBlClDlElFlGlHlIlJlKlLlMlNlOlPlQlRlSlTlUlVlWlXlYlZl0", -"l1l2l3l4l5l6l7l8l9m.m#mambmcmdmemfmgmhmimjmkmlmmmnmompmqmrmsmtmu", -"mvmwmxmymzmAmBmCmDmEmFmGmHmImJmKmLmMmNmOmPmQmRmSmTmUmVmWmXmYmZm0", -"m1m2m3m4#4m5m6m7m8m9n.n#nanbncndnenfngnhninjnknlnmnnnonpnqnrnsnt", -"nunvnwnxnynznAnBnCnDnEnFnGnHnInJnKnLnMnNnOnPnQnRnSnTnUnVnWnXnYnZ"}; diff --git a/games/chromium/doinst.sh b/games/chromium/doinst.sh index 2e82bb7622..b46adf0f45 100644 --- a/games/chromium/doinst.sh +++ b/games/chromium/doinst.sh @@ -1,3 +1,4 @@ + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 fi diff --git a/games/chromium/patches/05_wall_flag.diff b/games/chromium/patches/05_wall_flag.diff deleted file mode 100644 index f4976190d6..0000000000 --- a/games/chromium/patches/05_wall_flag.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: chromium-0.9.12/src/Makefile -=================================================================== ---- chromium-0.9.12.orig/src/Makefile 2007-04-06 22:52:03.000000000 +0200 -+++ chromium-0.9.12/src/Makefile 2007-04-06 22:53:10.000000000 +0200 -@@ -10,8 +10,8 @@ - - CC = gcc - CXX = g++ --CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT --CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT -+CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT -+CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT - INCPATH = -I../support/include -I../support/glpng/include -I/usr/X11R6/include - LINK = g++ - LFLAGS = diff --git a/games/chromium/patches/10_buildfixes.dpatch b/games/chromium/patches/10_buildfixes.dpatch deleted file mode 100644 index e836225a6e..0000000000 --- a/games/chromium/patches/10_buildfixes.dpatch +++ /dev/null @@ -1,79 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_buildfixes.dpatch by Mike Furr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad chromium-0.9.12~/configure chromium-0.9.12/configure ---- chromium-0.9.12~/configure 2006-03-18 16:36:41.823022701 -0500 -+++ chromium-0.9.12/configure 2006-03-18 16:37:04.117957717 -0500 -@@ -158,8 +158,8 @@ - ## set up other config.mak variables - ###################################################################### - GL_LIBS="-lglpng -lGL -lGLU -lm" --AL_LIBS="-L../support/openal/lib -lopenal -ldl" --AL_CFLAGS="-I../support/openal/linux/include -I../support/openal/include" -+AL_LIBS="-lalut -lopenal -ldl" -+AL_CFLAGS="" - - ## write out config.mak - ###################################################################### -diff -urNad chromium-0.9.12~/scripts/Makefile.no-setup chromium-0.9.12/scripts/Makefile.no-setup ---- chromium-0.9.12~/scripts/Makefile.no-setup 2006-03-18 16:36:41.824022518 -0500 -+++ chromium-0.9.12/scripts/Makefile.no-setup 2006-03-18 16:36:43.188773686 -0500 -@@ -6,7 +6,7 @@ - ./src - - --all: $(SUPPORT_DIRS) chromium -+all: chromium - - chromium: $(CHROMIUM_DIRS) finish - -diff -urNad chromium-0.9.12~/scripts/configure_functions chromium-0.9.12/scripts/configure_functions ---- chromium-0.9.12~/scripts/configure_functions 2006-03-18 16:36:41.826022154 -0500 -+++ chromium-0.9.12/scripts/configure_functions 2006-03-18 16:36:43.190773322 -0500 -@@ -216,7 +216,7 @@ - echo "" > /dev/null - return 1 - else -- VORBIS_LIBS="-L$LIBVORBISDIR $LIBVORBIS $LIBVORBISFILE" -+ VORBIS_LIBS="$LIBVORBIS $LIBVORBISFILE" - return 0 - fi - } -diff -urNad chromium-0.9.12~/src/Makefile chromium-0.9.12/src/Makefile ---- chromium-0.9.12~/src/Makefile 2006-03-18 16:36:41.829021607 -0500 -+++ chromium-0.9.12/src/Makefile 2006-03-18 16:36:43.192772957 -0500 -@@ -8,14 +8,15 @@ - include ../config.mak - ####### Compiler, tools and options - -+DATA = /usr/share/games/chromium/ - CC = gcc - CXX = g++ --CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT --CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT --INCPATH = -I../support/include -I../support/glpng/include -I/usr/X11R6/include -+CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DAUDIO_OPENAL -D_REENTRANT -DPKGDATADIR=\"$(DATA)\" -+CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -O2 -DAUDIO_OPENAL -D_REENTRANT -DPKGDATADIR=\"$(DATA)\" -+INCPATH = -I/usr/X11R6/include - LINK = g++ - LFLAGS = --LIBS = $(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) -+LIBS = $(SUBLIBS) $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) - MOC = $(QTDIR)/bin/moc - UIC = $(QTDIR)/bin/uic - -diff -urNad chromium-0.9.12~/src/NCString.cpp chromium-0.9.12/src/NCString.cpp ---- chromium-0.9.12~/src/NCString.cpp 2006-03-18 16:36:41.831021242 -0500 -+++ chromium-0.9.12/src/NCString.cpp 2006-03-18 16:36:43.194772593 -0500 -@@ -1,6 +1,7 @@ - #include "NCString.h" - - #include -+#include - #include - #include - #include diff --git a/games/chromium/patches/15_soundfix.dpatch b/games/chromium/patches/15_soundfix.dpatch deleted file mode 100644 index cdee156457..0000000000 --- a/games/chromium/patches/15_soundfix.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15_soundfix.dpatch by Mike Furr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./src/AudioOpenAL.cpp /tmp/dpep-work.DHdnn0/chromium-0.9.12/src/AudioOpenAL.cpp ---- ./src/AudioOpenAL.cpp 2001-05-20 21:48:16.000000000 -0400 -+++ /tmp/dpep-work.DHdnn0/chromium-0.9.12/src/AudioOpenAL.cpp 2005-08-07 18:35:00.980472404 -0400 -@@ -124,6 +124,7 @@ - audioScale[0] = 0.5; - audioScale[1] = 0.3; - audioScale[2] = 0.3; -+ alDistanceModel(AL_NONE); - } - - if(config->swapStereo()) diff --git a/games/chromium/patches/20_badcode.dpatch b/games/chromium/patches/20_badcode.dpatch deleted file mode 100644 index 60c11115d9..0000000000 --- a/games/chromium/patches/20_badcode.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_badcode.dpatch by Mike Furr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./src/HiScore.cpp /tmp/dpep-work.7aaKqf/chromium-0.9.12/src/HiScore.cpp ---- ./src/HiScore.cpp 2001-02-10 15:28:16.000000000 -0500 -+++ /tmp/dpep-work.7aaKqf/chromium-0.9.12/src/HiScore.cpp 2005-08-07 18:36:19.038244187 -0400 -@@ -306,6 +306,8 @@ - for(int j = 0; j < HI_SCORE_HIST; j++) - { - tmptr = localtime(&hiScoreDate[skill][j]); -+ if (!tmptr) -+ break; - fprintf(stderr, "%02d/%02d/%04d %16s %d\n", 1+tmptr->tm_mon, tmptr->tm_mday, 1900+tmptr->tm_year, - hiScoreName[skill][j], (int)(hiScore[skill][j])); - } -diff -urNad --exclude=CVS --exclude=.svn ./src/main.cpp /tmp/dpep-work.7aaKqf/chromium-0.9.12/src/main.cpp ---- ./src/main.cpp 2001-05-20 21:48:37.000000000 -0400 -+++ /tmp/dpep-work.7aaKqf/chromium-0.9.12/src/main.cpp 2005-08-07 18:36:13.961909373 -0400 -@@ -110,8 +110,8 @@ - } - - #ifdef PKGDATADIR -- strcpy(dataDir, PKGDATADIR); -- strcat(dataDir, "/data"); -+ strncpy(dataDir, PKGDATADIR,256); -+/* strcat(dataDir, "/data");*/ - #else - char *chromData = getenv("CHROMIUM_DATA"); - if(chromData) diff --git a/games/chromium/patches/25_gcc4.dpatch b/games/chromium/patches/25_gcc4.dpatch deleted file mode 100644 index 970ae27287..0000000000 --- a/games/chromium/patches/25_gcc4.dpatch +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 25_gcc4.dpatch by Mike Furr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./src/AudioOpenAL.cpp /tmp/dpep-work.e6tZc1/chromium-0.9.12/src/AudioOpenAL.cpp ---- ./src/AudioOpenAL.cpp 2005-08-07 18:55:15.030494242 -0400 -+++ /tmp/dpep-work.e6tZc1/chromium-0.9.12/src/AudioOpenAL.cpp 2005-08-07 18:59:26.975561484 -0400 -@@ -311,7 +311,7 @@ - - //-- check AttenuationScale extension - alAttenuationScale = (void (*)(ALfloat param)) -- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI"); -+ alGetProcAddress("alAttenuationScale_LOKI"); - if(alAttenuationScale == NULL) - fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n"); - else -@@ -319,9 +319,9 @@ - - //-- check Audio Channel extension - alcGetAudioChannel = (float (*)(ALuint channel)) -- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI"); -+ alGetProcAddress("alcGetAudioChannel_LOKI"); - alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume)) -- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI"); -+ alGetProcAddress("alcSetAudioChannel_LOKI"); - #ifdef CD_VOLUME - if(alcGetAudioChannel) - origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI); -@@ -329,10 +329,10 @@ - - //-- check MP3 extension - alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint)) -- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI"); -+ alGetProcAddress("alutLoadMP3_LOKI"); - //-- check Ogg/Vorbis extension - alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint)) -- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI"); -+ alGetProcAddress("alutLoadVorbis_LOKI"); - - #endif //_WIN32 - } -@@ -469,7 +469,7 @@ - void AudioOpenAL::loadSounds() - { - int i; -- ALsizei size, freq, bits; -+ ALsizei size, freq; - ALenum format; - ALvoid *data; - diff --git a/games/chromium/patches/30_new_openAL.dpatch b/games/chromium/patches/30_new_openAL.dpatch deleted file mode 100644 index 8fd3b31249..0000000000 --- a/games/chromium/patches/30_new_openAL.dpatch +++ /dev/null @@ -1,83 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_new_openAL.dpatch by Mike Furr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -Index: chromium-0.9.12/src/AudioOpenAL.cpp -=================================================================== ---- chromium-0.9.12.orig/src/AudioOpenAL.cpp 2007-04-06 22:26:45.000000000 +0200 -+++ chromium-0.9.12/src/AudioOpenAL.cpp 2007-04-06 22:26:45.000000000 +0200 -@@ -52,8 +52,8 @@ - //try to use OpenAL alc[GS]etAudioChannel extensions in linux... - #ifdef __linux__ - #define CD_VOLUME 1 --// #include -- #include -+ #include -+// #include - #endif //__linux__ - #endif //USE_SDL - #endif -@@ -472,6 +472,7 @@ - ALsizei size, freq; - ALenum format; - ALvoid *data; -+ ALboolean loop; - - for(i = 0; i < NumSoundTypes; i++) - { -@@ -482,9 +483,9 @@ - else - { - #ifndef _WIN32 -- alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq); -+ alutLoadWAVFile(const_cast(dataLoc(fileNames[i])), &format, &data, &size, &freq, &loop); - alBufferData (buffer[i], format, data, size, freq); -- free(data); -+ alutUnloadWAV(format,data,size,freq); - #else //_WIN32 - char nameBuffer[256]; - sprintf(nameBuffer, "%s", dataLoc(fileNames[i])); -@@ -844,14 +845,16 @@ - return false; - #else //USE_PLAYLIST - bool retVal; -- ALsizei size, freq, bits; -+ ALsizei size, freq; - ALenum format; - ALvoid *data; -- retVal = alutLoadWAV(filename, &data, &format, &size, &bits, &freq); -+ ALboolean loop; -+ alutLoadWAVFile(const_cast(filename), &format, &data, &size, &freq, &loop); -+ retVal = (alGetError() == AL_NO_ERROR); - if(retVal) - { - alBufferData (buffer[MusicGame], format, data, size, freq); -- free(data); -+ alutUnloadWAV(format,data,size,freq); - } - return retVal; - #endif//USE_PLAYLIST -Index: chromium-0.9.12/src/AudioOpenAL.h -=================================================================== ---- chromium-0.9.12.orig/src/AudioOpenAL.h 2001-03-20 16:11:07.000000000 +0100 -+++ chromium-0.9.12/src/AudioOpenAL.h 2007-04-06 22:26:45.000000000 +0200 -@@ -16,6 +16,7 @@ - #include - #else //macintosh - #include -+#include - #endif //macintosh - - /** -@@ -89,7 +90,7 @@ - - float origCDvolume; - -- void *context_id; -+ ALCcontext *context_id; - bool initialized; - float audioScale[3]; - diff --git a/games/chromium/patches/35_powerup_crash.diff b/games/chromium/patches/35_powerup_crash.diff deleted file mode 100644 index cbbe77e211..0000000000 --- a/games/chromium/patches/35_powerup_crash.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: chromium-0.9.12/src/HeroAircraft.cpp -=================================================================== ---- chromium-0.9.12.orig/src/HeroAircraft.cpp 2007-04-06 22:27:23.000000000 +0200 -+++ chromium-0.9.12/src/HeroAircraft.cpp 2007-04-06 22:28:08.000000000 +0200 -@@ -663,12 +663,12 @@ - } - game->explosions->addExplo(Explosions::PowerBurst, pwrUp->pos); - delUp = pwrUp; -- pwrUp = powerUps->getNext(); -+ pwrUp = pwrUp->next; - powerUps->remove(delUp); - } - else - { -- pwrUp = powerUps->getNext(); -+ pwrUp = pwrUp->next; - } - } - } diff --git a/games/chromium/patches/40_sdl_quit.diff b/games/chromium/patches/40_sdl_quit.diff deleted file mode 100644 index ade65a6038..0000000000 --- a/games/chromium/patches/40_sdl_quit.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: chromium-0.9.12/src/MainSDL_Event.cpp -=================================================================== ---- chromium-0.9.12.orig/src/MainSDL_Event.cpp 2007-04-06 22:28:46.000000000 +0200 -+++ chromium-0.9.12/src/MainSDL_Event.cpp 2007-04-06 22:29:28.000000000 +0200 -@@ -71,6 +71,8 @@ - case SDL_JOYBUTTONUP: - joystickButtonUp(event); - break; -+ case SDL_QUIT: -+ return true; - default: - break; - } diff --git a/games/chromium/slack-desc b/games/chromium/slack-desc index 1ffe820103..ce2a3ed23f 100644 --- a/games/chromium/slack-desc +++ b/games/chromium/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------------| -chromium: Chromium B.S.U. ( 3D space shooter. ) -chromium: + |-------------------------------handy-ruler---------------------------| +chromium: Chromium B.S.U. (a fast paced, arcade-style, top-scrolling shooter) +chromium: chromium: Chromium B.S.U. is a fast paced, arcade-style, top-scrolling -chromium: space shooter. It uses SDL, OpenGL and OpenAL. +chromium: shooter. It uses OpenGL for graphics, and OpenAL for sound effects. chromium: -chromium: Homepage: http://www.reptilelabour.com/software/chromium/ chromium: chromium: +chromium: http://chromium-bsu.sourceforge.net/ chromium: chromium: chromium: -- cgit v1.2.3-79-gdb01