[med-svn] [praat] 06/10: d/p/deprecated-g-type-init.patch: New patch

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository praat.

commit 5f90924addc512a7d537acb082303fc15d6a54d8
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Jun 12 15:56:25 2016 -0300

    d/p/deprecated-g-type-init.patch: New patch
---
 debian/patches/deprecated-g-type-init.patch | 30 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/deprecated-g-type-init.patch b/debian/patches/deprecated-g-type-init.patch
new file mode 100644
index 0000000..0f96a11
--- /dev/null
+++ b/debian/patches/deprecated-g-type-init.patch
@@ -0,0 +1,30 @@
+Description: Conditionally call the deprecated function g_type_init
+ Function g_type_init has been deprecated in version 2.35.0 fo GLib.
+ This patch ensures that this function is called only when the
+ sendpraatprogram is compiled against a version than that one.
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Forwarded: https://github.com/praat/praat/pull/224
+Last-Update: 2016-06-12
+
+--- praat-6.0.17.orig/sys/sendpraat.c
++++ praat-6.0.17/sys/sendpraat.c
+@@ -234,7 +234,9 @@ char *sendpraat (void *display, const ch
+ 			 * Notify main window.
+ 			 */
+ 			GdkEventClient gevent;
++#if !GLIB_CHECK_VERSION(2,35,0)
+ 			g_type_init ();
++#endif
+ 			int displaySupplied = display != NULL;
+ 			if (! displaySupplied) {
+ 				display = gdk_display_open (getenv ("DISPLAY"));   /* GdkDisplay* */
+@@ -458,7 +460,9 @@ wchar_t *sendpraatW (void *display, cons
+ 			 */
+ 			GdkEventClient gevent;
+ 			int displaySupplied = display != NULL;
++#if !GLIB_CHECK_VERSION(2,35,0)
+ 			g_type_init ();
++#endif
+ 			if (! displaySupplied) {
+ 				display = gdk_display_open (getenv ("DISPLAY"));   /* GdkDisplay* */
+ 				if (display == NULL) {
diff --git a/debian/patches/series b/debian/patches/series
index 4b102bf..fb69080 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use-ldflags.patch
 remove-time-date-macros.patch
+deprecated-g-type-init.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/praat.git