From 554d2cd57d61f1a9dfc41bbe8bcf05d03d5ce121 Mon Sep 17 00:00:00 2001 From: Rob van Son Date: Tue, 3 Nov 2015 10:08:35 +0100 Subject: [PATCH] Adapted patch and scripts to Praat 6.0.04 --- praat_module/adaptPraat.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/praat_module/adaptPraat.patch b/praat_module/adaptPraat.patch index 5848618..e280a8b 100644 --- a/praat_module/adaptPraat.patch +++ b/praat_module/adaptPraat.patch @@ -57,7 +57,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr /* * Running the Praat shell from the command line: # Change the name of the Unix preference dir -@@ -1253,7 +1253,7 @@ void praat_init (const char *title, unsi +@@ -1253,7 +1255,7 @@ void praat_init (const char *title, unsi */ char32 name [256]; #if defined (UNIX) @@ -67,7 +67,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr Melder_sprint (name,256, praatP.title, U" Prefs"); // for example MyProg Prefs #elif defined (_WIN32) # Something in Linux (GTK)? Do not know what? -@@ -1337,6 +1337,12 @@ void praat_init (const char *title, unsi +@@ -1337,6 +1339,12 @@ void praat_init (const char *title, unsi GuiWindow raam = nullptr; if (Melder_batch) { @@ -81,7 +81,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr for (unsigned int i = praatP.argumentNumber - 1; i < argc; i ++) { if (i >= praatP.argumentNumber) MelderString_append (& theCurrentPraatApplication -> batchName, U" "); # Supress opening the object window -@@ -1380,9 +1386,11 @@ void praat_init (const char *title, unsi +@@ -1380,9 +1388,11 @@ void praat_init (const char *title, unsi #if motif GuiApp_setApplicationShell (theCurrentPraatApplication -> topShell -> d_xmShell); #endif @@ -94,7 +94,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr Thing_recognizeClassesByName (classCollection, classStrings, classManPages, classSortedSetOfString, nullptr); if (Melder_batch) { # Seems to speed startup, but not sure whether it is necessary -@@ -1392,6 +1400,9 @@ void praat_init (const char *title, unsi +@@ -1392,6 +1402,9 @@ void praat_init (const char *title, unsi trace (U"adding fixed buttons without GUI"); praat_addFixedButtons (nullptr); } else { @@ -105,7 +105,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr #ifdef macintosh #if ! useCarbon # Supress opening the object window -@@ -1419,7 +1430,9 @@ void praat_init (const char *title, unsi +@@ -1419,7 +1432,9 @@ void praat_init (const char *title, unsi trace (U"creating the dynamic menu in the Objects window"); praat_actions_createDynamicMenu (raam); trace (U"showing the Objects window"); @@ -116,7 +116,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr #if defined (UNIX) && ! defined (NO_GRAPHICS) try { # Initialize a picture window, but close it immediately -@@ -1450,7 +1463,12 @@ void praat_init (const char *title, unsi +@@ -1450,7 +1465,12 @@ void praat_init (const char *title, unsi trace (U"creating the Picture window"); trace (U"before picture window shows: locale is ", Melder_peek8to32 (setlocale (LC_ALL, nullptr))); @@ -131,7 +131,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr if (unknownCommandLineOption) { # No idea why this is needed? -@@ -1606,11 +1624,11 @@ void praat_run (void) { +@@ -1606,11 +1626,11 @@ void praat_run (void) { if (! str32equ (Melder_integer (dummy), U"1000000000000")) Melder_fatal (U"The number 1000000000000 is mistaken written on this machine as ", dummy, U"."); } @@ -149,7 +149,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr Melder_assert ((uint32) dummy == 3000000000); } # Next chunk is needed to start the Demo window under Windows (motif) -@@ -1721,10 +1739,20 @@ void praat_run () { +@@ -1721,10 +1741,20 @@ void praat_run () { #elif cocoa [NSApp run]; #elif motif -- 2.11.4.GIT