Make okteta actualy functional. Per bug #292608.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

5 files changed, 50 insertions, 14 deletions

diff --git a/kde-base/okteta/ChangeLog b/kde-base/okteta/ChangeLog
index 69281ad43b91..4b8f0df8ea9b 100644
--- a/kde-base/okteta/ChangeLog
+++ b/kde-base/okteta/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2009/11/09 00:16:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okteta/ChangeLog,v 1.29 2009/11/22 15:59:24 scarabeus Exp $
+
+*okteta-4.3.3-r1 (22 Nov 2009)
+
+  22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.3.3-detect_changes_correctly.patch, -okteta-4.3.3.ebuild,
+  +files/4.3.3-fix_inverse_save_logic.patch, +okteta-4.3.3-r1.ebuild:
+  Make okteta actualy functional. Per bug #292608.
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -okteta-4.3.2.ebuild:
   Drop KDE 4.3.2
diff --git a/kde-base/okteta/Manifest b/kde-base/okteta/Manifest
index d711db36cb50..6501318abe87 100644
--- a/kde-base/okteta/Manifest
+++ b/kde-base/okteta/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 4.3.3-detect_changes_correctly.patch 915 RMD160 a60c3e674c60fb7975a482bb02ce815523df4027 SHA1 02a5800331cf2fd64ebb4016cb4d4a48008088bb SHA256 3e3b1aa62694c181f335581eb74ab64989a514a0bf3e142f5697ddf5c18951dd
+AUX 4.3.3-fix_inverse_save_logic.patch 915 RMD160 a60c3e674c60fb7975a482bb02ce815523df4027 SHA1 02a5800331cf2fd64ebb4016cb4d4a48008088bb SHA256 3e3b1aa62694c181f335581eb74ab64989a514a0bf3e142f5697ddf5c18951dd
 DIST kdeutils-4.3.1.tar.bz2 2524224 RMD160 72dcc9d0a5592b371873398604e1bf59acb9eb4e SHA1 9743636306cfb137241b6c87f5944e6bf91870fe SHA256 659d23848039bbb5f2d7c24d0693605d2a95e1b9f9693562fc68ffcb7f6d2125
 DIST kdeutils-4.3.3.tar.bz2 2525876 RMD160 d1e8a1a8ee2a7bf1e5104dfb97af9b354aaac2bd SHA1 af3bd5c91020ae4fcd27b799eecf06aa161b48b4 SHA256 1690333709021a8a609a7f2ccfcb2d4677bde8d2e706139426a2f6d143202cc7
 EBUILD okteta-4.3.1.ebuild 478 RMD160 76595862c24665101e8e18e59f05a7eb5bca601d SHA1 81d1cb2154dddbfdc03144690792b925ddd7d72a SHA256 9817db387889108cf581f752c8396f86a13435787a46c82ae230a45a6d9fe705
-EBUILD okteta-4.3.3.ebuild 418 RMD160 bbd438f5abcd7f15557ef8286fdc3a984c781d3a SHA1 9a1a4e16b63dd4ef6309784141001aa9d7064fd3 SHA256 1f06e2104d1a52c62783880faa329a1c818ddb44e4dee43628bfd7371f6ada5a
-MISC ChangeLog 3441 RMD160 cc9afb8921739fd665834f1c9cc5d6280641b419 SHA1 3c1df5363462075b72db6944e184b8defcf811f0 SHA256 99e311ed47afcbfaf78598593aea973616e648d3a0b715a763f601b811e258ab
+EBUILD okteta-4.3.3-r1.ebuild 540 RMD160 8c7068d510ac2471bbcb7924afe5b3cc3a01524c SHA1 19e0a8ad761fed15f5745c9307e448ba716f8d9a SHA256 8520ea0c731f7641d0197055ad073b1a8687f3f587284ef9a2ec8df1d7a29b08
+MISC ChangeLog 3722 RMD160 8584c55bf5c8e6aca2229f98e7d34279b5a8ba33 SHA1 46aa866c6f8460d8abb9a7037c576bce63c28626 SHA256 db3e480d686d8a073270a56c5bdd7b711a41821c68c10f51a53f36fce17ecef7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkr3X2AACgkQ5BmOA85PVLgBOgCeOAmjKGnC0ONDJiRVoboijmIP
-FiwAn39LVXuJcqRFUBbqg7LgAbTHnTn8
-=sNkS
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6f27d817e3ab
--- /dev/null
+++ b/kde-base/okteta/files/4.3.3-detect_changes_correctly.patch
@@ -0,0 +1,16 @@
+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_inverse_save_logic.patch b/kde-base/okteta/files/4.3.3-fix_inverse_save_logic.patch
new file mode 100644
index 000000000000..6f27d817e3ab
--- /dev/null
+++ b/kde-base/okteta/files/4.3.3-fix_inverse_save_logic.patch
@@ -0,0 +1,16 @@
+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/okteta-4.3.3.ebuild b/kde-base/okteta/okteta-4.3.3-r1.ebuild
index 0a6d390cf9f2..ac8f369f30d4 100644
--- a/kde-base/okteta/okteta-4.3.3.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.ebuild,v 1.1 2009/11/02 22:06:10 wired Exp $
+# $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 $
 
 EAPI="2"
 
@@ -15,3 +15,8 @@ DEPEND="
 	app-crypt/qca:2
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-detect_changes_correctly.patch"
+	"${FILESDIR}/${PV}-fix_inverse_save_logic.patch"
+)