diff options
author | Konstantin V. Arkhipov <voxus@gentoo.org> | 2004-08-21 19:29:56 +0000 |
---|---|---|
committer | Konstantin V. Arkhipov <voxus@gentoo.org> | 2004-08-21 19:29:56 +0000 |
commit | d20628963f9457976f86ef47cab5a75cd047357a (patch) | |
tree | bc4ba7d17102b51dde3d60bdf4182fe66479e1df | |
parent | Initial import, fixes bug #60921. (Manifest recommit) (diff) | |
download | gentoo-2-d20628963f9457976f86ef47cab5a75cd047357a.tar.gz gentoo-2-d20628963f9457976f86ef47cab5a75cd047357a.tar.bz2 gentoo-2-d20628963f9457976f86ef47cab5a75cd047357a.zip |
dummy fix for gcc3.4, closes #61138
-rw-r--r-- | net-im/licq/ChangeLog | 10 | ||||
-rw-r--r-- | net-im/licq/Manifest | 6 | ||||
-rw-r--r-- | net-im/licq/files/1.3.0-gcc3.4.patch | 11 | ||||
-rw-r--r-- | net-im/licq/files/digest-licq-1.3.0_pre-r3 (renamed from net-im/licq/files/digest-licq-1.3.0_pre-r2) | 0 | ||||
-rw-r--r-- | net-im/licq/licq-1.3.0_pre-r3.ebuild (renamed from net-im/licq/licq-1.3.0_pre-r2.ebuild) | 6 |
5 files changed, 28 insertions, 5 deletions
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog index 7e7129e4e638..a09c3f2f5d24 100644 --- a/net-im/licq/ChangeLog +++ b/net-im/licq/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/licq # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.42 2004/08/20 19:47:10 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.43 2004/08/21 19:29:56 voxus Exp $ + +*licq-1.3.0_pre-r3 (21 Aug 2004) + + 21 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org> + -licq-1.3.0_pre-r2, + +licq-1.3.0_pre-r3, + +files/1.3.0-gcc3.4.patch: + Dummy patch for gcc 3.4, closing #61138. *licq-1.3.0_pre-r2 (21 Aug 2004) diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest index 5a8be088efeb..cf059ca7f742 100644 --- a/net-im/licq/Manifest +++ b/net-im/licq/Manifest @@ -1,6 +1,6 @@ MD5 481c2244bfa25938051e82c760aba1b9 licq-1.2.7.ebuild 3494 -MD5 08d6f1558aad18449ab127e28c0b4948 licq-1.3.0_pre-r2.ebuild 4006 -MD5 18522f0da42a188984d3ad8dabcf6e5e ChangeLog 6356 +MD5 9a9e2e7669f9662a98da78a474bbe394 licq-1.3.0_pre-r3.ebuild 4073 +MD5 cd832e07ddd0f62109cc258a3c544e69 ChangeLog 6561 MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396 MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178 MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64 @@ -8,3 +8,5 @@ MD5 8cc9f21e0153522e2b9a7ac4b4dd023b files/1.3.0-upgradepath.patch 547 MD5 310c7a57b61e21d49cd783cde62cf9b8 files/1.3.0-gpgme3_hack.patch 326 MD5 71930b700c70113e9b9aa7586e34066a files/1.3.0-no_stupid_koloboks.patch 3363 MD5 5079eefd8c78bf30104105bf933436cd files/digest-licq-1.3.0_pre-r2 68 +MD5 d33d4cb8bdbcd113307b7fd44184a445 files/1.3.0-gcc3.4.patch 558 +MD5 5079eefd8c78bf30104105bf933436cd files/digest-licq-1.3.0_pre-r3 68 diff --git a/net-im/licq/files/1.3.0-gcc3.4.patch b/net-im/licq/files/1.3.0-gcc3.4.patch new file mode 100644 index 000000000000..8f475fd4ec9d --- /dev/null +++ b/net-im/licq/files/1.3.0-gcc3.4.patch @@ -0,0 +1,11 @@ +--- mainwin.cpp.orig 2004-08-22 03:16:54.000000000 +0400 ++++ mainwin.cpp 2004-08-22 03:13:18.000000000 +0400 +@@ -3960,7 +3960,7 @@ + + mnuStatus = new QPopupMenu(NULL); + mnuPFM = new QPopupMenu(NULL); +- mnuPFM->insertItem(tr("Don't Show"), ICQ_PLUGIN_STATUSxINACTIVE); ++ mnuPFM->insertItem(tr("Don't Show"), (int) ICQ_PLUGIN_STATUSxINACTIVE); + mnuPFM->insertItem(tr("Available"), ICQ_PLUGIN_STATUSxACTIVE); + mnuPFM->insertItem(tr("Busy"), ICQ_PLUGIN_STATUSxBUSY); + connect(mnuPFM, SIGNAL(activated(int)), this, SLOT(changePFMStatus(int))); diff --git a/net-im/licq/files/digest-licq-1.3.0_pre-r2 b/net-im/licq/files/digest-licq-1.3.0_pre-r3 index c750dc0bb3eb..c750dc0bb3eb 100644 --- a/net-im/licq/files/digest-licq-1.3.0_pre-r2 +++ b/net-im/licq/files/digest-licq-1.3.0_pre-r3 diff --git a/net-im/licq/licq-1.3.0_pre-r2.ebuild b/net-im/licq/licq-1.3.0_pre-r3.ebuild index c1ed4f84b2e3..de395ac95cce 100644 --- a/net-im/licq/licq-1.3.0_pre-r2.ebuild +++ b/net-im/licq/licq-1.3.0_pre-r3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0_pre-r2.ebuild,v 1.1 2004/08/20 19:47:10 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0_pre-r3.ebuild,v 1.1 2004/08/21 19:29:56 voxus Exp $ inherit eutils DESCRIPTION="ICQ Client with v8 support" HOMEPAGE="http://www.licq.org/" SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2" -RESTRICT="nomirror" LICENSE="GPL-2" SLOT="2" @@ -57,6 +56,9 @@ src_unpack() { cd ${S}/plugins/qt-gui && \ epatch ${FILESDIR}/1.3.0-no_stupid_koloboks.patch || \ ewarn "Fail to kill koloboks, forget it" + + cd src && epatch ${FILESDIR}/1.3.0-gcc3.4.patch || \ + ewarn "GCC3.4 patch failed.." } src_compile() { |