Hello community, here is the log from the commit of package gsynaptics checked in at Mon Dec 1 12:08:48 CET 2008. -------- --- GNOME/gsynaptics/gsynaptics.changes 2008-11-03 03:51:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/gsynaptics/gsynaptics.changes 2008-11-29 18:35:34.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Nov 29 17:34:21 CET 2008 - vuntz@novell.com + +- Add gsynaptics-CoastingSpeedThreshold.patch: use the right name + for the CoastingSpeed option. Taken from Gentoo. +- Add gsynaptics-decimal-separator.patch: make sure we always use . + as decimal separator. Taken from Debian. +- Add gsynaptics-support-partial-config.patch: fix the code to + actually work when some gconf keys are not defined. It was + possible to totally break the touchpad because of this. Taken + from Debian, fix bnc#402864. +- Remove gsynaptics-patch-missing-null.patch and update + gsynaptics-icon.patch because of this removal: we don't need both + patches. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gsynaptics-patch-missing-null.patch New: ---- gsynaptics-CoastingSpeedThreshold.patch gsynaptics-decimal-separator.patch gsynaptics-support-partial-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsynaptics.spec ++++++ --- /var/tmp/diff_new_pack.v28406/_old 2008-12-01 12:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.v28406/_new 2008-12-01 12:07:47.000000000 +0100 @@ -31,15 +31,19 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.14 -Release: 68 +Release: 69 Summary: A Graphical Front-End for TouchPad Configuration Url: http://sourceforge.jp/projects/gsynaptics/ Source: %{name}-%{version}.tar.bz2 Source1: preferences-system-touchpad.tar.bz2 -# PATCH-FIX-UPSTREAM gsynaptics-patch-missing-null.patch snorp@novell.com bnc388236 -- submitted to http://sourceforge.jp/tracker/index.php?func=detail&aid=12568&group_id=1720&atid=6435 -Patch0: gsynaptics-patch-missing-null.patch +# PATCH-FIX-UPSTREAM gsynaptics-CoastingSpeedThreshold.patch vuntz@novell.com -- Taken from gentoo. http://bugs.gentoo.org/202501 +Patch0: gsynaptics-CoastingSpeedThreshold.patch # PATCH-FIX-UPSTREAM gsynaptics-icon.patch vuntz@novell.com -- http://sourceforge.jp/tracker/index.php?func=detail&aid=12499&group_id=1720&atid=6433 Patch1: gsynaptics-icon.patch +# PATCH-FIX-UPSTREAM gsynaptics-support-partial-config.patch vuntz@novell.com -- Taken from Debian, https://sourceforge.jp/tracker/index.php?func=detail&aid=12545&group_id=1720&atid=6435 +Patch2: gsynaptics-support-partial-config.patch +# PATCH-FIX-UPSTREAM gsynaptics-decimal-separator.patch vuntz@novell.com -- Taken from Debian, https://sourceforge.jp/tracker/index.php?func=detail&aid=12544&group_id=1720&atid=6435 +Patch3: gsynaptics-decimal-separator.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: x11-input-synaptics >= 0.14.4 Requires: %{name}-lang = %{version} @@ -60,6 +64,8 @@ %setup -a 1 %patch0 -p0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -f -i @@ -96,6 +102,18 @@ %files lang -f %{name}.lang %changelog +* Sat Nov 29 2008 vuntz@novell.com +- Add gsynaptics-CoastingSpeedThreshold.patch: use the right name + for the CoastingSpeed option. Taken from Gentoo. +- Add gsynaptics-decimal-separator.patch: make sure we always use . + as decimal separator. Taken from Debian. +- Add gsynaptics-support-partial-config.patch: fix the code to + actually work when some gconf keys are not defined. It was + possible to totally break the touchpad because of this. Taken + from Debian, fix bnc#402864. +- Remove gsynaptics-patch-missing-null.patch and update + gsynaptics-icon.patch because of this removal: we don't need both + patches. * Mon Nov 03 2008 vuntz@novell.com - Add gsynaptics-icon.patch and preferences-system-touchpad.tar.bz2 to install valid icons for the application. Fix bnc#405250. ++++++ gsynaptics-CoastingSpeedThreshold.patch ++++++ --- src/gsynaptics.c.orig 2008-01-04 14:45:16.721550130 +0100 +++ src/gsynaptics.c 2008-01-04 14:45:47.666549605 +0100 @@ -821,7 +821,7 @@ if (priv->synclient) { gchar *command; - command = g_strdup_printf ("synclient CoastingSpeedThreshold=%f", + command = g_strdup_printf ("synclient CoastingSpeed=%f", thresh); g_spawn_command_line_async (command, NULL); g_free (command); ++++++ gsynaptics-decimal-separator.patch ++++++ 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); } ++++++ gsynaptics-icon.patch ++++++ --- /var/tmp/diff_new_pack.v28406/_old 2008-12-01 12:07:47.000000000 +0100 +++ /var/tmp/diff_new_pack.v28406/_new 2008-12-01 12:07:47.000000000 +0100 @@ -58,7 +58,7 @@ gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); -- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL); +- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png"); - if (path) - { - icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL); ++++++ gsynaptics-support-partial-config.patch ++++++ 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); + } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org