[med-svn] [praat] 06/10: Drop patch sendpraat-getenv-display (applied upstream)

Rafael Laboissière rlaboiss-guest at alioth.debian.org
Sat Oct 26 01:27:20 UTC 2013


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

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

commit 39b7f3f3e4657cd6269a3189bce8579d0987f215
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat Oct 26 02:14:14 2013 +0200

    Drop patch sendpraat-getenv-display (applied upstream)
---
 debian/patches/sendpraat-getenv-display.patch |   24 ------------------------
 debian/patches/series                         |    1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/sendpraat-getenv-display.patch b/debian/patches/sendpraat-getenv-display.patch
deleted file mode 100644
index a065282..0000000
--- a/debian/patches/sendpraat-getenv-display.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Get DISPLAY from the environment
- The current code in sys/sendpraat.c hardcodes the value of the DISPLAY
- (":0.0").  This is inappropriate when PRaat is run trhough, say, SSH,
- in which case the DISPLAY would be something like "localhost:10.0".
- In order to avoid this problem, the value of DISPLAY is obtained
- using getenv() in this patch.
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: no
-Last-Update: 2013-04-22
-
---- praat-5.3.46.orig/sys/sendpraat.c
-+++ praat-5.3.46/sys/sendpraat.c
-@@ -233,9 +233,9 @@ char *sendpraat (void *display, const ch
- 			g_type_init ();
- 			int displaySupplied = display != NULL;
- 			if (! displaySupplied) {
--				display = gdk_display_open (":0.0");   /* GdkDisplay* */
-+				display = gdk_display_open (getenv ("DISPLAY"));   /* GdkDisplay* */
- 				if (display == NULL) {
--					sprintf (errorMessage, "Cannot open display :0.0.");
-+					sprintf (errorMessage, "Cannot open display %s", getenv ("DISPLAY"));
- 					return errorMessage;
- 				}
- 			}
diff --git a/debian/patches/series b/debian/patches/series
index 596c17b..4c075f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use-ldflags.patch
-sendpraat-getenv-display.patch
 sendpraat-help-string.patch

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



More information about the debian-med-commit mailing list