diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-22 18:36:30 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-22 18:36:30 +0000 |
| commit | 1c04cfd563cdf7c6c9867a3a184f7397d8cc9ef0 (patch) | |
| tree | 7742247e0cf24fd13fddc49b079c72c28ac3997e | |
| parent | Fix misc install errors #264838. (diff) | |
| download | gentoo-2-1c04cfd563cdf7c6c9867a3a184f7397d8cc9ef0.tar.gz gentoo-2-1c04cfd563cdf7c6c9867a3a184f7397d8cc9ef0.tar.bz2 gentoo-2-1c04cfd563cdf7c6c9867a3a184f7397d8cc9ef0.zip | |
Add one more patch fixing the compilation.
(Portage version: 2.2_rc51/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/okteta/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/okteta/files/4.3.3-fix_variable_name.patch | 13 | ||||
| -rw-r--r-- | kde-base/okteta/okteta-4.3.3-r1.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog index 733289914c44..88222d3da3f9 100644 --- a/kde-base/okteta/ChangeLog +++ b/kde-base/okteta/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/okteta # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.30 2009/11/22 18:13:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.31 2009/11/22 18:36:30 scarabeus Exp $ + + 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +files/4.3.3-fix_variable_name.patch, okteta-4.3.3-r1.ebuild: + Add one more patch fixing the compilation. 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/4.3.3-detect_changes_correctly.patch: diff --git a/kde-base/okteta/files/4.3.3-fix_variable_name.patch b/kde-base/okteta/files/4.3.3-fix_variable_name.patch new file mode 100644 index 000000000000..321be82c58b3 --- /dev/null +++ b/kde-base/okteta/files/4.3.3-fix_variable_name.patch @@ -0,0 +1,13 @@ +Index: branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp +=================================================================== +--- branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp (revision 1047099) ++++ branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp (revision 1047100) +@@ -267,7 +267,7 @@ + mBeforeGroupedChangeVersionIndex = mPieceTable.appliedChangesCount(); + mPieceTable.openGroupedChange( description ); + +- if( ! isModifiedBefore ) emit p->modifiedChanged( true ); ++ if( ! isModifiedBefore ) emit p->modificationChanged( true ); + emit p->headVersionChanged( mPieceTable.changesCount() ); + } + diff --git a/kde-base/okteta/okteta-4.3.3-r1.ebuild b/kde-base/okteta/okteta-4.3.3-r1.ebuild index ac8f369f30d4..8a8a815ada9d 100644 --- a/kde-base/okteta/okteta-4.3.3-r1.ebuild +++ b/kde-base/okteta/okteta-4.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.3.3-r1.ebuild,v 1.1 2009/11/22 15:59:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/okteta-4.3.3-r1.ebuild,v 1.2 2009/11/22 18:36:30 scarabeus Exp $ EAPI="2" @@ -19,4 +19,5 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PV}-detect_changes_correctly.patch" "${FILESDIR}/${PV}-fix_inverse_save_logic.patch" + "${FILESDIR}/${PV}-fix_variable_name.patch" ) |