Include no accessibility fix, bug 355969

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 79 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 7c67f543ce8b..7bdcb2f6a062 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.718 2011/02/02 11:13:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.719 2011/02/27 20:48:57 dilfridge Exp $
+
+  27 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdelibs-4.6.0-r1.ebuild, +files/kdelibs-4.6.0-kateacc.patch:
+  Include no accessibility fix, bug 355969
 
 *kdelibs-4.6.0-r1 (02 Feb 2011)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index ac392d1897cb..08cb1e2146c4 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
@@ -19,6 +22,7 @@ AUX kdelibs-4.5.2-open-https.patch 436 RMD160 4c4e45df7758d04f93e38071f3fc9839d4
 AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9
 AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84
 AUX kdelibs-4.5.90-mimetypes.patch 1629 RMD160 46289674dd977b2b2289ba935d88c1b0c9de5916 SHA1 78c70127486231e24f464f5cce978e06293510e5 SHA256 0276732204ba9b7a9f119ce26a2b992b1d23c321606efc1a6957914329f33109
+AUX kdelibs-4.6.0-kateacc.patch 1639 RMD160 239e2fb92dc2efa1e66b669a6e6cf29f9937127a SHA1 aa21f3eaf1c75ba50ceca3dafde252672bb71935 SHA256 dc6c0617c76acc0fff15d82b0a44826022c69d1d7af5abf554c17be8eb49c9dd
 AUX kdelibs-4.6.0-logoutcrash.patch 769 RMD160 999f0adf323e0adbe6359c0533bfc8f7bd1b5a9f SHA1 270f24d9682c32c9f69b3e6e13696888724c5169 SHA256 0eb003283c6956c989bece7ff64a4e099b291916e674e6947a582b6a32fc2c46
 DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
 DIST kdelibs-4.5.5.tar.bz2 13876521 RMD160 7c33afa12379119fbf7d70e8895c3f2ada9a2eba SHA1 127a2b50fe31ff345e05660dd50f7c55ae78d854 SHA256 347c6d7034d9cffbb1b5c7d151f13998e64f62906fb6c5064d6eff540db6eaf9
@@ -27,6 +31,23 @@ EBUILD kdelibs-4.4.5-r1.ebuild 9305 RMD160 3feebd11d22fb86c9bd66fc58caa7f180728f
 EBUILD kdelibs-4.4.5-r2.ebuild 9348 RMD160 ec5b799bf629834e80a2ca905ac822a2090cf98d SHA1 cf69b61305e22c852a71a450124d5ff126c7d429 SHA256 cc33f8d0810f4b5478bbc137e2997deca73e2c5cb8472b75cf670b15586e8539
 EBUILD kdelibs-4.4.5.ebuild 9261 RMD160 c20d3d14b1c96b5b246d522a54a697022365a214 SHA1 6ab566883d3a2e4e8a1d70e9978e2ad0542078f1 SHA256 05f69b920cad81fffebc3e6242dea3a1cc017ae613aa8982d2303144968641b9
 EBUILD kdelibs-4.5.5.ebuild 9310 RMD160 ba1849123405f11822bfd11cfefcb081b03ad781 SHA1 013ee0f9bc1812bc9bfa3aee0a44bd25364ec5c1 SHA256 5d59e3c962eef54d23f50817819186d4038450e8718ae0f5e28c8b3773a0eb3b
-EBUILD kdelibs-4.6.0-r1.ebuild 9552 RMD160 da76cd1e532af16893e03f36efa31fdfcf33aefb SHA1 cd75e118f4feaf47f8913a9870b62b7cd5a2d058 SHA256 69bd79ae324f5ceac52b56e85143cef57c96a8f0e3ed394996da470ba74cd4e1
-MISC ChangeLog 119682 RMD160 c4cdbb0fdd2da817bc2578f8f031195a8d44f531 SHA1 fff102b72565c95da20002139b419b83895d79a5 SHA256 0a58f42a784c49947baa80dad73f3ba79b264b958c9a622e9ce13006097179ac
+EBUILD kdelibs-4.6.0-r1.ebuild 9593 RMD160 1454c29b75af03ff0fc344b8750caa95deea4855 SHA1 6c62cac4632e6ee50003030b8017c95b1fed58a7 SHA256 0e9c8a29626b8fe4d2be9a7611fe586ed5b97237e293c5373646d969a56bd87e
+MISC ChangeLog 119846 RMD160 768bba1694ced854f7bc03a0007b37da79da673e SHA1 77fc4484456f6b7a26302680561527319ec81533 SHA256 d5c0e155b0a4fda66532cc1e84e7ffa21f1d3da6da28aaa233e91dfcfc1206f6
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNarkAAAoJENwGBM22xffecagP/22V5GxfjYes6qOFcYeDoUCj
+9H3FOa3JY3HR8HNYL7DP6Xcehi0+41OUw9m9W56yuYnFZL9c6Ui363RAszKChgLu
+RwqvZdHHGwmyF/uI3ascyMIghp4d+UMSGwnH1uzDA18TRWBBNt6qFzIkH6Lb8QC7
+dr5kerag3KwoI5difpyMInQXzQU1ZsA7vjD4GXInSTUtMjc00C7zO+uL3cmKAUvu
++RfnNYrMnAiNjjP+eAsFtPCrT0ZSfOAPemyM1B/XUlIhzHbZiMqsu8aPnBDdJBBV
+8cqEKvZ3CPiKrst3DTT3RdU+VBf4TgiS+roGox/QJGLnwcDAhNH2YN/r5Po6BB4B
+l1QubZpeu3d3EPPY8LMi6B/Vw4bCNTb2coxC97GH6lZBYOKva99Kh3nbvH7nG0ha
+IYVvEB+IBq+FI954gVvS9pdZPYrkthhm1PsAafF+Gq+kA17QFzVRWH5awEBI93rG
+YIRSftmHDXnF6w+dAm5/Y/mjaQu4ehELwKJNQAyvzOT7aqqfKn5kGZR7qnLtxfVT
+FDrIC0tM7Mz8+TjitbMog9NqIPOhduTI4ygIfG0/Yex6SSqcyb9Z9xWF1fgFuk+k
++BWalPRfOT69D6X77P44pXzyOtl1aSOYMLuYZQxknsohwCvjQtV9SSN6F+HUd+Cl
+zoqpFsZFYQI3PBA6M481
+=CiRO
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
new file mode 100644
index 000000000000..80bcfc552a7a
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
@@ -0,0 +1,49 @@
+diff -ur kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h kdelibs-4.5.95/kate/view/kateviewaccessible.h
+--- kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h	2010-11-11 17:41:28.000000000 +0300
++++ kdelibs-4.5.95/kate/view/kateviewaccessible.h	2011-01-11 11:37:15.288810505 +0300
+@@ -19,6 +19,7 @@
+ 
+ #ifndef _KATE_VIEW_ACCESSIBLE_
+ #define _KATE_VIEW_ACCESSIBLE_
++#ifndef QT_NO_ACCESSIBILITY
+ 
+ #include "kateviewinternal.h"
+ #include "katetextcursor.h"
+@@ -318,3 +319,4 @@
+ }
+ 
+ #endif
++#endif
+diff -ur kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp kdelibs-4.5.95/kate/view/kateviewinternal.cpp
+--- kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp	2010-12-03 17:57:05.000000000 +0300
++++ kdelibs-4.5.95/kate/view/kateviewinternal.cpp	2011-01-11 11:36:51.968811481 +0300
+@@ -216,7 +216,9 @@
+   connect( m_view, SIGNAL( selectionChanged(KTextEditor::View*) ),
+              this, SLOT( viewSelectionChanged() ) );
+ 
++#ifndef QT_NO_ACCESSIBILITY
+   QAccessible::installFactory(accessibleInterfaceFactory);
++#endif
+ 
+   // update is called in KateView, after construction and layout is over
+   // but before any other kateviewinternal call
+@@ -224,7 +226,9 @@
+ 
+ KateViewInternal::~KateViewInternal ()
+ {
++#ifndef QT_NO_ACCESSIBILITY
+   QAccessible::removeFactory(accessibleInterfaceFactory);
++#endif
+ 
+   // kill preedit ranges
+   delete m_imPreeditRange;
+@@ -646,7 +650,9 @@
+ 
+   m_madeVisible = !force;
+ 
++#ifndef QT_NO_ACCESSIBILITY
+   QAccessible::updateAccessibility( this, KateCursorAccessible::ChildId, QAccessible::Focus );
++#endif
+ }
+ 
+ void KateViewInternal::slotRegionVisibilityChangedAt(unsigned int,bool clear_cache)
diff --git a/kde-base/kdelibs/kdelibs-4.6.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.6.0-r1.ebuild
index c4dbd8024a29..796f09935d6f 100644
--- a/kde-base/kdelibs/kdelibs-4.6.0-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.0-r1.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/kdelibs/kdelibs-4.6.0-r1.ebuild,v 1.1 2011/02/02 11:13:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.0-r1.ebuild,v 1.2 2011/02/27 20:48:57 dilfridge Exp $
 
 EAPI="3"
 
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
 	"${FILESDIR}/${PN}-4.6.0-logoutcrash.patch"
+	"${FILESDIR}/${PN}-4.6.0-kateacc.patch"
 )
 
 src_prepare() {