diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-03-08 22:12:28 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-03-08 22:12:28 +0000 |
commit | 51c42619725579c94b268a5a5d9cd66f342f41d8 (patch) | |
tree | 9784d36553d44c06aff734c9cc5c0549af8a7cb4 /kde-base/knode | |
parent | add upstream patch to fix a memcpy that should have been a memmove (bugs #357... (diff) | |
download | gentoo-2-51c42619725579c94b268a5a5d9cd66f342f41d8.tar.gz gentoo-2-51c42619725579c94b268a5a5d9cd66f342f41d8.tar.bz2 gentoo-2-51c42619725579c94b268a5a5d9cd66f342f41d8.zip |
Fix kdeenablefinal build, bug 350344
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/knode')
-rw-r--r-- | kde-base/knode/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/knode/files/knode-4.4.10-enablefinal.patch | 11 | ||||
-rw-r--r-- | kde-base/knode/knode-4.4.10.ebuild | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog index 67e9b01f6433..deda240b62a0 100644 --- a/kde-base/knode/ChangeLog +++ b/kde-base/knode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/knode # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.170 2011/02/13 19:59:39 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.171 2011/03/08 22:12:28 dilfridge Exp $ + + 08 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> + knode-4.4.10.ebuild, +files/knode-4.4.10-enablefinal.patch: + Fix kdeenablefinal build, bug 350344 13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -knode-4.4.6.ebuild, -knode-4.4.7.ebuild, -knode-4.4.8.ebuild: diff --git a/kde-base/knode/files/knode-4.4.10-enablefinal.patch b/kde-base/knode/files/knode-4.4.10-enablefinal.patch new file mode 100644 index 000000000000..8d140abcaedd --- /dev/null +++ b/kde-base/knode/files/knode-4.4.10-enablefinal.patch @@ -0,0 +1,11 @@ +--- kdepim-4.4.9/libkdepim/addressesdialog.h.orig 2011-01-02 10:25:59.941000270 +0100 ++++ kdepim-4.4.9/libkdepim/addressesdialog.h 2011-01-02 10:25:59.941000270 +0100 +@@ -37,7 +37,7 @@ + #include <QStringList> + #include <QTreeWidget> + +-class AddressPickerUI : public QWidget, public Ui::AddressPickerUI ++class AddressPickerUI : public QWidget, public ::Ui::AddressPickerUI + { + public: + AddressPickerUI( QWidget *parent ) : QWidget( parent ) { diff --git a/kde-base/knode/knode-4.4.10.ebuild b/kde-base/knode/knode-4.4.10.ebuild index 5b4e09aec99d..6b28510b79f1 100644 --- a/kde-base/knode/knode-4.4.10.ebuild +++ b/kde-base/knode/knode-4.4.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.10.ebuild,v 1.2 2011/01/28 05:20:44 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.10.ebuild,v 1.3 2011/03/08 22:12:28 dilfridge Exp $ EAPI="3" @@ -27,6 +27,8 @@ KMEXTRACTONLY=" KMLOADLIBS="libkdepim" +PATCHES=( "${FILESDIR}/${P}"-enablefinal.patch ) + src_unpack() { if use handbook; then KMEXTRA=" |