diff options
Diffstat (limited to 'gnome-extra/gsynaptics/files')
4 files changed, 317 insertions, 2 deletions
diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch index c48689533d76..4f8716d75329 100644 --- a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch +++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-build-filename.patch @@ -4,8 +4,6 @@ ## All lines beginning with `## DP:' are a description of the patch. ## DP: https://sourceforge.jp/tracker/index.php?func=detail&aid=12568&group_id=1720&atid=6435 ## DP: Missing terminating NULL for g_build_filename call. - -@DPATCH@ diff -urNad gsynaptics-0.9.14~/src/main.c gsynaptics-0.9.14/src/main.c --- gsynaptics-0.9.14~/src/main.c 2008-02-28 23:27:28.000000000 +0100 +++ gsynaptics-0.9.14/src/main.c 2008-05-17 08:34:04.000000000 +0200 diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-do-not-set-zero.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-do-not-set-zero.patch new file mode 100644 index 000000000000..996d68227ed0 --- /dev/null +++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-do-not-set-zero.patch @@ -0,0 +1,185 @@ +Do not set to 0 when some keys are not defined. +Debian bug #480744. + +Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=1720&atid=6435 + +diff -urNad gsynaptics-0.9.14~/src/init.c gsynaptics-0.9.14/src/init.c +--- gsynaptics-0.9.14~/src/init.c 2008-02-28 23:27:41.000000000 +0100 ++++ gsynaptics-0.9.14/src/init.c 2008-05-17 09:14:12.000000000 +0200 +@@ -36,63 +36,148 @@ + { + gboolean b_value; + gint i_value; ++ GConfValue *gval = NULL; + + if (!gconf_client_dir_exists (gconf, DIRNAME, NULL)) + return; + + /* touchpad on/off */ +- b_value = gconf_client_get_bool (gconf, OFF_KEY, NULL); +- g_synaptics_set_enabled (synaptics, b_value ? 1 : 0); ++ gval = gconf_client_get (gconf, OFF_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_BOOL) { ++ b_value = gconf_value_get_bool(gval); ++ g_synaptics_set_enabled (synaptics, b_value ? 1 : 0); ++ } ++ gconf_value_free(gval); ++ } + + /* vertical scroll delta */ +- i_value = gconf_client_get_int (gconf, VERTSCROLLDELTA_KEY, NULL); +- g_synaptics_set_vertical_scroll_delta (synaptics, i_value); ++ gval = gconf_client_get (gconf, VERTSCROLLDELTA_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_vertical_scroll_delta (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + /* horizontal scroll delta */ +- i_value = gconf_client_get_int (gconf, HORIZSCROLLDELTA_KEY, NULL); +- g_synaptics_set_horizontal_scroll_delta (synaptics, i_value); ++ gval = gconf_client_get (gconf, HORIZSCROLLDELTA_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_horizontal_scroll_delta (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + /* circular scroll */ +- i_value = gconf_client_get_int (gconf, CIRCSCROLLDELTA_KEY, NULL); +- b_value = gconf_client_get_bool (gconf, CIRCULARSCROLLING_KEY, NULL); +- g_synaptics_set_circular_scroll_delta (synaptics, i_value); +- g_synaptics_set_circular_scroll_enabled (synaptics, b_value); ++ gval = gconf_client_get (gconf, CIRCSCROLLDELTA_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_circular_scroll_delta (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } ++ gval = gconf_client_get (gconf, CIRCULARSCROLLING_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_BOOL) { ++ b_value = gconf_value_get_bool(gval); ++ g_synaptics_set_circular_scroll_enabled (synaptics, b_value); ++ } ++ gconf_value_free(gval); ++ } + /* the trigger of circular scrolling */ +- i_value = gconf_client_get_int (gconf, CIRCSCROLLTRIGGER_KEY, NULL); +- g_synaptics_set_circular_scroll_trigger (synaptics, i_value); ++ gval = gconf_client_get (gconf, CIRCSCROLLTRIGGER_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_circular_scroll_trigger (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + + /* tapping time */ +- i_value = gconf_client_get_int (gconf, MAXTAPTIME_KEY, NULL); +- g_synaptics_set_tap_time (synaptics, i_value); ++ gval = gconf_client_get (gconf, MAXTAPTIME_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_tap_time (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + /* fast taps */ +- b_value = gconf_client_get_bool (gconf, FASTTAPS_KEY, NULL); +- g_synaptics_set_fast_taps (synaptics, b_value); ++ gval = gconf_client_get (gconf, FASTTAPS_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_BOOL) { ++ b_value = gconf_value_get_bool(gval); ++ g_synaptics_set_fast_taps (synaptics, b_value); ++ } ++ gconf_value_free(gval); ++ } + + /* sensitivity */ +- i_value = gconf_client_get_int (gconf, SENSITIVITY_KEY, NULL); +- g_synaptics_set_sensitivity (synaptics, i_value); ++ gval = gconf_client_get (gconf, SENSITIVITY_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_sensitivity (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + /* coasting */ +- b_value = gconf_client_get_bool (gconf, COASTENABLE_KEY, NULL); +- g_synaptics_set_coasting_enabled (synaptics, b_value); ++ gval = gconf_client_get (gconf, COASTENABLE_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_BOOL) { ++ b_value = gconf_value_get_bool(gval); ++ g_synaptics_set_coasting_enabled (synaptics, b_value); ++ } ++ gconf_value_free(gval); ++ } + + /* edge motion */ +- b_value = gconf_client_get_bool (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL); +- g_synaptics_set_edge_motion_enabled (synaptics, b_value); ++ gval = gconf_client_get (gconf, EDGEMOTIONUSEALWAYS_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_BOOL) { ++ b_value = gconf_value_get_bool(gval); ++ g_synaptics_set_edge_motion_enabled (synaptics, b_value); ++ } ++ gconf_value_free(gval); ++ } + + /* min speed */ +- i_value = gconf_client_get_int (gconf, MINSPEED_KEY, NULL); +- g_synaptics_set_min_speed (synaptics, i_value); ++ gval = gconf_client_get (gconf, MINSPEED_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_min_speed (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + /* max speed */ +- i_value = gconf_client_get_int (gconf, MAXSPEED_KEY, NULL); +- g_synaptics_set_max_speed (synaptics, i_value); ++ gval = gconf_client_get (gconf, MAXSPEED_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_max_speed (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + /* accel factor */ +- i_value = gconf_client_get_int (gconf, ACCELFACTOR_KEY, NULL); +- g_synaptics_set_accel_factor (synaptics, i_value); ++ gval = gconf_client_get (gconf, ACCELFACTOR_KEY, NULL); ++ if (gval != NULL) { ++ if (gval->type == GCONF_VALUE_INT) { ++ i_value = gconf_value_get_int(gval); ++ g_synaptics_set_accel_factor (synaptics, i_value); ++ } ++ gconf_value_free(gval); ++ } + + } + diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-dot-fixes.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-dot-fixes.patch new file mode 100644 index 000000000000..94eebe5e5449 --- /dev/null +++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-dot-fixes.patch @@ -0,0 +1,68 @@ +# Fix format strings to always use . as decimal separator, see +# https://sourceforge.jp/tracker/index.php?func=detail&aid=12498&group_id=1720&atid=6435 +# +# Forwarded to https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=1720&atid=6435 +diff -urNad gsynaptics-0.9.14~/src/gsynaptics.c gsynaptics-0.9.14/src/gsynaptics.c +--- gsynaptics-0.9.14~/src/gsynaptics.c 2008-02-28 23:21:17.000000000 +0100 ++++ gsynaptics-0.9.14/src/gsynaptics.c 2008-05-17 08:36:54.000000000 +0200 +@@ -713,8 +713,9 @@ + if (priv->synclient) + { + gchar *command; +- command = g_strdup_printf ("synclient AccelFactor=%f", +- (gdouble)value / 1000); ++ char strval[G_ASCII_DTOSTR_BUF_SIZE]; ++ g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000); ++ command = g_strdup_printf ("synclient AccelFactor=%s", strval); + g_spawn_command_line_async (command, NULL); + g_free (command); + } +@@ -734,8 +735,9 @@ + if (priv->synclient) + { + gchar *command; +- command = g_strdup_printf ("synclient MaxSpeed=%f", +- (gdouble)value / 1000); ++ char strval[G_ASCII_DTOSTR_BUF_SIZE]; ++ g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000); ++ command = g_strdup_printf ("synclient MaxSpeed=%s", strval); + g_spawn_command_line_async (command, NULL); + g_free (command); + } +@@ -755,8 +757,9 @@ + if (priv->synclient) + { + gchar *command; +- command = g_strdup_printf ("synclient MinSpeed=%f", +- (gdouble)value / 1000); ++ char strval[G_ASCII_DTOSTR_BUF_SIZE]; ++ g_ascii_dtostr(strval, sizeof(strval), (gdouble)value / 1000); ++ command = g_strdup_printf ("synclient MinSpeed=%s", strval); + g_spawn_command_line_async (command, NULL); + g_free (command); + } +@@ -822,8 +825,10 @@ + if (priv->synclient) + { + gchar *command; +- command = g_strdup_printf ("synclient CoastingSpeed=%f", +- thresh); ++ char strval[G_ASCII_DTOSTR_BUF_SIZE]; ++ g_ascii_dtostr(strval, sizeof(strval), thresh); ++ command = g_strdup_printf ("synclient CoastingSpeed=%s", ++ strval); + g_spawn_command_line_async (command, NULL); + g_free (command); + } +@@ -843,8 +848,9 @@ + if (priv->synclient) + { + gchar *command; +- command = g_strdup_printf ("synclient CircScrollDelta=%f", +- (gdouble)delta / 1000); ++ char strval[G_ASCII_DTOSTR_BUF_SIZE]; ++ g_ascii_dtostr(strval, sizeof(strval), (gdouble)delta / 1000); ++ command = g_strdup_printf ("synclient CircScrollDelta=%s", strval); + g_spawn_command_line_async (command, NULL); + g_free (command); + } diff --git a/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-fix-docbook.patch b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-fix-docbook.patch new file mode 100644 index 000000000000..87af5634358b --- /dev/null +++ b/gnome-extra/gsynaptics/files/gsynaptics-0.9.14-fix-docbook.patch @@ -0,0 +1,64 @@ +Fix docbook document to be valid. + +See https://sourceforge.jp/tracker/index.php?func=detail&aid=13557&group_id=1720&atid=6433 + +diff -urNad gsynaptics-0.9.14~/help/C/gsynaptics.xml gsynaptics-0.9.14/help/C/gsynaptics.xml +--- gsynaptics-0.9.14~/help/C/gsynaptics.xml 2008-02-28 23:38:55.000000000 +0100 ++++ gsynaptics-0.9.14/help/C/gsynaptics.xml 2008-09-22 11:08:43.000000000 +0200 +@@ -214,7 +214,7 @@ + </para> + <para>Also, it will only be able to communicate with the driver, + if the <command>synclient</command> tool is installed and +- operational, which means there is <term>"SHMConfig" "true"</term> ++ operational, which means there is <varname>"SHMConfig" "true"</varname> + in the section of the synaptics driver in + <filename>xorg.conf</filename> or <filename>XF86Config</filename>. + </para> +@@ -321,7 +321,7 @@ + Makes the driver react faster to a single tap, but + also makes double clicks caused by double tapping + slower </quote>. (borrowed from <command>man 5 +- synaptics</command> for <term>FastTaps</term> ++ synaptics</command> for <varname>FastTaps</varname> + configuration value of the driver) + </para> + </listitem> +@@ -342,8 +342,6 @@ + The touchpad can be used to control scrolling, as could + be done with a scroll-wheel mouse. + </para> +- </listitem> +- <listitem> + <variablelist> + <varlistentry id="enable-mail-summary-popup"> + <term><guilabel>Enable vertical scrolling</guilabel></term> +@@ -353,8 +351,6 @@ + (emulating a scroll mouse) is possible when moving + the finger along the right side of the touchpad. + </para> +- </listitem> +- <listitem> + <para>The scrolling speed can be set here.</para> + </listitem> + </varlistentry> +@@ -366,8 +362,6 @@ + possible when moving the finger along the bottom + side of the touchpad. + </para> +- </listitem> +- <listitem> + <para>The scrolling speed can be set here.</para> + </listitem> + </varlistentry> +@@ -379,11 +373,7 @@ + a scrolling wheel, by drawing a circle with the + finger on the touchpad. + </para> +- </listitem> +- <listitem> + <para>The scrolling speed can be set here.</para> +- </listitem> +- <listitem> + <para>The start point of the circle for circular scrolling can also be set here.</para> + </listitem> + </varlistentry> |