rpms/gsynaptics/devel gsynaptics-0.9.16-purge-shm.patch, NONE, 1.1 gsynaptics.spec, 1.24, 1.25
Peter Hutterer
whot at fedoraproject.org
Mon Aug 3 06:30:46 UTC 2009
Author: whot
Update of /cvs/pkgs/rpms/gsynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19443
Modified Files:
gsynaptics.spec
Added Files:
gsynaptics-0.9.16-purge-shm.patch
Log Message:
* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.9.16-3
- gsynaptics-0.9.16-purge-shm.patch: purge SHM, the driver doesn't provide
it anymore.
gsynaptics-0.9.16-purge-shm.patch:
gsynaptics.c | 210 -----------------------------------------------------------
1 file changed, 2 insertions(+), 208 deletions(-)
--- NEW FILE gsynaptics-0.9.16-purge-shm.patch ---
>From ecf7f19f8f7eb59a382b6eed679e8a7e923de2ee Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 3 Aug 2009 16:21:48 +1000
Subject: [PATCH] Purge SHM from gsynaptics.
The driver doesn't provide SHM anymore, we have to go through synclient.
---
src/gsynaptics.c | 209 +-----------------------------------------------------
1 files changed, 2 insertions(+), 207 deletions(-)
diff --git a/src/gsynaptics.c b/src/gsynaptics.c
index 1e294a2..64e62db 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -185,7 +185,7 @@ g_synaptics_is_available (GSynaptics *synaptics)
{
GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
- return (priv->synclient || priv->synshm);
+ return (priv->synclient);
}
static gboolean
@@ -193,7 +193,7 @@ g_synaptics_is_valid (GSynaptics *synaptics)
{
GSynapticsPrivate *priv = G_SYNAPTICS_GET_PRIVATE (synaptics);
- return SYNSHM(synaptics) != NULL || priv->synclient;
+ return priv->synclient;
}
gboolean
@@ -207,10 +207,6 @@ g_synaptics_is_enabled (GSynaptics *synaptics)
{
return !g_synaptics_get_value_from_synclient ("TouchpadOff");
}
- else
- {
- return !SYNSHM(synaptics)->touchpad_off;
- }
}
void
@@ -230,11 +226,6 @@ g_synaptics_is_tapping_enabled (GSynaptics *synaptics)
return (g_synaptics_get_value_from_synclient ("MaxTapTime") > 0 &&
g_synaptics_get_value_from_synclient ("TapButton1") > 0);
}
- else
- {
- return SYNSHM(synaptics)->tap_time > 0 &&
- SYNSHM(synaptics)->tap_action[F1_TAP] > 0; /* F1_TAP */
- }
}
gint
@@ -248,10 +239,6 @@ g_synaptics_tap_time (GSynaptics *synaptics)
{
return (gint)g_synaptics_get_value_from_synclient ("MaxTapTime");
}
- else
- {
- return SYNSHM(synaptics)->tap_time;
- }
}
#if 0
@@ -269,7 +256,6 @@ g_synaptics_sensitivity (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
for (i = 0; i < 5; i++)
{
@@ -277,14 +263,6 @@ g_synaptics_sensitivity (GSynaptics *synaptics)
return i;
}
}
- else
- {
- for (i = 0; i < 5; i++)
- {
- if (SYNSHM(synaptics)->finger_low >= finger_low[i])
- return i;
- }
- }
return i - 1;
}
@@ -297,16 +275,10 @@ g_synaptics_is_horizontal_scroll_enabled (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return FALSE;
- if (priv->synclient)
{
return (g_synaptics_get_value_from_synclient("HorizEdgeScroll") ||
g_synaptics_get_value_from_synclient("HorizTwoFingerScroll"));
}
- else
- {
- return SYNSHM(synaptics)->scroll_edge_horiz ||
- SYNSHM(synaptics)->scroll_twofinger_horiz;
- }
}
gint
@@ -316,14 +288,9 @@ g_synaptics_horizontal_scroll_delta (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint)g_synaptics_get_value_from_synclient ("HorizScrollDelta");
}
- else
- {
- return SYNSHM(synaptics)->scroll_dist_horiz;
- }
}
ScrollMethod
@@ -335,16 +302,10 @@ g_synaptics_get_scroll_method (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return ScrollingDisabled;
- if (priv->synclient)
{
edge = g_synaptics_get_value_from_synclient ("VertEdgeScroll");
twofinger = g_synaptics_get_value_from_synclient ("VertTwoFingerScroll");
}
- else
- {
- edge = SYNSHM(synaptics)->scroll_edge_vert;
- twofinger = SYNSHM(synaptics)->scroll_twofinger_vert;
- }
if (edge)
return EdgeScrolling;
@@ -362,14 +323,9 @@ g_synaptics_vertical_scroll_delta (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint)g_synaptics_get_value_from_synclient ("VertScrollDelta");
}
- else
- {
- return SYNSHM(synaptics)->scroll_dist_vert;
- }
}
gboolean
@@ -379,14 +335,9 @@ g_synaptics_is_edge_motion_enabled (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return FALSE;
- if (priv->synclient)
{
return g_synaptics_get_value_from_synclient ("EdgeMotionUseAlways") ? TRUE : FALSE;
}
- else
- {
- return SYNSHM(synaptics)->edge_motion_use_always;
- }
}
gint
@@ -396,17 +347,12 @@ g_synaptics_accel_factor (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
// Note (by Eugene Sia): returning gdouble instead of gint with value * 1000
// seems to cause a change in value when the value is returned to the calling function.
// Possible bug in the gdouble implementation?
return (gint) (g_synaptics_get_value_from_synclient ("AccelFactor") * 1000);
}
- else
- {
- return (gint) (SYNSHM(synaptics)->accl * 1000);
- }
}
gint
@@ -416,14 +362,9 @@ g_synaptics_min_speed (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint) (g_synaptics_get_value_from_synclient ("MinSpeed") * 1000);
}
- else
- {
- return (gint) (SYNSHM(synaptics)->min_speed * 1000);
- }
}
gint
@@ -433,14 +374,9 @@ g_synaptics_max_speed (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint) (g_synaptics_get_value_from_synclient ("MaxSpeed") * 1000);
}
- else
- {
- return (gint) (SYNSHM(synaptics)->max_speed * 1000);
- }
}
gboolean
@@ -450,14 +386,9 @@ g_synaptics_is_coasting_enabled (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return FALSE;
- if (priv->synclient)
{
return g_synaptics_get_value_from_synclient ("CoastEnable") ? TRUE : FALSE;
}
- else
- {
- return SYNSHM(synaptics)->coasting_speed > 0.1;
- }
}
gboolean
@@ -467,14 +398,9 @@ g_synaptics_is_circular_scroll_enabled (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return FALSE;
- if (priv->synclient)
{
return g_synaptics_get_value_from_synclient ("CircularScrolling") ? TRUE : FALSE;
}
- else
- {
- return SYNSHM(synaptics)->circular_scrolling;
- }
}
gint
@@ -484,14 +410,9 @@ g_synaptics_circular_scroll_delta (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint)(g_synaptics_get_value_from_synclient ("CircScrollDelta") * 1000);
}
- else
- {
- return (gint)(SYNSHM(synaptics)->scroll_dist_circ * 1000);
- }
}
ScrollTrigger
@@ -501,14 +422,9 @@ g_synaptics_circular_scroll_trigger (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return NoTrigger;
- if (priv->synclient)
{
return (ScrollTrigger)g_synaptics_get_value_from_synclient ("CircScrollTrigger");
}
- else
- {
- return (ScrollTrigger)SYNSHM(synaptics)->circular_trigger;
- }
}
Button
@@ -518,14 +434,9 @@ g_synaptics_button_for_tap (GSynaptics *synaptics, TapEvent tap)
if (!g_synaptics_is_valid(synaptics))
return None;
- if (priv->synclient)
{
return (Button)g_synaptics_get_value_from_synclient ("ButtonForTap");
}
- else
- {
- return (Button)SYNSHM(synaptics)->tap_action[tap];
- }
}
gboolean
@@ -535,14 +446,9 @@ g_synaptics_are_fast_taps_enabled (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return FALSE;
- if (priv->synclient)
{
return (gboolean)g_synaptics_get_value_from_synclient ("FastTaps");
}
- else
- {
- return SYNSHM(synaptics)->fast_taps;
- }
}
gint
@@ -552,14 +458,9 @@ g_synaptics_abs_coord_x (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint)g_synaptics_get_value_from_synclient ("AbsCoordX");
}
- else
- {
- return SYNSHM(synaptics)->x;
- }
}
gint
@@ -569,14 +470,9 @@ g_synaptics_abs_coord_y (GSynaptics *synaptics)
if (!g_synaptics_is_valid(synaptics))
return 0;
- if (priv->synclient)
{
return (gint)g_synaptics_get_value_from_synclient ("AbsCoordY");
}
- else
- {
- return SYNSHM(synaptics)->y;
- }
}
@@ -587,7 +483,6 @@ g_synaptics_set_enabled (GSynaptics *synaptics, gint enable)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient TouchpadOff=%d",
@@ -595,10 +490,6 @@ g_synaptics_set_enabled (GSynaptics *synaptics, gint enable)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->touchpad_off = enable;
- }
}
void
@@ -615,17 +506,12 @@ g_synaptics_set_tap_time (GSynaptics *synaptics, gint time)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient MaxTapTime=%d", time);
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->tap_time = time;
- }
}
#if 0
@@ -649,7 +535,6 @@ g_synaptics_set_sensitivity (GSynaptics *synaptics, gint value)
if ( value < 0 || value > 4)
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient FingerLow=%d FingerHigh=%d",
@@ -657,23 +542,6 @@ g_synaptics_set_sensitivity (GSynaptics *synaptics, gint value)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
-#if 0
- if ( !SynConfig::treatAsALPS())
- {
-#endif
- SYNSHM(synaptics)->finger_low = finger_low[value];
- SYNSHM(synaptics)->finger_high = finger_low[value] + 5;
-#if 0
- }
- else
- {
- SYNSHM(synaptics)->finger_low = finger_low[value] - 11;
- SYNSHM(synaptics)->finger_high = finger_low[value] - 10;
- }
-#endif
- }
}
void
@@ -693,7 +561,6 @@ g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics, gint enabled)
break;
}
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient HorizEdgeScroll=%d",
@@ -706,12 +573,6 @@ g_synaptics_set_horizontal_scroll_enabled(GSynaptics *synaptics, gint enabled)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->scroll_edge_horiz = edge && enabled;
- SYNSHM(synaptics)->scroll_twofinger_horiz = twofinger &&
- enabled;
- }
}
void
@@ -731,7 +592,6 @@ g_synaptics_set_scroll_method (GSynaptics *synaptics, ScrollMethod method)
break;
}
- if (priv->synclient)
{
gchar *command;
@@ -745,11 +605,6 @@ g_synaptics_set_scroll_method (GSynaptics *synaptics, ScrollMethod method)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->scroll_edge_vert = edge;
- SYNSHM(synaptics)->scroll_twofinger_vert = twofinger;
- }
g_synaptics_set_horizontal_scroll_enabled(synaptics,
g_synaptics_is_horizontal_scroll_enabled(synaptics));
@@ -762,7 +617,6 @@ g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics, gint delta)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient HorizScrollDelta=%d",
@@ -770,10 +624,6 @@ g_synaptics_set_horizontal_scroll_delta (GSynaptics *synaptics, gint delta)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->scroll_dist_horiz = delta;
- }
}
void
@@ -783,7 +633,6 @@ g_synaptics_set_vertical_scroll_delta (GSynaptics *synaptics, gint delta)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient VertScrollDelta=%d",
@@ -791,10 +640,6 @@ g_synaptics_set_vertical_scroll_delta (GSynaptics *synaptics, gint delta)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->scroll_dist_vert = delta;
- }
}
void
@@ -804,7 +649,6 @@ g_synaptics_set_accel_factor(GSynaptics *synaptics, gint value)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -813,10 +657,6 @@ g_synaptics_set_accel_factor(GSynaptics *synaptics, gint value)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->accl = ((double)value) / 1000;
- }
}
void
@@ -826,7 +666,6 @@ g_synaptics_set_max_speed(GSynaptics *synaptics, gint value)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -835,10 +674,6 @@ g_synaptics_set_max_speed(GSynaptics *synaptics, gint value)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->max_speed = ((double)value) / 1000;
- }
}
void
@@ -848,7 +683,6 @@ g_synaptics_set_min_speed(GSynaptics *synaptics, gint value)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -857,10 +691,6 @@ g_synaptics_set_min_speed(GSynaptics *synaptics, gint value)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->min_speed = ((double)value) / 1000;
- }
}
void
@@ -870,7 +700,6 @@ g_synaptics_set_circular_scroll_enabled (GSynaptics *synaptics, gboolean enable)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient CircularScrolling=%d",
@@ -878,10 +707,6 @@ g_synaptics_set_circular_scroll_enabled (GSynaptics *synaptics, gboolean enable)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)-> circular_scrolling = enable;
- }
}
void
@@ -891,7 +716,6 @@ g_synaptics_set_edge_motion_enabled (GSynaptics *synaptics, gboolean enable)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient EdgeMotionUseAlways=%d",
@@ -899,10 +723,6 @@ g_synaptics_set_edge_motion_enabled (GSynaptics *synaptics, gboolean enable)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->edge_motion_use_always = enable;
- }
}
void
@@ -916,7 +736,6 @@ g_synaptics_set_coasting_enabled (GSynaptics *synaptics, gboolean enable)
if (!enable)
thresh = 0;
- if (priv->synclient)
{
gchar *command;
char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -926,10 +745,6 @@ g_synaptics_set_coasting_enabled (GSynaptics *synaptics, gboolean enable)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->coasting_speed = thresh;
- }
}
void
@@ -939,7 +754,6 @@ g_synaptics_set_circular_scroll_delta (GSynaptics *synaptics, gint delta)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
char strval[G_ASCII_DTOSTR_BUF_SIZE];
@@ -948,10 +762,6 @@ g_synaptics_set_circular_scroll_delta (GSynaptics *synaptics, gint delta)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->scroll_dist_circ = ((double)delta) / 1000;
- }
}
void
@@ -961,7 +771,6 @@ g_synaptics_set_circular_scroll_trigger (GSynaptics *synaptics, ScrollTrigger t)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient CircScrollTrigger=%d",
@@ -969,10 +778,6 @@ g_synaptics_set_circular_scroll_trigger (GSynaptics *synaptics, ScrollTrigger t)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->circular_trigger = t;
- }
}
void
@@ -982,7 +787,6 @@ g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapEvent tap, Button butt
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
@@ -1008,10 +812,6 @@ g_synaptics_set_button_for_tap (GSynaptics *synaptics, TapEvent tap, Button butt
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->tap_action[tap] = button;
- }
}
void
@@ -1021,7 +821,6 @@ g_synaptics_set_fast_taps (GSynaptics *synaptics, gboolean enable)
if (!g_synaptics_is_valid(synaptics))
return;
- if (priv->synclient)
{
gchar *command;
command = g_strdup_printf ("synclient FastTaps=%d",
@@ -1029,8 +828,4 @@ g_synaptics_set_fast_taps (GSynaptics *synaptics, gboolean enable)
g_spawn_command_line_async (command, NULL);
g_free (command);
}
- else
- {
- SYNSHM(synaptics)->fast_taps = enable;
- }
}
--
1.6.3.rc1.2.g0164.dirty
Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gsynaptics.spec 25 Jul 2009 01:38:11 -0000 1.24
+++ gsynaptics.spec 3 Aug 2009 06:30:46 -0000 1.25
@@ -1,6 +1,6 @@
Name: gsynaptics
Version: 0.9.16
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Settings tool for Synaptics touchpad driver
Group: Applications/System
@@ -16,6 +16,7 @@ Patch7: gsynaptics-0.9.14-driver
Patch8: gsynaptics-0.9.14-fix-scrolling-checkboxes.patch
Patch9: gsynaptics-0.9.14-scrollmethods.patch
Patch10: gsynaptics-0.9.14-tapping-gconf.patch
+Patch11: gsynaptics-0.9.16-purge-shm.patch
Source1: %{name}-touchpad.png
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ install -p %{SOURCE1} data/touchpad.png
%patch8 -p1 -b .scrl-chkbx-fix
%patch9 -p1 -b .scrollmethods
%patch10 -p1 -b .tapping-gconf
+%patch11 -p1 -b .purge-shm
%build
autoreconf -v --install --force || exit 1
@@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.9.16-3
+- gsynaptics-0.9.16-purge-shm.patch: purge SHM, the driver doesn't provide
+ it anymore.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list