| 1 |
commit: ba93db5b57a79a9b9c7a89feae4f118aef61828e |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 23 07:55:32 2012 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 23 07:55:32 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ba93db5b |
| 7 |
|
| 8 |
[kde-base/kdelibs] Fully remove calculator key patch. |
| 9 |
|
| 10 |
This is fixed upstream in 1c7ae18ef5d1b7adbb271c1164d0d899eb6d4ed8. |
| 11 |
|
| 12 |
(Portage version: 2.1.11.10/git/Linux x86_64, unsigned Manifest commit) |
| 13 |
|
| 14 |
--- |
| 15 |
.../files/kdelibs-4.8.2-calculator_key.patch | 11 ----------- |
| 16 |
kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild | 1 - |
| 17 |
kde-base/kdelibs/kdelibs-9999.ebuild | 1 - |
| 18 |
3 files changed, 0 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch b/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index 4c481c6..0000000 |
| 23 |
--- a/kde-base/kdelibs/files/kdelibs-4.8.2-calculator_key.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,11 +0,0 @@ |
| 26 |
---- kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:53:49.480771132 -0200 |
| 27 |
-+++ kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:20:38.912403430 -0200 |
| 28 |
-@@ -355,7 +355,7 @@ |
| 29 |
- { Qt::Key_MediaRecord, XF86XK_AudioRecord }, |
| 30 |
- { Qt::Key_LaunchMail, XF86XK_Mail }, |
| 31 |
- { Qt::Key_Launch0, XF86XK_MyComputer }, |
| 32 |
-- { Qt::Key_Calculator, XF86XK_Calculator }, |
| 33 |
-+ { Qt::Key_Launch1, XF86XK_Calculator }, |
| 34 |
- { Qt::Key_Memo, XF86XK_Memo }, |
| 35 |
- { Qt::Key_ToDoList, XF86XK_ToDoList }, |
| 36 |
- { Qt::Key_Calendar, XF86XK_Calendar }, |
| 37 |
|
| 38 |
diff --git a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild |
| 39 |
index 0d599aa..f6d4261 100644 |
| 40 |
--- a/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild |
| 41 |
+++ b/kde-base/kdelibs/kdelibs-4.9.49.9999.ebuild |
| 42 |
@@ -142,7 +142,6 @@ PATCHES=( |
| 43 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 44 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 45 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 46 |
- "${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
| 47 |
"${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
| 48 |
) |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 52 |
index 0b55157..da90413 100644 |
| 53 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
| 54 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 55 |
@@ -144,7 +144,6 @@ PATCHES=( |
| 56 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 57 |
"${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
| 58 |
) |
| 59 |
-#"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" doesn't apply at all anymore |
| 60 |
|
| 61 |
pkg_pretend() { |
| 62 |
if [[ ${MERGE_TYPE} != binary ]]; then |
Archives