From: Michael Sterrett Date: Thu, 8 Jun 2006 18:41:58 +0000 (+0000) Subject: Add in upstream patch and sed patch to fix bug #135885 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1d10ff4fce399a617c9b85f36e3d58d025b6dc8;p=gentoo.git Add in upstream patch and sed patch to fix bug #135885 Package-Manager: portage-2.1_rc4-r4 --- diff --git a/games-board/mahjongg3d/ChangeLog b/games-board/mahjongg3d/ChangeLog index d85a1fe091e1..948ba308b1fe 100644 --- a/games-board/mahjongg3d/ChangeLog +++ b/games-board/mahjongg3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/mahjongg3d # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/ChangeLog,v 1.8 2006/02/09 13:55:10 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/ChangeLog,v 1.9 2006/06/08 18:41:57 mr_bones_ Exp $ + + 08 Jun 2006; Michael Sterrett + mahjongg3d-0.96.ebuild: + Add in upstream patch and sed patch to fix bug #135885 09 Feb 2006; Caleb Tennis mahjongg3d-0.96.ebuild: Fix qmake call to get the Qt3 version diff --git a/games-board/mahjongg3d/Manifest b/games-board/mahjongg3d/Manifest index ae9722cddebf..0897d2619551 100644 --- a/games-board/mahjongg3d/Manifest +++ b/games-board/mahjongg3d/Manifest @@ -1,12 +1,17 @@ -MD5 8f73080a8423b85b9c766cc6f8d1ee14 ChangeLog 1117 -RMD160 cc35356d5c796c8d7a1f016f8e8c758eea9f28bd ChangeLog 1117 -SHA256 52578f875354dcc2eaac9f338842727652c96d15466f985db6094174f2252c1f ChangeLog 1117 -MD5 51ea5b85f839726d9bace362ae786b12 files/digest-mahjongg3d-0.96 69 -RMD160 7685d70a9561456d297d9bae563d3141374f7a2b files/digest-mahjongg3d-0.96 69 -SHA256 5f45cbf538ca5c151e5bb776e458a1b242c8fd75cb84e861903f23a4f650b2f6 files/digest-mahjongg3d-0.96 69 -MD5 ddbe988f6dd43d869a36b71a16a1dab5 mahjongg3d-0.96.ebuild 1077 -RMD160 25ff205ee91213646f7671ec8a502e99fb204448 mahjongg3d-0.96.ebuild 1077 -SHA256 059155870e19000f23cc9b5e6761db00d3c707e034511ee126ff8e72ace74d04 mahjongg3d-0.96.ebuild 1077 +DIST mahjongg3d-0.96-patch2.tar.bz2 2950 RMD160 8c5cf6a229df528289bf22b2358a60e1fcfc43d0 SHA1 791dd0de424399a9d4cfde82fae0400351ab6926 SHA256 df5a2f8b33a59ef19c56523db03786df8c00b2df2fdf79d1da68b57889b40ebe +DIST mahjongg3d-0.96.tar.bz2 4906036 RMD160 17e9fe495a7aa661e2dd6e2dff07f12c04cf2fb8 SHA1 c2de45f5fa8f51c15fff9e267cecdba837c80a42 SHA256 011719dd78977fcd7745abd949d92c7dd2a44f480f2468e9aa14a0ca95e704ca +EBUILD mahjongg3d-0.96.ebuild 1296 RMD160 d9d319ab6ef8bbda45e06ce8ced796730f78abf0 SHA1 f5b163ae151fac072559f6dae9d7cbb718e77a93 SHA256 a2e4f292f3c1f9ef8d904c60d3db659dc9cf1d8bd100719a0d2227cd57d42615 +MD5 1501a657868abdcc9d96094fd532ed5c mahjongg3d-0.96.ebuild 1296 +RMD160 d9d319ab6ef8bbda45e06ce8ced796730f78abf0 mahjongg3d-0.96.ebuild 1296 +SHA256 a2e4f292f3c1f9ef8d904c60d3db659dc9cf1d8bd100719a0d2227cd57d42615 mahjongg3d-0.96.ebuild 1296 +MISC ChangeLog 1260 RMD160 132873736dcbbb085e73fed3b2f0e980990d3349 SHA1 300f08660ccb4a6dcf36215d6671d6df1e1a1d32 SHA256 794bdbc5793f1ec5facf630a40aa70590df3c61f257e0fe3412b6a249605ad0c +MD5 a5a2912332948b550b84f45a1d2b1e2d ChangeLog 1260 +RMD160 132873736dcbbb085e73fed3b2f0e980990d3349 ChangeLog 1260 +SHA256 794bdbc5793f1ec5facf630a40aa70590df3c61f257e0fe3412b6a249605ad0c ChangeLog 1260 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 +MD5 294ee32b477b51c7a7eaf3c315839e7d files/digest-mahjongg3d-0.96 518 +RMD160 6d289a22387b5584fe7fdbf647a8dd8f3e508265 files/digest-mahjongg3d-0.96 518 +SHA256 c2a696b48558259cbe538f5f5606b2986a7e8d8597672099379e9cf24e290957 files/digest-mahjongg3d-0.96 518 diff --git a/games-board/mahjongg3d/files/digest-mahjongg3d-0.96 b/games-board/mahjongg3d/files/digest-mahjongg3d-0.96 index 2f340eea5262..56d19dc59c65 100644 --- a/games-board/mahjongg3d/files/digest-mahjongg3d-0.96 +++ b/games-board/mahjongg3d/files/digest-mahjongg3d-0.96 @@ -1 +1,6 @@ +MD5 e598e9cc237342702d9b1b273490b0de mahjongg3d-0.96-patch2.tar.bz2 2950 +RMD160 8c5cf6a229df528289bf22b2358a60e1fcfc43d0 mahjongg3d-0.96-patch2.tar.bz2 2950 +SHA256 df5a2f8b33a59ef19c56523db03786df8c00b2df2fdf79d1da68b57889b40ebe mahjongg3d-0.96-patch2.tar.bz2 2950 MD5 f5a08f4d1f375f3e4e94a2d392fe21d7 mahjongg3d-0.96.tar.bz2 4906036 +RMD160 17e9fe495a7aa661e2dd6e2dff07f12c04cf2fb8 mahjongg3d-0.96.tar.bz2 4906036 +SHA256 011719dd78977fcd7745abd949d92c7dd2a44f480f2468e9aa14a0ca95e704ca mahjongg3d-0.96.tar.bz2 4906036 diff --git a/games-board/mahjongg3d/mahjongg3d-0.96.ebuild b/games-board/mahjongg3d/mahjongg3d-0.96.ebuild index b830aefe9b78..1c025b6713fd 100644 --- a/games-board/mahjongg3d/mahjongg3d-0.96.ebuild +++ b/games-board/mahjongg3d/mahjongg3d-0.96.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/mahjongg3d-0.96.ebuild,v 1.7 2006/02/09 13:55:10 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/mahjongg3d-0.96.ebuild,v 1.8 2006/06/08 18:41:57 mr_bones_ Exp $ -inherit kde games +inherit eutils kde games DESCRIPTION="An implementation of the classical chinese game Mah Jongg with 3D OpenGL graphics" HOMEPAGE="http://www.reto-schoelly.de/mahjongg3d/" -SRC_URI="http://www.reto-schoelly.de/${PN}/${P}.tar.bz2" +SRC_URI="http://www.reto-schoelly.de/${PN}/${P}.tar.bz2 + http://www.reto-schoelly.de/mahjongg3d/${P}-patch2.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -19,16 +20,21 @@ DEPEND="$(qt_min_version 3.2) S=${WORKDIR}/${PN}.release src_unpack() { - unpack ${A} + unpack ${P}.tar.bz2 cd "${S}" + unpack ${P}-patch2.tar.bz2 sed -i \ -e "/GAMEDATA_BASE_PATH/ s:\.:${GAMES_DATADIR}/${PN}:" \ src/gamedata_path.h \ || die "sed failed" + #bug #135885 + sed -i \ + -e 's/openglwidget.h/OpenGLWidget.h/' src/MainDialogBase.ui \ + || die "sed failed" } src_compile() { - qmake QMAKE=${QTDIR}/bin/qmake -o Makefile mahjongg3d.pro + qmake QMAKE="${QTDIR}"/bin/qmake -o Makefile mahjongg3d.pro kde_src_compile none emake || die "emake failed" }