[med-svn] r3364 - in trunk/packages/gwyddion/trunk/debian: . patches
Jan Beyer
beathovn-guest at alioth.debian.org
Mon May 4 20:39:47 UTC 2009
Author: beathovn-guest
Date: 2009-05-04 20:39:46 +0000 (Mon, 04 May 2009)
New Revision: 3364
Added:
trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch
Modified:
trunk/packages/gwyddion/trunk/debian/changelog
trunk/packages/gwyddion/trunk/debian/control
trunk/packages/gwyddion/trunk/debian/patches/series
Log:
Upstream published a patch. Additionally, I changed the FFTW3 build-dependency slightly for the sake of backporters.
Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog 2009-05-04 08:52:29 UTC (rev 3363)
+++ trunk/packages/gwyddion/trunk/debian/changelog 2009-05-04 20:39:46 UTC (rev 3364)
@@ -1,3 +1,12 @@
+gwyddion (2.14-2) unstable; urgency=low
+
+ * Incorporating an upstream patch to fix critical warnings on creation of
+ new channels or graphs, which may lead to a shutdown of gwyddion.
+ * Make backporter's life easier by adjusting build-dependency for FFTW3 to
+ libfftw3 | fftw3.
+
+ -- Jan Beyer <jan at beathovn.de> Mon, 04 May 2009 22:13:28 +0200
+
gwyddion (2.14-1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/gwyddion/trunk/debian/control
===================================================================
--- trunk/packages/gwyddion/trunk/debian/control 2009-05-04 08:52:29 UTC (rev 3363)
+++ trunk/packages/gwyddion/trunk/debian/control 2009-05-04 20:39:46 UTC (rev 3364)
@@ -5,8 +5,8 @@
DM-Upload-Allowed: yes
Uploaders: Jan Beyer <jan at beathovn.de>
Build-Depends: cdbs, debhelper (>= 5), autotools-dev, pkg-config (>= 0.16),
- libgtk2.0-dev (>= 2.8), libgtkglext1-dev, libtiff4-dev, libfftw3-dev, libxmu6,
- python-gtk2-dev, libgtksourceview2.0-dev, python, ruby, libgconf2-dev, libxml2-dev, chrpath, quilt
+ libgtk2.0-dev (>= 2.8), libgtkglext1-dev, libtiff4-dev, libfftw3-dev|fftw3-dev,
+ libxmu6, python-gtk2-dev, libgtksourceview2.0-dev, python, ruby, libgconf2-dev, libxml2-dev, chrpath, quilt
Standards-Version: 3.8.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gwyddion/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gwyddion/trunk/
Added: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch (rev 0)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.14-browser-invalid-iter.patch 2009-05-04 20:39:46 UTC (rev 3364)
@@ -0,0 +1,129 @@
+Author: upstream
+Copyright: the same as gwyddion
+License: the same as gwyddion
+Description: Fixes Critical warnings when a new channel or graph is created,
+ depending on your runtime Gtk+ environment Gwyddion might abort on such
+ warning.
+--- gwyddion-2.14.orig/app/data-browser.c
++++ gwyddion-2.14/app/data-browser.c
+@@ -497,11 +497,10 @@
+ static void
+ gwy_app_data_proxy_add_object(GwyAppDataList *list,
+ gint i,
++ GtkTreeIter *iter,
+ GObject *object)
+ {
+- GtkTreeIter iter;
+-
+- gtk_list_store_insert_with_values(list->store, &iter, G_MAXINT,
++ gtk_list_store_insert_with_values(list->store, iter, G_MAXINT,
+ MODEL_ID, i,
+ MODEL_OBJECT, object,
+ MODEL_WIDGET, NULL,
+@@ -584,12 +583,14 @@
+ static void
+ gwy_app_data_proxy_connect_channel(GwyAppDataProxy *proxy,
+ gint i,
++ GtkTreeIter *iter,
+ GObject *object)
+ {
+ gchar key[24];
+ GQuark quark;
+
+- gwy_app_data_proxy_add_object(&proxy->lists[PAGE_CHANNELS], i, object);
++ gwy_app_data_proxy_add_object(&proxy->lists[PAGE_CHANNELS], i, iter,
++ object);
+ g_snprintf(key, sizeof(key), "/%d/data", i);
+ gwy_debug("%p: %d in %p", object, i, proxy->container);
+ quark = g_quark_from_string(key);
+@@ -700,11 +701,13 @@
+ static void
+ gwy_app_data_proxy_connect_graph(GwyAppDataProxy *proxy,
+ gint i,
++ GtkTreeIter *iter,
+ GObject *object)
+ {
+ GQuark quark;
+
+- gwy_app_data_proxy_add_object(&proxy->lists[PAGE_GRAPHS], i, object);
++ gwy_app_data_proxy_add_object(&proxy->lists[PAGE_GRAPHS], i, iter,
++ object);
+ gwy_debug("%p: %d in %p", object, i, proxy->container);
+ quark = gwy_app_get_graph_key_for_id(i);
+ g_object_set_qdata(object, container_quark, proxy->container);
+@@ -813,11 +816,12 @@
+ static void
+ gwy_app_data_proxy_connect_spectra(GwyAppDataProxy *proxy,
+ gint i,
++ GtkTreeIter *iter,
+ GObject *object)
+ {
+ GQuark quark;
+
+- gwy_app_data_proxy_add_object(&proxy->lists[PAGE_SPECTRA], i, object);
++ gwy_app_data_proxy_add_object(&proxy->lists[PAGE_SPECTRA], i, iter, object);
+ gwy_debug("%p: %d in %p", object, i, proxy->container);
+ quark = gwy_app_get_spectra_key_for_id(i);
+ g_object_set_qdata(object, container_quark, proxy->container);
+@@ -906,6 +910,7 @@
+ GwyAppDataProxy *proxy = (GwyAppDataProxy*)userdata;
+ const gchar *strkey;
+ GwyAppKeyType type;
++ GtkTreeIter iter;
+ GObject *object;
+ gint i;
+
+@@ -920,7 +925,7 @@
+ g_return_if_fail(G_VALUE_HOLDS_OBJECT(gvalue));
+ object = g_value_get_object(gvalue);
+ g_return_if_fail(GWY_IS_DATA_FIELD(object));
+- gwy_app_data_proxy_connect_channel(proxy, i, object);
++ gwy_app_data_proxy_connect_channel(proxy, i, &iter, object);
+ break;
+
+ case KEY_IS_GRAPH:
+@@ -928,7 +933,7 @@
+ g_return_if_fail(G_VALUE_HOLDS_OBJECT(gvalue));
+ object = g_value_get_object(gvalue);
+ g_return_if_fail(GWY_IS_GRAPH_MODEL(object));
+- gwy_app_data_proxy_connect_graph(proxy, i, object);
++ gwy_app_data_proxy_connect_graph(proxy, i, &iter, object);
+ break;
+
+ case KEY_IS_SPECTRA:
+@@ -936,7 +941,7 @@
+ g_return_if_fail(G_VALUE_HOLDS_OBJECT(gvalue));
+ object = g_value_get_object(gvalue);
+ g_return_if_fail(GWY_IS_SPECTRA(object));
+- gwy_app_data_proxy_connect_spectra(proxy, i, object);
++ gwy_app_data_proxy_connect_spectra(proxy, i, &iter, object);
+ break;
+
+ case KEY_IS_MASK:
+@@ -1101,7 +1106,7 @@
+ found ? "present" : "missing");
+ g_return_if_fail(object || found);
+ if (object && !found)
+- gwy_app_data_proxy_connect_channel(proxy, id, object);
++ gwy_app_data_proxy_connect_channel(proxy, id, &iter, object);
+ else if (!object && found)
+ gwy_app_data_proxy_disconnect_channel(proxy, &iter);
+ else {
+@@ -1124,7 +1129,7 @@
+ found ? "present" : "missing");
+ g_return_if_fail(object || found);
+ if (object && !found)
+- gwy_app_data_proxy_connect_graph(proxy, id, object);
++ gwy_app_data_proxy_connect_graph(proxy, id, &iter, object);
+ else if (!object && found)
+ gwy_app_data_proxy_disconnect_graph(proxy, &iter);
+ else {
+@@ -1147,7 +1152,7 @@
+ found ? "present" : "missing");
+ g_return_if_fail(object || found);
+ if (object && !found)
+- gwy_app_data_proxy_connect_spectra(proxy, id, object);
++ gwy_app_data_proxy_connect_spectra(proxy, id, &iter, object);
+ else if (!object && found)
+ gwy_app_data_proxy_disconnect_spectra(proxy, &iter);
+ else {
Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series 2009-05-04 08:52:29 UTC (rev 3363)
+++ trunk/packages/gwyddion/trunk/debian/patches/series 2009-05-04 20:39:46 UTC (rev 3364)
@@ -1,2 +1,3 @@
fix-manpage-section-for-debian.diff
fix-rpath-issue.patch
+gwyddion-2.14-browser-invalid-iter.patch
More information about the debian-med-commit
mailing list