Gentoo Archives: gentoo-commits

From: Tomas Chvatal <scarabeus@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, 01 May 2011 22:14:04
Message-Id: e58a95bd32024e1205b90da1ce626a855447f7ac.scarabeus@gentoo
1 commit: e58a95bd32024e1205b90da1ce626a855447f7ac
2 Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 22:13:02 2011 +0000
4 Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 22:13:02 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e58a95bd
7
8 [kde-base/kdelibs] Drop kate patch as acessibility is harddep
9
10 ---
11 kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch | 49 --------------------
12 kde-base/kdelibs/kdelibs-4.6.3.ebuild | 1 -
13 kde-base/kdelibs/kdelibs-4.6.9999.ebuild | 1 -
14 kde-base/kdelibs/kdelibs-9999.ebuild | 1 -
15 4 files changed, 0 insertions(+), 52 deletions(-)
16
17 diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
18 deleted file mode 100644
19 index 80bcfc5..0000000
20 --- a/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
21 +++ /dev/null
22 @@ -1,49 +0,0 @@
23 -diff -ur kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h kdelibs-4.5.95/kate/view/kateviewaccessible.h
24 ---- kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h 2010-11-11 17:41:28.000000000 +0300
25 -+++ kdelibs-4.5.95/kate/view/kateviewaccessible.h 2011-01-11 11:37:15.288810505 +0300
26 -@@ -19,6 +19,7 @@
27 -
28 - #ifndef _KATE_VIEW_ACCESSIBLE_
29 - #define _KATE_VIEW_ACCESSIBLE_
30 -+#ifndef QT_NO_ACCESSIBILITY
31 -
32 - #include "kateviewinternal.h"
33 - #include "katetextcursor.h"
34 -@@ -318,3 +319,4 @@
35 - }
36 -
37 - #endif
38 -+#endif
39 -diff -ur kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp kdelibs-4.5.95/kate/view/kateviewinternal.cpp
40 ---- kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp 2010-12-03 17:57:05.000000000 +0300
41 -+++ kdelibs-4.5.95/kate/view/kateviewinternal.cpp 2011-01-11 11:36:51.968811481 +0300
42 -@@ -216,7 +216,9 @@
43 - connect( m_view, SIGNAL( selectionChanged(KTextEditor::View*) ),
44 - this, SLOT( viewSelectionChanged() ) );
45 -
46 -+#ifndef QT_NO_ACCESSIBILITY
47 - QAccessible::installFactory(accessibleInterfaceFactory);
48 -+#endif
49 -
50 - // update is called in KateView, after construction and layout is over
51 - // but before any other kateviewinternal call
52 -@@ -224,7 +226,9 @@
53 -
54 - KateViewInternal::~KateViewInternal ()
55 - {
56 -+#ifndef QT_NO_ACCESSIBILITY
57 - QAccessible::removeFactory(accessibleInterfaceFactory);
58 -+#endif
59 -
60 - // kill preedit ranges
61 - delete m_imPreeditRange;
62 -@@ -646,7 +650,9 @@
63 -
64 - m_madeVisible = !force;
65 -
66 -+#ifndef QT_NO_ACCESSIBILITY
67 - QAccessible::updateAccessibility( this, KateCursorAccessible::ChildId, QAccessible::Focus );
68 -+#endif
69 - }
70 -
71 - void KateViewInternal::slotRegionVisibilityChangedAt(unsigned int,bool clear_cache)
72
73 diff --git a/kde-base/kdelibs/kdelibs-4.6.3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
74 index e3922bd..51c7d4e 100644
75 --- a/kde-base/kdelibs/kdelibs-4.6.3.ebuild
76 +++ b/kde-base/kdelibs/kdelibs-4.6.3.ebuild
77 @@ -132,7 +132,6 @@ PATCHES=(
78 "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
79 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
80 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
81 - "${FILESDIR}/${PN}-4.6.0-kateacc.patch"
82 "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
83 )
84
85
86 diff --git a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
87 index 124c5b3..c448e29 100644
88 --- a/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
89 +++ b/kde-base/kdelibs/kdelibs-4.6.9999.ebuild
90 @@ -132,7 +132,6 @@ PATCHES=(
91 "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
92 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
93 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
94 - "${FILESDIR}/${PN}-4.6.0-kateacc.patch"
95 "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
96 )
97
98
99 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
100 index b531bea..1196c44 100644
101 --- a/kde-base/kdelibs/kdelibs-9999.ebuild
102 +++ b/kde-base/kdelibs/kdelibs-9999.ebuild
103 @@ -132,7 +132,6 @@ PATCHES=(
104 "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
105 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
106 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
107 - "${FILESDIR}/${PN}-4.6.0-kateacc.patch"
108 "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
109 )