Date: Friday, February 6, 2015 @ 09:37:01
Author: arojas
Revision: 127180
archrelease: copy trunk to community-i686, community-x86_64
Added:
kcm-touchpad-frameworks/repos/
kcm-touchpad-frameworks/repos/community-i686/
kcm-touchpad-frameworks/repos/community-i686/PKGBUILD
(from rev 127179, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch
(from rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
(from rev 127179,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
kcm-touchpad-frameworks/repos/community-x86_64/
kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD
(from rev 127179, kcm-touchpad-frameworks/trunk/PKGBUILD)
kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch
(from rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
(from rev 127179,
kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
--------------------------------------------------+
community-i686/PKGBUILD | 36 +++++
community-i686/fix-plasmoid.patch | 128 +++++++++++++++++++++
community-i686/kcm-touchpad-frameworks.install | 11 +
community-x86_64/PKGBUILD | 36 +++++
community-x86_64/fix-plasmoid.patch | 128 +++++++++++++++++++++
community-x86_64/kcm-touchpad-frameworks.install | 11 +
6 files changed, 350 insertions(+)
Copied: kcm-touchpad-frameworks/repos/community-i686/PKGBUILD (from rev 127179,
kcm-touchpad-frameworks/trunk/PKGBUILD)
===================================================================
--- repos/community-i686/PKGBUILD (rev 0)
+++ repos/community-i686/PKGBUILD 2015-02-06 08:37:01 UTC (rev 127180)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Alexander Mezin <mezin.alexan...@gmail.com>
+
+pkgname=kcm-touchpad-frameworks
+pkgver=5.1.95
+pkgrel=2
+pkgdesc='KCM, daemon and applet for touchpad'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
+license=('GPL')
+depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
+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";)
+install=$pkgname.install
+md5sums=('25f22612196f820dafe395cdf2fdf0a8')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../kcm-touchpad-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kcm-touchpad-frameworks/repos/community-i686/fix-plasmoid.patch (from
rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
===================================================================
--- repos/community-i686/fix-plasmoid.patch (rev 0)
+++ repos/community-i686/fix-plasmoid.patch 2015-02-06 08:37:01 UTC (rev
127180)
@@ -0,0 +1,128 @@
+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
+-
+
+--- a/src/applet/qml/contents/ui/touchpad.qml
++++ b/src/applet/qml/contents/ui/touchpad.qml
+@@ -21,7 +21,6 @@
+ import QtQuick 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+-import org.kde.qtextracomponents 2.0
+
+ Item {
+ id: root
+@@ -84,28 +83,28 @@
+ }
+ }
+
+- QIconItem {
++ PlasmaCore.IconItem {
+ anchors.fill: parent
+ visible: !hasTouchpad
+- icon: "dialog-warning"
+- }
++ source: "dialog-warning"
+
+- PlasmaCore.ToolTip {
+- target: root
+- mainText: {
+- if (!hasTouchpad) {
+- return i18n("No touchpad was found");
++
++ PlasmaCore.ToolTipArea {
++ 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"
++ }
+
+- 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"
+ }
+ }
+
+
+--- 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"
++
+
Copied:
kcm-touchpad-frameworks/repos/community-i686/kcm-touchpad-frameworks.install
(from rev 127179, kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
===================================================================
--- repos/community-i686/kcm-touchpad-frameworks.install
(rev 0)
+++ repos/community-i686/kcm-touchpad-frameworks.install 2015-02-06
08:37:01 UTC (rev 127180)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kcm-touchpad-frameworks/repos/community-x86_64/PKGBUILD (from rev
127179, kcm-touchpad-frameworks/trunk/PKGBUILD)
===================================================================
--- repos/community-x86_64/PKGBUILD (rev 0)
+++ repos/community-x86_64/PKGBUILD 2015-02-06 08:37:01 UTC (rev 127180)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Alexander Mezin <mezin.alexan...@gmail.com>
+
+pkgname=kcm-touchpad-frameworks
+pkgver=5.1.95
+pkgrel=2
+pkgdesc='KCM, daemon and applet for touchpad'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kcm-touchpad'
+license=('GPL')
+depends=('xf86-input-synaptics' 'xcb-util-cursor' 'plasma-framework'
'knotifyconfig' 'kded')
+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";)
+install=$pkgname.install
+md5sums=('25f22612196f820dafe395cdf2fdf0a8')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../kcm-touchpad-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kcm-touchpad-frameworks/repos/community-x86_64/fix-plasmoid.patch (from
rev 127179, kcm-touchpad-frameworks/trunk/fix-plasmoid.patch)
===================================================================
--- repos/community-x86_64/fix-plasmoid.patch (rev 0)
+++ repos/community-x86_64/fix-plasmoid.patch 2015-02-06 08:37:01 UTC (rev
127180)
@@ -0,0 +1,128 @@
+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
+-
+
+--- a/src/applet/qml/contents/ui/touchpad.qml
++++ b/src/applet/qml/contents/ui/touchpad.qml
+@@ -21,7 +21,6 @@
+ import QtQuick 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+-import org.kde.qtextracomponents 2.0
+
+ Item {
+ id: root
+@@ -84,28 +83,28 @@
+ }
+ }
+
+- QIconItem {
++ PlasmaCore.IconItem {
+ anchors.fill: parent
+ visible: !hasTouchpad
+- icon: "dialog-warning"
+- }
++ source: "dialog-warning"
+
+- PlasmaCore.ToolTip {
+- target: root
+- mainText: {
+- if (!hasTouchpad) {
+- return i18n("No touchpad was found");
++
++ PlasmaCore.ToolTipArea {
++ 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"
++ }
+
+- 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"
+ }
+ }
+
+
+--- 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"
++
+
Copied:
kcm-touchpad-frameworks/repos/community-x86_64/kcm-touchpad-frameworks.install
(from rev 127179, kcm-touchpad-frameworks/trunk/kcm-touchpad-frameworks.install)
===================================================================
--- repos/community-x86_64/kcm-touchpad-frameworks.install
(rev 0)
+++ repos/community-x86_64/kcm-touchpad-frameworks.install 2015-02-06
08:37:01 UTC (rev 127180)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
