| 1 |
commit: 4bd043d5e5e7e78c3e2238b331057d6fbd4a1353 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 1 16:08:23 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 1 16:08:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd043d5 |
| 7 |
|
| 8 |
kde-plasma/kmenuedit: backport patch from upstream solving build failure with USE="-hotkeys" |
| 9 |
|
| 10 |
Gentoo-bug: 578620 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
.../kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch | 44 ++++++++++++++++++++++ |
| 15 |
kde-plasma/kmenuedit/kmenuedit-5.5.5.ebuild | 2 + |
| 16 |
kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild | 2 + |
| 17 |
3 files changed, 48 insertions(+) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch b/kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..18e9f76 |
| 22 |
--- /dev/null |
| 23 |
+++ b/kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch |
| 24 |
@@ -0,0 +1,44 @@ |
| 25 |
+From fe425d0fbfe32101a5bb232a65a19785e2ef687f Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Michael Palimaka <kensington@g.o> |
| 27 |
+Date: Fri, 1 Apr 2016 05:17:40 +1100 |
| 28 |
+Subject: [PATCH] Fix build when KHotKeysDBusInterface is disabled/missing. |
| 29 |
+ |
| 30 |
+Summary: |
| 31 |
+By testing the variable itself (rather than its contents) we avoid a failure |
| 32 |
+when KHotKeysDBusInterface is disabled or missing as KHotKeysDBusInterface_FOUND |
| 33 |
+will not be defined. |
| 34 |
+ |
| 35 |
+Reviewers: #plasma, graesslin |
| 36 |
+ |
| 37 |
+Reviewed By: #plasma, graesslin |
| 38 |
+ |
| 39 |
+Differential Revision: https://phabricator.kde.org/D1278 |
| 40 |
+--- |
| 41 |
+ CMakeLists.txt | 4 ++-- |
| 42 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 43 |
+ |
| 44 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 45 |
+index c615d9f..a2e43ae 100644 |
| 46 |
+--- a/CMakeLists.txt |
| 47 |
++++ b/CMakeLists.txt |
| 48 |
+@@ -43,7 +43,7 @@ set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab |
| 49 |
+ ########### next target ############### |
| 50 |
+ qt5_add_dbus_adaptor( kmenueditcommon_STAT_SRCS org.kde.kmenuedit.xml kmenuedit.h KMenuEdit) |
| 51 |
+ |
| 52 |
+-if(NOT WIN32 AND ${KHotKeysDBusInterface_FOUND}) |
| 53 |
++if(NOT WIN32 AND KHotKeysDBusInterface_FOUND) |
| 54 |
+ qt5_add_dbus_interface( |
| 55 |
+ kmenueditcommon_STAT_SRCS |
| 56 |
+ ${KHOTKEYS_DBUS_INTERFACE} |
| 57 |
+@@ -82,7 +82,7 @@ install(TARGETS kmenuedit ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) |
| 58 |
+ install( PROGRAMS org.kde.kmenuedit.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) |
| 59 |
+ install( FILES kmenueditui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kmenuedit ) |
| 60 |
+ |
| 61 |
+-if(NOT WIN32 AND ${KHotKeysDBusInterface_FOUND}) |
| 62 |
++if(NOT WIN32 AND KHotKeysDBusInterface_FOUND) |
| 63 |
+ add_dependencies(kdeinit_kmenuedit kded_khotkeys) |
| 64 |
+ endif() |
| 65 |
+ |
| 66 |
+-- |
| 67 |
+2.7.3 |
| 68 |
+ |
| 69 |
|
| 70 |
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.5.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.5.5.ebuild |
| 71 |
index 1f17739..cdea103 100644 |
| 72 |
--- a/kde-plasma/kmenuedit/kmenuedit-5.5.5.ebuild |
| 73 |
+++ b/kde-plasma/kmenuedit/kmenuedit-5.5.5.ebuild |
| 74 |
@@ -36,6 +36,8 @@ RDEPEND="${DEPEND} |
| 75 |
!kde-base/kmenuedit:4 |
| 76 |
" |
| 77 |
|
| 78 |
+PATCHES=( "${FILESDIR}/${PN}-5.5.5-hotkeys.patch" ) |
| 79 |
+ |
| 80 |
src_configure() { |
| 81 |
local mycmakeargs=( |
| 82 |
$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface) |
| 83 |
|
| 84 |
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild |
| 85 |
index 1f17739..cdea103 100644 |
| 86 |
--- a/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild |
| 87 |
+++ b/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild |
| 88 |
@@ -36,6 +36,8 @@ RDEPEND="${DEPEND} |
| 89 |
!kde-base/kmenuedit:4 |
| 90 |
" |
| 91 |
|
| 92 |
+PATCHES=( "${FILESDIR}/${PN}-5.5.5-hotkeys.patch" ) |
| 93 |
+ |
| 94 |
src_configure() { |
| 95 |
local mycmakeargs=( |
| 96 |
$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface) |
Archives