[kcm_touchpad] * Tue Feb 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-6 - Merge bugfixes from Kubuntu, fix
Kevin Kofler
kkofler at fedoraproject.org
Tue Feb 8 10:28:43 UTC 2011
commit 17b00250504545f7355d034bde18cac4b1264395
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Tue Feb 8 11:28:22 2011 +0100
* Tue Feb 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-6
- Merge bugfixes from Kubuntu, fixes circular scrolling and more (#633353)
- Drop default kcmtouchpadrc, use driver defaults (#611611)
- Make the Scrolling tab use a vertical scrollbar if needed (#600121)
...ouchpad-0.3.1-disable-smart-mode-settings.patch | 13 ++
kcm_touchpad-0.3.1-fix-circular-scrolling.patch | 35 ++++
kcm_touchpad-0.3.1-fix-high-sensitivity.patch | 29 +++
kcm_touchpad-0.3.1-load-error-checking.patch | 194 ++++++++++++++++++++
..._touchpad-0.3.1-new-systemsettings-layout.patch | 0
kcm_touchpad-0.3.1-scrollbar.patch | 42 +++++
kcm_touchpad.spec | 29 +++-
kcmtouchpadrc | 26 ---
8 files changed, 335 insertions(+), 33 deletions(-)
---
diff --git a/kcm_touchpad-0.3.1-disable-smart-mode-settings.patch b/kcm_touchpad-0.3.1-disable-smart-mode-settings.patch
new file mode 100644
index 0000000..bbd0334
--- /dev/null
+++ b/kcm_touchpad-0.3.1-disable-smart-mode-settings.patch
@@ -0,0 +1,13 @@
+Index: kcm-touchpad-0.3.1/kcmtouchpad.cpp
+===================================================================
+--- kcm-touchpad-0.3.1.orig/kcmtouchpad.cpp 2010-04-11 20:34:50.509642139 -0400
++++ kcm-touchpad-0.3.1/kcmtouchpad.cpp 2010-04-11 20:35:50.388643170 -0400
+@@ -79,6 +79,8 @@
+ // "Touchpad Allow Moving" check box
+ connect(ui->TouchpadOffWOMoveCB, SIGNAL(toggled(bool)), this, SLOT(touchpadAllowedMoving(bool)));
+
++ // Kubuntu patch; don't show this, since the feature isn't there yet.
++ ui->SmartModeGB->setHidden(true);
+ //connect(ui->SmartModeEnableCB, SIGNAL(toggled(bool)), this, SLOT(smartModeEnabled(bool)));
+ //connect(ui->SmartModeDelayS, SIGNAL(valueChanged(int)), this, SLOT(smartModeDelayChanged(int)));
+
diff --git a/kcm_touchpad-0.3.1-fix-circular-scrolling.patch b/kcm_touchpad-0.3.1-fix-circular-scrolling.patch
new file mode 100644
index 0000000..06cc0c6
--- /dev/null
+++ b/kcm_touchpad-0.3.1-fix-circular-scrolling.patch
@@ -0,0 +1,35 @@
+Index: kcm-touchpad-0.3.1/kcmtouchpad.cpp
+===================================================================
+--- kcm-touchpad-0.3.1.orig/kcmtouchpad.cpp 2010-07-19 11:41:02.128000002 -0400
++++ kcm-touchpad-0.3.1/kcmtouchpad.cpp 2010-07-19 11:42:52.032000003 -0400
+@@ -505,7 +505,7 @@
+ Touchpad::set_parameter("CircularScrolling", ui->ScrollCircularEnableCB->isChecked());
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_DIST)) {
+- Touchpad::set_parameter("CircScrollDelta", ui->ScrollCircularSpeedS->value());
++ Touchpad::set_parameter("CircScrollDelta", ui->ScrollCircularSpeedS->value() / 100.0f);
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_TRIGGER)) {
+ Touchpad::set_parameter("CircScrollTrigger", ui->ScrollCircularCornersCBB->currentIndex());
+@@ -764,7 +764,7 @@
+ Touchpad::set_parameter("CircularScrolling", config.readEntry("CircularScrolling", -1));
+ }
+ if (propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_DIST)) {
+- Touchpad::set_parameter("CircScrollDelta", config.readEntry("CircScrollDelta", -1));
++ Touchpad::set_parameter("CircScrollDelta", config.readEntry("CircScrollDelta", -1) / 100.0f);
+ }
+ if (propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_TRIGGER)) {
+ Touchpad::set_parameter("CircScrollTrigger", (Synaptics::ScrollTrigger)config.readEntry("CircScrollTrigger", -1));
+Index: kcm-touchpad-0.3.1/kcmtouchpadwidget.ui
+===================================================================
+--- kcm-touchpad-0.3.1.orig/kcmtouchpadwidget.ui 2010-07-19 11:41:11.892000001 -0400
++++ kcm-touchpad-0.3.1/kcmtouchpadwidget.ui 2010-07-19 11:43:20.840000002 -0400
+@@ -796,7 +796,7 @@
+ <string>Move angle (radians) of finger to generate a scroll event.</string>
+ </property>
+ <property name="minimum">
+- <number>30</number>
++ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>300</number>
diff --git a/kcm_touchpad-0.3.1-fix-high-sensitivity.patch b/kcm_touchpad-0.3.1-fix-high-sensitivity.patch
new file mode 100644
index 0000000..bf49431
--- /dev/null
+++ b/kcm_touchpad-0.3.1-fix-high-sensitivity.patch
@@ -0,0 +1,29 @@
+diff -Nur kcm-touchpad-0.3.1.orig/kcmtouchpadwidget.ui kcm-touchpad-0.3.1/kcmtouchpadwidget.ui
+--- kcm-touchpad-0.3.1.orig/kcmtouchpadwidget.ui 2010-01-12 14:02:07.000000000 +0100
++++ kcm-touchpad-0.3.1/kcmtouchpadwidget.ui 2010-04-24 00:56:02.175243897 +0200
+@@ -376,10 +376,10 @@
+ <string>Move distance of the finger for a vertical scroll event.</string>
+ </property>
+ <property name="minimum">
+- <number>0</number>
++ <number>1</number>
+ </property>
+ <property name="maximum">
+- <number>400</number>
++ <number>401</number>
+ </property>
+ <property name="singleStep">
+ <number>50</number>
+@@ -557,10 +557,10 @@
+ <string>Move distance of the finger for a horizontal scroll event.</string>
+ </property>
+ <property name="minimum">
+- <number>0</number>
++ <number>1</number>
+ </property>
+ <property name="maximum">
+- <number>400</number>
++ <number>401</number>
+ </property>
+ <property name="singleStep">
+ <number>50</number>
diff --git a/kcm_touchpad-0.3.1-load-error-checking.patch b/kcm_touchpad-0.3.1-load-error-checking.patch
new file mode 100644
index 0000000..f1319b1
--- /dev/null
+++ b/kcm_touchpad-0.3.1-load-error-checking.patch
@@ -0,0 +1,194 @@
+diff -Nur kcm-touchpad-0.3.1.orig/kcmtouchpad.cpp kcm-touchpad-0.3.1/kcmtouchpad.cpp
+--- kcm-touchpad-0.3.1.orig/kcmtouchpad.cpp 2010-04-24 00:21:40.000000000 +0200
++++ kcm-touchpad-0.3.1/kcmtouchpad.cpp 2010-04-24 00:49:46.345242942 +0200
+@@ -176,6 +176,17 @@
+ }
+ }
+
++const void* TouchpadConfig::get_parameter(const char* name)
++{
++ const void* result = Touchpad::get_parameter(name);
++ if (!result) {
++ setup_failed = true;
++ setEnabled(false);
++ }
++
++ return result;
++}
++
+ /*
+ * This function is called when loading module.
+ * It loads configuration from file "kcmtouchpadrc".
+@@ -190,64 +201,134 @@
+ // loads every entry of configuration and sets corresponding widget
+ // when configuration doesn't exist collect actual value from driver
+
++ const void* value;
++
+ if (this->propertiesList.contains(SYNAPTICS_PROP_OFF)) {
+- ui->TouchpadOnRB->setChecked(!config.readEntry("TouchpadOff", !(int)*(char*)Touchpad::get_parameter("TouchpadOff")));
+- ui->TouchpadOffWOMoveCB->setCheckState(config.readEntry("TouchpadOff", (int)*(char*)Touchpad::get_parameter("TouchpadOff")) == 2 ? Qt::Checked : Qt::Unchecked);
++ value = get_parameter("TouchpadOff");
++ if (!value) return;
++ ui->TouchpadOnRB->setChecked(!config.readEntry("TouchpadOff", !(int)*(char*)value));
++
++ value = get_parameter("TouchpadOff");
++ if (!value) return;
++ ui->TouchpadOffWOMoveCB->setCheckState(config.readEntry("TouchpadOff", (int)*(char*)value) == 2 ? Qt::Checked : Qt::Unchecked);
+ }
+
+ //ui->SmartModeEnableCB->setCheckState(config.readEntry("SmartModeEnabled", false) ? Qt::Checked : Qt::Unchecked);
+ //ui->SmartModeDelayS->setValue(config.readEntry("SmartModeDelay", 1000));
+
+ if (this->propertiesList.contains(SYNAPTICS_PROP_FINGER)) {
+- ui->SensitivityValueS->setValue(config.readEntry("FingerLow", *(int*)Touchpad::get_parameter("FingerLow") / 10));
++ value = get_parameter("FingerLow");
++ if (!value) return;
++ ui->SensitivityValueS->setValue(config.readEntry("FingerLow", *(int*)value / 10));
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_SCROLL_EDGE)) {
+- ui->ScrollVertEnableCB->setCheckState(config.readEntry("VertEdgeScroll", (int)*(char*)Touchpad::get_parameter("VertEdgeScroll")) ? Qt::Checked : Qt::Unchecked);
+- ui->ScrollHorizEnableCB->setCheckState(config.readEntry("HorizEdgeScroll", (int)*(char*)Touchpad::get_parameter("HorizEdgeScroll")) ? Qt::Checked : Qt::Unchecked);
++ value = get_parameter("VertEdgeScroll");
++ if (!value) return;
++ ui->ScrollVertEnableCB->setCheckState(config.readEntry("VertEdgeScroll", (int)*(char*)value) ? Qt::Checked : Qt::Unchecked);
++
++ value = get_parameter("HorizEdgeScroll");
++ if (!value) return;
++ ui->ScrollHorizEnableCB->setCheckState(config.readEntry("HorizEdgeScroll", (int)*(char*)value) ? Qt::Checked : Qt::Unchecked);
++
+ if (this->propertiesList.contains(SYNAPTICS_PROP_COASTING_SPEED)) {
+- ui->ScrollCoastingCornerEnableCB->setCheckState(config.readEntry("CornerCoasting", (int)*(char*)Touchpad::get_parameter("CornerCoasting")) ? Qt::Checked : Qt::Unchecked);
++ value = get_parameter("CornerCoasting");
++ if (!value) return;
++ ui->ScrollCoastingCornerEnableCB->setCheckState(config.readEntry("CornerCoasting", (int)*(char*)value) ? Qt::Checked : Qt::Unchecked);
+ }
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_SCROLL_DISTANCE)) {
+- ui->ScrollVertSpeedS->setValue(config.readEntry("VertScrollDelta", *(int*)Touchpad::get_parameter("VertScrollDelta")));
+- ui->ScrollHorizSpeedS->setValue(config.readEntry("HorizScrollDelta", *(int*)Touchpad::get_parameter("HorizScrollDelta")));
++ value = get_parameter("VertScrollDelta");
++ if (!value) return;
++ ui->ScrollVertSpeedS->setValue(config.readEntry("VertScrollDelta", *(int*)value));
++
++ value = get_parameter("HorizScrollDelta");
++ if (!value) return;
++ ui->ScrollHorizSpeedS->setValue(config.readEntry("HorizScrollDelta", *(int*)value));
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_SCROLL_TWOFINGER)) {
+- ui->ScrollVertTFEnableCB->setCheckState(config.readEntry("VertTwoFingerScroll", (int)*(char*)Touchpad::get_parameter("VertTwoFingerScroll")) ? Qt::Checked : Qt::Unchecked);
+- ui->ScrollHorizTFEnableCB->setCheckState(config.readEntry("HorizTwoFingerScroll", (int)*(char*)Touchpad::get_parameter("HorizTwoFingerScroll")) ? Qt::Checked : Qt::Unchecked);
++ value = get_parameter("VertTwoFingerScroll");
++ if (!value) return;
++ ui->ScrollVertTFEnableCB->setCheckState(config.readEntry("VertTwoFingerScroll", (int)*(char*)value) ? Qt::Checked : Qt::Unchecked);
++
++ value = get_parameter("HorizTwoFingerScroll");
++ if (!value) return;
++ ui->ScrollHorizTFEnableCB->setCheckState(config.readEntry("HorizTwoFingerScroll", (int)*(char*)value) ? Qt::Checked : Qt::Unchecked);
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_COASTING_SPEED)) {
+- ui->ScrollCoastingEnableCB->setCheckState(config.readEntry("CoastingSpeed", *(double*)Touchpad::get_parameter("CoastingSpeed")) ? Qt::Checked : Qt::Unchecked);
+- ui->ScrollCoastingSpeedS->setValue(config.readEntry("CoastingSpeed", *(double*)Touchpad::get_parameter("CoastingSpeed")) * 100.0f);
++ value = get_parameter("CoastingSpeed");
++ if (!value) return;
++ ui->ScrollCoastingEnableCB->setCheckState(config.readEntry("CoastingSpeed", *(double*)value) ? Qt::Checked : Qt::Unchecked);
++
++ value = get_parameter("CoastingSpeed");
++ if (!value) return;
++ ui->ScrollCoastingSpeedS->setValue(config.readEntry("CoastingSpeed", *(double*)value) * 100.0f);
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING)) {
+- ui->ScrollCircularEnableCB->setCheckState(config.readEntry("CircularScrolling", (int)*(char*)Touchpad::get_parameter("CircularScrolling")) ? Qt::Checked : Qt::Unchecked);
++ value = get_parameter("CircularScrolling");
++ if (!value) return;
++ ui->ScrollCircularEnableCB->setCheckState(config.readEntry("CircularScrolling", (int)*(char*)value) ? Qt::Checked : Qt::Unchecked);
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_DIST)) {
+- ui->ScrollCircularSpeedS->setValue(config.readEntry("CircScrollDelta", *(double*)Touchpad::get_parameter("CircScrollDelta")));
++ value = get_parameter("CircScrollDelta");
++ if (!value) return;
++ ui->ScrollCircularSpeedS->setValue(config.readEntry("CircScrollDelta", *(double*)value));
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_CIRCULAR_SCROLLING_TRIGGER)) {
+- ui->ScrollCircularCornersCBB->setCurrentIndex(config.readEntry("CircScrollTrigger", (int)*(char*)Touchpad::get_parameter("CircScrollTrigger")));
++ value = get_parameter("CircScrollTrigger");
++ if (!value) return;
++ ui->ScrollCircularCornersCBB->setCurrentIndex(config.readEntry("CircScrollTrigger", (int)*(char*)value));
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_TAP_TIME)) {
+- ui->TappingEnableCB->setCheckState(config.readEntry("MaxTapTime", *(int*)Touchpad::get_parameter("MaxTapTime")) ? Qt::Checked : Qt::Unchecked);
++ value = get_parameter("MaxTapTime");
++ if (!value) return;
++ ui->TappingEnableCB->setCheckState(config.readEntry("MaxTapTime", *(int*)value) ? Qt::Checked : Qt::Unchecked);
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_TAP_MOVE)) {
+- ui->TappingMaxMoveValueS->setValue(config.readEntry("MaxTapMove", *(int*)Touchpad::get_parameter("MaxTapMove")));
++ value = get_parameter("MaxTapMove");
++ if (!value) return;
++ ui->TappingMaxMoveValueS->setValue(config.readEntry("MaxTapMove", *(int*)value));
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_TAP_DURATIONS)) {
+- ui->TappingTimeoutValueS->setValue(config.readEntry("SingleTapTimeout", *(int*)Touchpad::get_parameter("SingleTapTimeout")));
+- ui->TappingDoubleTimeValueS->setValue(config.readEntry("MaxDoubleTapTime", *(int*)Touchpad::get_parameter("MaxDoubleTapTime")));
+- ui->TappingClickTimeValueS->setValue(config.readEntry("ClickTime", *(int*)Touchpad::get_parameter("ClickTime")));
++ value = get_parameter("SingleTapTimeout");
++ if (!value) return;
++ ui->TappingTimeoutValueS->setValue(config.readEntry("SingleTapTimeout", *(int*)value));
++
++ value = get_parameter("MaxDoubleTapTime");
++ if (!value) return;
++ ui->TappingDoubleTimeValueS->setValue(config.readEntry("MaxDoubleTapTime", *(int*)value));
++
++ value = get_parameter("ClickTime");
++ if (!value) return;
++ ui->TappingClickTimeValueS->setValue(config.readEntry("ClickTime", *(int*)value));
+ }
+ if (this->propertiesList.contains(SYNAPTICS_PROP_TAP_ACTION)) {
+- tappingButtonsMap[Synaptics::OneFinger] = config.readEntry("TapButton1", (int)*(char*)Touchpad::get_parameter("TapButton1"));
+- tappingButtonsMap[Synaptics::TwoFingers] = config.readEntry("TapButton2", (int)*(char*)Touchpad::get_parameter("TapButton2"));
+- tappingButtonsMap[Synaptics::ThreeFingers] = config.readEntry("TapButton3", (int)*(char*)Touchpad::get_parameter("TapButton3"));
+- tappingButtonsMap[Synaptics::RightTop] = config.readEntry("RTCornerButton", (int)*(char*)Touchpad::get_parameter("RTCornerButton"));
+- tappingButtonsMap[Synaptics::RightBottom] = config.readEntry("RBCornerButton", (int)*(char*)Touchpad::get_parameter("RBCornerButton"));
+- tappingButtonsMap[Synaptics::LeftTop] = config.readEntry("LTCornerButton", (int)*(char*)Touchpad::get_parameter("LTCornerButton"));
+- tappingButtonsMap[Synaptics::LeftBottom] = config.readEntry("LBCornerButton", (int)*(char*)Touchpad::get_parameter("LBCornerButton"));
++ value = get_parameter("TapButton1");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::OneFinger] = config.readEntry("TapButton1", (int)*(char*)value);
++
++ value = get_parameter("TapButton2");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::TwoFingers] = config.readEntry("TapButton2", (int)*(char*)value);
++
++ value = get_parameter("TapButton3");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::ThreeFingers] = config.readEntry("TapButton3", (int)*(char*)value);
++
++ value = get_parameter("RTCornerButton");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::RightTop] = config.readEntry("RTCornerButton", (int)*(char*)value);
++
++ value = get_parameter("RBCornerButton");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::RightBottom] = config.readEntry("RBCornerButton", (int)*(char*)value);
++
++ value = get_parameter("LTCornerButton");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::LeftTop] = config.readEntry("LTCornerButton", (int)*(char*)value);
++
++ value = get_parameter("LBCornerButton");
++ if (!value) return;
++ tappingButtonsMap[Synaptics::LeftBottom] = config.readEntry("LBCornerButton", (int)*(char*)value);
+ }
+ }
+
+diff -Nur kcm-touchpad-0.3.1.orig/kcmtouchpad.h kcm-touchpad-0.3.1/kcmtouchpad.h
+--- kcm-touchpad-0.3.1.orig/kcmtouchpad.h 2010-01-12 14:02:07.000000000 +0100
++++ kcm-touchpad-0.3.1/kcmtouchpad.h 2010-04-24 00:57:57.305243725 +0200
+@@ -56,6 +56,7 @@
+ bool apply();
+ static void applySensitivity(int val);
+ void enableProperties();
++ const void* get_parameter(const char* name);
+
+ Ui_TouchpadConfigWidget* ui;
+
diff --git a/kcm_touchpad-new-systemsettings-layout.diff b/kcm_touchpad-0.3.1-new-systemsettings-layout.patch
similarity index 100%
rename from kcm_touchpad-new-systemsettings-layout.diff
rename to kcm_touchpad-0.3.1-new-systemsettings-layout.patch
diff --git a/kcm_touchpad-0.3.1-scrollbar.patch b/kcm_touchpad-0.3.1-scrollbar.patch
new file mode 100644
index 0000000..a435c25
--- /dev/null
+++ b/kcm_touchpad-0.3.1-scrollbar.patch
@@ -0,0 +1,42 @@
+diff -ur mishaaq-kcm_touchpad-00370b5/kcmtouchpadwidget.ui mishaaq-kcm_touchpad-00370b5-scrollbar/kcmtouchpadwidget.ui
+--- mishaaq-kcm_touchpad-00370b5/kcmtouchpadwidget.ui 2010-01-12 14:02:07.000000000 +0100
++++ mishaaq-kcm_touchpad-00370b5-scrollbar/kcmtouchpadwidget.ui 2011-02-08 11:23:16.000000000 +0100
+@@ -322,6 +322,27 @@
+ <string>Scrolling</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
++ <property name="margin">
++ <number>0</number>
++ </property>
++ <item>
++ <widget class="QScrollArea" name="scrollArea">
++ <property name="frameShape">
++ <enum>QFrame::NoFrame</enum>
++ </property>
++ <property name="horizontalScrollBarPolicy">
++ <enum>Qt::ScrollBarAlwaysOff</enum>
++ </property>
++ <widget class="QWidget" name="scrollAreaWidgetContents_2">
++ <property name="geometry">
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>505</width>
++ <height>484</height>
++ </rect>
++ </property>
++ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QGroupBox" name="ScrollingGB">
+ <property name="title">
+@@ -844,6 +865,10 @@
+ </item>
+ </layout>
+ </widget>
++ </widget>
++ </item>
++ </layout>
++ </widget>
+ <widget class="QWidget" name="TappingTab">
+ <attribute name="title">
+ <string>Tapping</string>
diff --git a/kcm_touchpad.spec b/kcm_touchpad.spec
index 9026fd4..7d5727f 100644
--- a/kcm_touchpad.spec
+++ b/kcm_touchpad.spec
@@ -1,14 +1,20 @@
Name: kcm_touchpad
Version: 0.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Synaptics driver based touchpads kcontrol module
Group: User Interfaces/Desktops
License: GPLv2
URL: http://kde-apps.org/content/show.php/kcm_touchpad?content=113335
Source0: http://download.github.com/mishaaq-kcm_touchpad-00370b5.tar.gz
-Source1: kcmtouchpadrc
-Patch0: kcm_touchpad-new-systemsettings-layout.diff
+Patch0: kcm_touchpad-0.3.1-scrollbar.patch
+# Kubuntu patches:
+Patch1: kcm_touchpad-0.3.1-disable-smart-mode-settings.patch
+Patch2: kcm_touchpad-0.3.1-load-error-checking.patch
+Patch3: kcm_touchpad-0.3.1-fix-high-sensitivity.patch
+Patch4: kcm_touchpad-0.3.1-fix-circular-scrolling.patch
+# This one is basically the same as Kubuntu's patch 05:
+Patch5: kcm_touchpad-0.3.1-new-systemsettings-layout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs4-devel gettext
@@ -20,9 +26,16 @@ Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
%description
A KDE System Settings module to to configure synaptics based touchpads.
+
%prep
%setup -q -n mishaaq-kcm_touchpad-00370b5
-%patch0 -p1
+%patch0 -p1 -b .scrollbar
+%patch1 -p1 -b .disable-smart-mode-settings
+%patch2 -p1 -b .load-error-checking
+%patch3 -p1 -b .fix-high-sensitivity
+%patch4 -p1 -b .fix-circular-scrolling
+%patch5 -p1 -b .new-systemsettings-layout
+
%build
mkdir -p %{_target_platform}
@@ -41,20 +54,22 @@ rm -rf %{buildroot}%{_kde4_docdir}/%{name}/
%find_lang %{name}
-install -p -m 644 -D %{SOURCE1} %{buildroot}%{_kde4_configdir}/kcmtouchpadrc
-
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
-%{_kde4_configdir}/kcmtouchpadrc
%{_kde4_libdir}/kde4/kcm_touchpad.so
%{_kde4_datadir}/kde4/services/touchpad.desktop
%changelog
+* Tue Feb 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.1-6
+- Merge bugfixes from Kubuntu, fixes circular scrolling and more (#633353)
+- Drop default kcmtouchpadrc, use driver defaults (#611611)
+- Make the Scrolling tab use a vertical scrollbar if needed (#600121)
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list