summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-08-10 13:30:38 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-08-10 13:30:38 +0000
commit2f358510ec11154e5ae7d9830d656f2163d807c4 (patch)
treeda5b81d68673dfe8973f72cf9efb23e37a28c372 /kde-base
parentstable x86, bug 291286 (diff)
downloadgentoo-2-2f358510ec11154e5ae7d9830d656f2163d807c4.tar.gz
gentoo-2-2f358510ec11154e5ae7d9830d656f2163d807c4.tar.bz2
gentoo-2-2f358510ec11154e5ae7d9830d656f2163d807c4.zip
Drop unused patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/okteta/ChangeLog8
-rw-r--r--kde-base/okteta/files/4.3.3-detect_changes_correctly.patch16
-rw-r--r--kde-base/okteta/files/4.3.3-fix_inverse_save_logic.patch16
-rw-r--r--kde-base/okteta/files/4.3.3-fix_variable_name.patch13
4 files changed, 7 insertions, 46 deletions
diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog
index f24885f2ae63..67d1be7c7a41 100644
--- a/kde-base/okteta/ChangeLog
+++ b/kde-base/okteta/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/okteta
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.59 2010/08/09 17:35:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.60 2010/08/10 13:30:37 scarabeus Exp $
+
+ 10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/4.3.3-detect_changes_correctly.patch,
+ -files/4.3.3-fix_inverse_save_logic.patch,
+ -files/4.3.3-fix_variable_name.patch:
+ Drop unused patch.
09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> okteta-4.4.5.ebuild:
Drop alpha ia64 and sparc per the AT Lead permission.
diff --git a/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch b/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch
deleted file mode 100644
index ba4b572dab00..000000000000
--- a/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp
-===================================================================
---- branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp (revision 1046918)
-+++ branches/KDE/4.3/kdeutils/okteta/core/piecetablebytearraymodel_p.cpp (revision 1046919)
-@@ -263,9 +263,11 @@
-
- void PieceTableByteArrayModel::Private::openGroupedChange( const QString &description )
- {
-+ const bool isModifiedBefore = isModified();
- mBeforeGroupedChangeVersionIndex = mPieceTable.appliedChangesCount();
- mPieceTable.openGroupedChange( description );
-
-+ if( ! isModifiedBefore ) emit p->modifiedChanged( true );
- emit p->headVersionChanged( mPieceTable.changesCount() );
- }
-
diff --git a/kde-base/okteta/files/4.3.3-fix_inverse_save_logic.patch b/kde-base/okteta/files/4.3.3-fix_inverse_save_logic.patch
deleted file mode 100644
index 6f27d817e3ab..000000000000
--- a/kde-base/okteta/files/4.3.3-fix_inverse_save_logic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: branches/KDE/4.3/kdeutils/okteta/program/libkakao/core/system/kdocumentsyncmanager.cpp
-===================================================================
---- branches/KDE/4.3/kdeutils/okteta/program/libkakao/core/system/kdocumentsyncmanager.cpp (revision 1046928)
-+++ branches/KDE/4.3/kdeutils/okteta/program/libkakao/core/system/kdocumentsyncmanager.cpp (revision 1046929)
-@@ -217,9 +217,9 @@
- if( synchronizer )
- {
- AbstractSyncToRemoteJob *syncJob = synchronizer->startSyncToRemote();
-- const bool syncFailed = JobManager::executeJob( syncJob, mWidget );
-+ const bool isSynced = JobManager::executeJob( syncJob, mWidget );
-
-- canClose = !syncFailed;
-+ canClose = isSynced;
- }
- else
- canClose = setSynchronizer( document );
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
deleted file mode 100644
index 321be82c58b3..000000000000
--- a/kde-base/okteta/files/4.3.3-fix_variable_name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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() );
- }
-