Hello community, here is the log from the commit of package geany-plugins for openSUSE:Factory checked in at 2014-12-16 14:48:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geany-plugins (Old) and /work/SRC/openSUSE:Factory/.geany-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geany-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/geany-plugins/geany-plugins.changes 2014-05-05 21:18:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geany-plugins.new/geany-plugins.changes 2014-12-16 14:48:18.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 19 11:39:21 UTC 2014 - nick.schrader@mailbox.org + +- Debugger + + Add geany-plugins-GCond-usage.patch: Fixed bug SF#116 + that made the whole application crash because of GLib (bnc#906659). + + Add geany-plugins-gdb-7_7.patch: Fixed bug SF#112 that + made the whole application crash because of GDB (bnc#906659). + +------------------------------------------------------------------- New: ---- geany-plugins-GCond-usage.patch geany-plugins-gdb-7_7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geany-plugins.spec ++++++ --- /var/tmp/diff_new_pack.ICbvGu/_old 2014-12-16 14:48:19.000000000 +0100 +++ /var/tmp/diff_new_pack.ICbvGu/_new 2014-12-16 14:48:19.000000000 +0100 @@ -27,6 +27,10 @@ Source: http://plugins.geany.org/geany-plugins/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM geany-plugins-lua-5_2.patch sf#3476581 dimstar@opensuse.org -- Fix build with lua 5.2. Patch0: geany-plugins-lua-5_2.patch +# PATCH-FIX-UPSTREAM geany-plugins-GCond-usage.patch SF bug #116 -- Fix mutex-Problem with GLib >= 2.42 +Patch1: geany-plugins-GCond-usage.patch +# PATCH-FIX-UPSTREAM geany-plugins-GCond-usage.patch SF bug #112 -- Fix new GDB-7.7-Commands +Patch2: geany-plugins-gdb-7_7.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: libgpgme-devel @@ -53,6 +57,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure ++++++ geany-plugins-GCond-usage.patch ++++++ diff --git a/debugger/src/dconfig.c b/debugger/src/dconfig.c index 97e7bab..e5bb55c 100644 --- a/debugger/src/dconfig.c +++ b/debugger/src/dconfig.c @@ -270,11 +270,9 @@ static gpointer saving_thread_func(gpointer data) { GTimeVal interval; - GMutex *m = g_mutex_new(); + g_mutex_lock(change_config_mutex); do { - g_mutex_lock(change_config_mutex); - if ( panel_config_changed || (debug_config_changed && DEBUG_STORE_PLUGIN == dstore) @@ -309,14 +307,12 @@ debug_config_changed = FALSE; } - - g_mutex_unlock(change_config_mutex); g_get_current_time(&interval); g_time_val_add(&interval, SAVING_INTERVAL); } - while (!g_cond_timed_wait(cond, m, &interval)); - g_mutex_free(m); + while (!g_cond_timed_wait(cond, change_config_mutex, &interval)); + g_mutex_unlock(change_config_mutex); return NULL; } @@ -471,7 +467,7 @@ void config_destroy(void) { g_cond_signal(cond); - /* ??? g_thread_join(saving_thread); */ + g_thread_join(saving_thread); g_mutex_free(change_config_mutex); g_cond_free(cond); ++++++ geany-plugins-gdb-7_7.patch ++++++ diff --git a/debugger/src/dbm_gdb.c b/debugger/src/dbm_gdb.c index 09a483a..b51b8a8 100644 --- a/debugger/src/dbm_gdb.c +++ b/debugger/src/dbm_gdb.c @@ -369,7 +369,7 @@ static gboolean on_read_async_output(GIO update_files(); /* -exec-run */ - exec_async_command("-exec-run &"); + exec_async_command("-exec-run"); } } else @@ -895,7 +895,7 @@ static gboolean run(const gchar* file, c static void restart(void) { dbg_cbs->clear_messages(); - exec_async_command("-exec-run &"); + exec_async_command("-exec-run"); } /* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org