Control: tags -1 + patch pending Dear maintainer, I've prepared an NMU for grig (versioned as 0.8.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards -- Sebastian Ramacher
diff -Nru grig-0.8.0/debian/changelog grig-0.8.0/debian/changelog
--- grig-0.8.0/debian/changelog 2011-08-27 03:49:40.000000000 +0200
+++ grig-0.8.0/debian/changelog 2013-05-21 18:15:34.000000000 +0200
@@ -1,3 +1,11 @@
+grig (0.8.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/glib-deprecated.patch: Don't call deprecated glib functions
+ and use the new gthread API. (Closes: #707386)
+
+ -- Sebastian Ramacher <sramacher@debian.org> Tue, 21 May 2013 18:13:50 +0200
+
grig (0.8.0-1) unstable; urgency=low
* New upstream release.
diff -Nru grig-0.8.0/debian/patches/glib-deprecated.patch grig-0.8.0/debian/patches/glib-deprecated.patch
--- grig-0.8.0/debian/patches/glib-deprecated.patch 1970-01-01 01:00:00.000000000 +0100
+++ grig-0.8.0/debian/patches/glib-deprecated.patch 2013-05-21 18:13:45.000000000 +0200
@@ -0,0 +1,51 @@
+Description: Don't call deprecated glib functions
+ g_thread_init and g_thread_create are deprecated since glib 2.32.
+Author: Sebastian Ramacher <sramacher@debian.org>
+Last-Update: 2013-05-21
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -178,13 +178,14 @@
+ g_free (fname);
+
+
++#if !GLIB_CHECK_VERSION(2,32,0)
+ /* initialize threads; according to glib docs, this call will terminate
+ the program if threads are not supported... then why doesn''t it work
+ on FreeBSD?
+ */
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
+-
++#endif
+
+
+ /* decode command line arguments; this part of the code only sets the
+--- a/src/rig-daemon.c
++++ b/src/rig-daemon.c
+@@ -472,6 +472,9 @@
+ gchar **confvec;
+ gchar **confent;
+ GError *err = NULL; /* used when starting daemon thread */
++#if GLIB_CHECK_VERSION(2,32,0)
++ GThread* thread = NULL;
++#endif
+
+
+ grig_debug_local (RIG_DEBUG_TRACE,
+@@ -636,8 +639,14 @@
+
+ }
+ else {
+-
++#if !GLIB_CHECK_VERSION(2,32,0)
+ g_thread_create (rig_daemon_cycle, NULL, FALSE, &err);
++#else
++ thread = g_thread_try_new ("daemon thread", rig_daemon_cycle, NULL, &err);
++ if (thread != NULL) {
++ g_thread_unref(thread);
++ }
++#endif
+
+ /* check whether any error occurred when starting the daemon
+ thread; if yes, close rig and return with error code
diff -Nru grig-0.8.0/debian/patches/series grig-0.8.0/debian/patches/series
--- grig-0.8.0/debian/patches/series 2011-08-27 03:01:20.000000000 +0200
+++ grig-0.8.0/debian/patches/series 2013-05-21 18:08:51.000000000 +0200
@@ -1 +1,2 @@
02-proper-copyright-notice
+glib-deprecated.patch
Attachment:
signature.asc
Description: Digital signature