[med-svn] [praat] 05/09: d/p/deprecated-g-type-init.patch: Drop patch (applied upstream)

[Rafael Laboissiere]

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

rafael pushed a commit to branch master
in repository praat.

commit 83611b64771f927580bccb1dc38a8077f9e9e286
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed Aug 9 07:59:35 2017 -0300

    d/p/deprecated-g-type-init.patch: Drop patch (applied upstream)
---
 debian/patches/deprecated-g-type-init.patch | 30 -----------------------------
 debian/patches/series                       |  1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/deprecated-g-type-init.patch b/debian/patches/deprecated-g-type-init.patch
deleted file mode 100644
index 5a2538b..0000000
--- a/debian/patches/deprecated-g-type-init.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 debian.org>
-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 fb69080..4b102bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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