diff options
| -rw-r--r-- | games-action/chromium/ChangeLog | 5 | ||||
| -rw-r--r-- | games-action/chromium/chromium-0.9.12-r5.ebuild | 17 | ||||
| -rw-r--r-- | games-action/chromium/files/0.9.12-qt3.patch | 22 |
3 files changed, 37 insertions, 7 deletions
diff --git a/games-action/chromium/ChangeLog b/games-action/chromium/ChangeLog index 6ed82d18ad5e..7be479452dbb 100644 --- a/games-action/chromium/ChangeLog +++ b/games-action/chromium/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for games-action/chromium # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.5 2003/11/20 01:39:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/ChangeLog,v 1.6 2004/02/22 10:28:30 vapier Exp $ *chromium-0.9.12-r5 (19 Nov 2003) + 22 Feb 2004; Mike Frysinger <vapier@gentoo.org> : + Make the game build with QT3 #41561 by Martin Schlemmer. + 19 Nov 2003; Mike Frysinger <vapier@gentoo.org> : Clean up DEPEND #33866 and build process in general. Use system openal and user's CFLAGS. diff --git a/games-action/chromium/chromium-0.9.12-r5.ebuild b/games-action/chromium/chromium-0.9.12-r5.ebuild index ecdd14be6645..1588a8df6527 100644 --- a/games-action/chromium/chromium-0.9.12-r5.ebuild +++ b/games-action/chromium/chromium-0.9.12-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r5.ebuild,v 1.2 2004/02/10 11:53:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/chromium/chromium-0.9.12-r5.ebuild,v 1.3 2004/02/22 10:28:30 vapier Exp $ inherit games eutils @@ -21,7 +21,7 @@ DEPEND="virtual/glibc virtual/glut ) oggvorbis? ( media-libs/libvorbis ) - qt? ( =x11-libs/qt-2* ) + qt? ( x11-libs/qt ) media-libs/openal virtual/x11" @@ -32,6 +32,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PV}-gcc3-gentoo.patch epatch ${FILESDIR}/${PV}-proper-options.patch + has_version '=x11-libs/qt-3*' && epatch ${FILESDIR}/${PV}-qt3.patch append-flags -DPKGDATADIR="'\"${GAMES_DATADIR}/${PN}\"'" append-flags -DPKGBINDIR="'\"${GAMES_BINDIR}\"'" sed -i "s:-O2 -DOLD_OPENAL:${CFLAGS}:" src/Makefile @@ -50,10 +51,14 @@ src_compile() { use oggvorbis \ && export ENABLE_VORBIS="yes" \ || export ENABLE_VORBIS="no" - use qt \ - && export ENABLE_SETUP="yes" \ - && export QTDIR=/usr/qt/2 \ - || export ENABLE_SETUP="no" + if use qt ; then + export ENABLE_SETUP="yes" + has_version '=x11-libs/qt-3*' \ + && export QTDIR=/usr/qt/3 \ + || export QTDIR=/usr/qt/2 + else + export ENABLE_SETUP="no" + fi ./configure || die "configure failed" emake -j1 || die "make failed" } diff --git a/games-action/chromium/files/0.9.12-qt3.patch b/games-action/chromium/files/0.9.12-qt3.patch new file mode 100644 index 000000000000..bd0f45bf9335 --- /dev/null +++ b/games-action/chromium/files/0.9.12-qt3.patch @@ -0,0 +1,22 @@ +--- Chromium-0.9/src-setup/HelpPage.cpp.qt3 Thu Feb 8 06:18:59 2001 ++++ Chromium-0.9/src-setup/HelpPage.cpp Thu Apr 11 10:46:22 2002 +@@ -22,8 +22,6 @@ + cgroup.setColor(QColorGroup::Base, QColor(70, 60, 100)); + cgroup.setColor(QColorGroup::Text, QColor(220, 220, 220)); + QFont font("Helvetica", 12, false); +- page->setPaperColorGroup(cgroup); +- page->setLinkColor(QColor(192, 192, 255)); + page->setFont(font); + + backBut = new QPushButton(this); +--- Chromium-0.9/src-setup/Makefile.qt3 Thu Apr 11 10:49:17 2002 ++++ Chromium-0.9/src-setup/Makefile Thu Apr 11 10:49:27 2002 +@@ -15,7 +15,7 @@ + INCPATH = -I$(QTDIR)/include + LINK = g++ + LFLAGS = +-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) -lm -pthread -lqt -lXext -lX11 -lm ++LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS) -lm -pthread -lqt-mt -lXext -lX11 -lm + MOC = $(QTDIR)/bin/moc + UIC = $(QTDIR)/bin/uic + |