Date: Friday, February 6, 2015 @ 10:01:34
Author: arojas
Revision: 127181
Apply patch
Modified:
kcm-touchpad-frameworks/trunk/PKGBUILD
kcm-touchpad-frameworks/trunk/fix-plasmoid.patch
--------------------+
PKGBUILD | 11 ++++-
fix-plasmoid.patch | 97 ++++++---------------------------------------------
2 files changed, 21 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-06 08:37:01 UTC (rev 127180)
+++ PKGBUILD 2015-02-06 09:01:34 UTC (rev 127181)
@@ -4,7 +4,7 @@
pkgname=kcm-touchpad-frameworks
pkgver=5.1.95
-pkgrel=2
+pkgrel=3
pkgdesc='KCM, daemon and applet for touchpad'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
@@ -13,12 +13,17 @@
makedepends=('extra-cmake-modules' 'xorg-server-devel')
groups=('plasma-next')
conflicts=('kcm-touchpad')
-source=("http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz";)
+source=("http://download.kde.org/unstable/plasma/$pkgver/kcm-touchpad-$pkgver.tar.xz";
'fix-plasmoid.patch')
install=$pkgname.install
-md5sums=('25f22612196f820dafe395cdf2fdf0a8')
+md5sums=('25f22612196f820dafe395cdf2fdf0a8'
+ '1e47e7680850b14432f880fa27c8237b')
prepare() {
mkdir -p build
+
+ cd kcm-touchpad-$pkgver
+# fix plasmoid loading
+ patch -p1 -i $srcdir/fix-plasmoid.patch
}
build() {
Modified: fix-plasmoid.patch
===================================================================
--- fix-plasmoid.patch 2015-02-06 08:37:01 UTC (rev 127180)
+++ fix-plasmoid.patch 2015-02-06 09:01:34 UTC (rev 127181)
@@ -1,63 +1,5 @@
-From: Lukáš Tinkl <lu...@kde.org>
-Date: Thu, 22 Jan 2015 16:20:38 +0000
-Subject: load the translation catalog correctly
-X-Git-Url:
http://quickgit.kde.org/?p=kcm-touchpad.git&a=commitdiff&h=7494875a95ccfacc407eb0278f8c1deb71b2b949
----
-load the translation catalog correctly
-
-also unbreak the dataengine loading and the applet
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(kcm-touchpad)
- set(PROJECT_VERSION "5.1.95")
- cmake_minimum_required(VERSION 2.8.12)
-+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_touchpad\")
-
- set(CMAKE_MODULE_PATH
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
-
---- a/src/applet/CMakeLists.txt
-+++ b/src/applet/CMakeLists.txt
-@@ -1,3 +1,6 @@
-+remove_definitions(-DTRANSLATION_DOMAIN="kcm_touchpad")
-+add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_touchpad")
-+
- add_subdirectory(qml)
-
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dataengine.desktop"
-@@ -23,14 +26,16 @@
- Qt5::DBus
- )
-
-+kcoreaddons_desktop_to_json(plasma_engine_touchpad
${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-touchpad.desktop)
-+
- install(TARGETS plasma_engine_touchpad
-- DESTINATION ${PLUGIN_INSTALL_DIR}
-+ DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine
- )
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-dataengine-touchpad.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}
- )
- install(FILES touchpad.operations
-- DESTINATION ${DATA_INSTALL_DIR}/plasma/services
-+ DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services
- )
- install(FILES touchpad.svg
- DESTINATION ${DATA_INSTALL_DIR}/plasma/desktoptheme/default/icons
-
---- a/src/applet/dataengine.desktop
-+++ b/src/applet/dataengine.desktop
-@@ -44,5 +44,3 @@
- X-KDE-PluginInfo-License=GPL
- X-KDE-PluginInfo-EnabledByDefault=true
-
--X-Plasma-EngineName=touchpad
--
-
+diff --git a/src/applet/qml/contents/ui/touchpad.qml
b/src/applet/qml/contents/ui/touchpad.qml
+index 2dcb808..00f0f5d 100644
--- a/src/applet/qml/contents/ui/touchpad.qml
+++ b/src/applet/qml/contents/ui/touchpad.qml
@@ -21,7 +21,6 @@
@@ -68,7 +10,7 @@
Item {
id: root
-@@ -84,28 +83,28 @@
+@@ -84,28 +83,28 @@ Item {
}
}
@@ -85,7 +27,14 @@
- mainText: {
- if (!hasTouchpad) {
- return i18n("No touchpad was found");
-+
+- }
+
+- return enabled ? i18n("Touchpad is enabled")
+- : i18n("Touchpad is disabled")
+- }
+- image: {
+- if (!hasTouchpad) {
+- return "dialog-error"
+ PlasmaCore.ToolTipArea {
+ mainText: {
+ if (!hasTouchpad) {
@@ -100,29 +49,9 @@
+ return "dialog-error"
+ }
-- return enabled ? i18n("Touchpad is enabled")
-- : i18n("Touchpad is disabled")
-- }
-- image: {
-- if (!hasTouchpad) {
-- return "dialog-error"
+- return enabled ? "input-touchpad" : "process-stop"
+ return enabled ? "input-touchpad" : "process-stop"
- }
--
-- return enabled ? "input-touchpad" : "process-stop"
++ }
}
}
-
---- a/src/applet/touchpadengine.cpp
-+++ b/src/applet/touchpadengine.cpp
-@@ -80,5 +80,7 @@
- {
- }
-
--//K_EXPORT_PLASMA_DATAENGINE(touchpad, TouchpadEngine)
-+K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(touchpad, TouchpadEngine,
"plasma-dataengine-touchpad.json")
-
-+#include "touchpadengine.moc"
-+
-
