Gentoo Archives: gentoo-commits

From: "Andreas K. Huettel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/
Date: Sun, 27 Feb 2011 20:45:23
Message-Id: 2ab0b518fba47b1ea0c4334fde2b8c85d36e09a0.dilfridge@gentoo
1 commit: 2ab0b518fba47b1ea0c4334fde2b8c85d36e09a0
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Sun Feb 27 20:46:06 2011 +0000
4 Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 27 20:46:06 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2ab0b518
7
8 [kde-base/kdelibs] Include no accessibility fix, bug 355969
9
10 (Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch | 49 ++++++++++++++++++++
14 kde-base/kdelibs/kdelibs-4.6.1.ebuild | 1 +
15 kde-base/kdelibs/kdelibs-4.6.9999.ebuild | 1 +
16 kde-base/kdelibs/kdelibs-9999.ebuild | 1 +
17 4 files changed, 52 insertions(+), 0 deletions(-)
18
19 diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
20 new file mode 100644
21 index 0000000..80bcfc5
22 --- /dev/null
23 +++ b/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
24 @@ -0,0 +1,49 @@
25 +diff -ur kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h kdelibs-4.5.95/kate/view/kateviewaccessible.h
26 +--- kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h 2010-11-11 17:41:28.000000000 +0300
27 ++++ kdelibs-4.5.95/kate/view/kateviewaccessible.h 2011-01-11 11:37:15.288810505 +0300
28 +@@ -19,6 +19,7 @@
29 +
30 + #ifndef _KATE_VIEW_ACCESSIBLE_
31 + #define _KATE_VIEW_ACCESSIBLE_
32 ++#ifndef QT_NO_ACCESSIBILITY
33 +
34 + #include "kateviewinternal.h"
35 + #include "katetextcursor.h"
36 +@@ -318,3 +319,4 @@
37 + }
38 +
39 + #endif
40 ++#endif
41 +diff -ur kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp kdelibs-4.5.95/kate/view/kateviewinternal.cpp
42 +--- kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp 2010-12-03 17:57:05.000000000 +0300
43 ++++ kdelibs-4.5.95/kate/view/kateviewinternal.cpp 2011-01-11 11:36:51.968811481 +0300
44 +@@ -216,7 +216,9 @@
45 + connect( m_view, SIGNAL( selectionChanged(KTextEditor::View*) ),
46 + this, SLOT( viewSelectionChanged() ) );
47 +
48 ++#ifndef QT_NO_ACCESSIBILITY
49 + QAccessible::installFactory(accessibleInterfaceFactory);
50 ++#endif
51 +
52 + // update is called in KateView, after construction and layout is over
53 + // but before any other kateviewinternal call
54 +@@ -224,7 +226,9 @@
55 +
56 + KateViewInternal::~KateViewInternal ()
57 + {
58 ++#ifndef QT_NO_ACCESSIBILITY
59 + QAccessible::removeFactory(accessibleInterfaceFactory);
60 ++#endif
61 +
62 + // kill preedit ranges
63 + delete m_imPreeditRange;
64 +@@ -646,7 +650,9 @@
65 +
66 + m_madeVisible = !force;
67 +
68 ++#ifndef QT_NO_ACCESSIBILITY
69 + QAccessible::updateAccessibility( this, KateCursorAccessible::ChildId, QAccessible::Focus );
70 ++#endif
71 + }
72 +
73 + void KateViewInternal::slotRegionVisibilityChangedAt(unsigned int,bool clear_cache)
74
75 diff --git a/kde-base/kdelibs/kdelibs-4.6.1.ebuild b/kde-base/kdelibs/kdelibs-4.6.1.ebuild
76 index 084927c..dde724f 100644
77 --- a/kde-base/kdelibs/kdelibs-4.6.1.ebuild
78 +++ b/kde-base/kdelibs/kdelibs-4.6.1.ebuild
79 @@ -134,6 +134,7 @@ PATCHES=(
80 # "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
81 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
82 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
83 + "${FILESDIR}/${PN}-4.6.0-kateacc.patch"
84 )
85
86 src_prepare() {
87
88 diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
89 index 128ac16..0efaedf 100644
90 --- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
91 +++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
92 @@ -134,6 +134,7 @@ PATCHES=(
93 # "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
94 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
95 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
96 + "${FILESDIR}/${PN}-4.6.0-kateacc.patch"
97 )
98
99 src_prepare() {
100
101 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
102 index 128ac16..0efaedf 100644
103 --- a/kde-base/kdelibs/kdelibs-9999.ebuild
104 +++ b/kde-base/kdelibs/kdelibs-9999.ebuild
105 @@ -134,6 +134,7 @@ PATCHES=(
106 # "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above
107 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
108 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
109 + "${FILESDIR}/${PN}-4.6.0-kateacc.patch"
110 )
111
112 src_prepare() {