diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-10-29 19:14:43 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-10-29 19:14:43 +0000 |
| commit | ad303287d998dfa8b8214efb5242736783264ba6 (patch) | |
| tree | 20e00fdd4d1149f61ef549baf821d4661399cb02 /dev-db/tora | |
| parent | Temporarily delete some code. (diff) | |
| download | historical-ad303287d998dfa8b8214efb5242736783264ba6.tar.gz historical-ad303287d998dfa8b8214efb5242736783264ba6.tar.bz2 historical-ad303287d998dfa8b8214efb5242736783264ba6.zip | |
Apply patch to compile with Qt 4.7. Bug #338478
Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64
Diffstat (limited to 'dev-db/tora')
| -rw-r--r-- | dev-db/tora/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/tora/Manifest | 15 | ||||
| -rw-r--r-- | dev-db/tora/files/tora-2.1.2-qt47.patch | 15 | ||||
| -rw-r--r-- | dev-db/tora/tora-2.1.2.ebuild | 5 |
4 files changed, 36 insertions, 5 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index 88bb5678b048..be354c67a129 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/tora # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.86 2010/06/17 21:29:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.87 2010/10/29 19:14:43 hwoarang Exp $ + + 29 Oct 2010; Markos Chandras <hwoarang@gentoo.org> tora-2.1.2.ebuild, + +files/tora-2.1.2-qt47.patch: + Apply patch to compile with Qt 4.7. Bug #338478 17 Jun 2010; Patrick Lauer <patrick@gentoo.org> tora-2.1.1.ebuild, tora-2.1.2.ebuild: diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index 71020f083a8d..d1fad728fbc7 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX tora-2.1.2-qt47.patch 446 RMD160 9453e46dbe60e7ab441ef802b241c3ac3da76026 SHA1 312db8f8c89659d6c0cd4d71b5816530a6515bbf SHA256 fabd80f233de1ac9c5dcbc80ac10e70289bf4a58c7984e490c19f91897593add DIST tora-2.1.1.tar.gz 5356473 RMD160 1f81d512480fdfba2d66e2cd8665da8ab70d2de3 SHA1 61a2471fd9bac2578e6fa556f98d90976ea3ef9d SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663 DIST tora-2.1.2.tar.gz 12053942 RMD160 23cf84518d97f31244c6c86c7f0f0bcf95025966 SHA1 7bffbc9dc6d0e0f292502e4cffa098d3585db289 SHA256 26eb8bf379be3f5d677b338a9bf422f705da2cb3455114a1838bc9929522b911 EBUILD tora-2.1.1.ebuild 1783 RMD160 1fa169c6bb424824292f3d240a935b1b6e715c61 SHA1 52f97d447ca80bcfffe86965a67a34d17e5cb8bd SHA256 642e494e4fdceb320a0319b5cfe5a6b9e4353708454067961db116e36f95ef31 -EBUILD tora-2.1.2.ebuild 1788 RMD160 40661fcc9a9c648640b6cf8872d99852142fb558 SHA1 f0d7166ffa256e46cb26e711e91bed29544d2c63 SHA256 9f00c9835878b4c8e2f5b92471d7ffd74b7c80623cc7f48c25d66453aee4603b -MISC ChangeLog 12849 RMD160 aa50438722364cbbbf228bf084eda9c05af11f0b SHA1 e9ad2037d5d68b7ec3fe516b3983500250eca45c SHA256 d323dedc8fb880a94aa26a9fab32c954e81ab971d1f3766e145614c657b1dd19 +EBUILD tora-2.1.2.ebuild 1834 RMD160 272f60664f4e8974cfb1fd68664a7fbfe3fbb7d4 SHA1 80cdf402513c33884861cbcf0c6f17e91b40fddc SHA256 7e3c7a4af760ed91f79408648b72f212e0ec6c0f86a80e2250dc463813392e3b +MISC ChangeLog 13005 RMD160 2d03afdc1a5e4dd957f666b37735dfc1cdf69b76 SHA1 462a4b0bd02df4855d72e38cfc7a7d155375a7c6 SHA256 0c7d0a5e58d452bfdc6232b3e6f158f09440515fe74a5df8498c20230e38e832 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkzLHTMACgkQ9/cejkQaxBDfDgCfQq1nbAv2zVVLba5SMoSPHub3 +irEAn2KuFs4gYq8CIaNFAHQjowQcCmpl +=CDst +-----END PGP SIGNATURE----- diff --git a/dev-db/tora/files/tora-2.1.2-qt47.patch b/dev-db/tora/files/tora-2.1.2-qt47.patch new file mode 100644 index 000000000000..b49f9e2cea04 --- /dev/null +++ b/dev-db/tora/files/tora-2.1.2-qt47.patch @@ -0,0 +1,15 @@ +Index: tora-2.1.2/src/tobrowserbasewidget.cpp +=================================================================== +--- tora-2.1.2.orig/src/tobrowserbasewidget.cpp ++++ tora-2.1.2/src/tobrowserbasewidget.cpp +@@ -48,8 +48,8 @@ + + toBrowserBaseWidget::toBrowserBaseWidget(QWidget * parent) + : QTabWidget(parent), +- m_schema(0), +- m_object(0) ++ m_schema(QString()), ++ m_object(QString()) + { + setObjectName("toBrowserBaseWidget"); + diff --git a/dev-db/tora/tora-2.1.2.ebuild b/dev-db/tora/tora-2.1.2.ebuild index 724689632499..9f211497812f 100644 --- a/dev-db/tora/tora-2.1.2.ebuild +++ b/dev-db/tora/tora-2.1.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.2.ebuild,v 1.2 2010/06/17 21:29:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.2.ebuild,v 1.3 2010/10/29 19:14:43 hwoarang Exp $ EAPI=2 -inherit cmake-utils +inherit cmake-utils eutils DESCRIPTION="TOra - Toolkit For Oracle" HOMEPAGE="http://tora.sourceforge.net" @@ -44,6 +44,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-qt47.patch sed -i \ -e "/COPYING/ d" \ CMakeLists.txt || die "Removal of COPYING file failed" |