[med-svn] [Git][med-team/praat][upstream] New upstream version 6.3.19+dfsg
Rafael Laboissière (@rafael)
gitlab at salsa.debian.org
Tue Oct 24 19:42:06 BST 2023
Rafael Laboissière pushed to branch upstream at Debian Med / praat
Commits:
4bc7cec3 by Rafael Laboissière at 2023-10-24T11:51:25-03:00
New upstream version 6.3.19+dfsg
- - - - -
4 changed files:
- README.md
- fon/manual_whatsnew.cpp
- sys/GuiControl.cpp
- sys/praat_version.h
Changes:
=====================================
README.md
=====================================
@@ -145,9 +145,8 @@ Then type `make` to build `Praat.exe`
Extract the *praatXXXX_xcodeproj.zip* file from the [latest release](https://github.com/praat/praat/releases)
into the directory that contains `sys`, `fon`, `dwtools` and so on.
Then open the project `praat.xcodeproj` in Xcode 15 and choose Build or Run for the target `praat_mac`.
-You can compile with the 13.3 (i.e. the newest and standard) SDK, which will work as far back as macOS 10.11,
-which is our deployment target, and will look good even on macOS 15 Sonoma
-(Praat 6.3.18 has some graphics glitches, e.g. when scrolling the manual, if compiled with the 14.0 SDK).
+You can compile with the 14.0 SDK, which will work as far back as macOS 10.11,
+which is our deployment target, and will look good even on macOS 15 Sonoma.
If you get an error message like “Code Signing Identity xxx does not match any valid, non-expired,
code-signing certificate in your keychain”, then select the target `praat_mac`, go to Info → Build,
=====================================
fon/manual_whatsnew.cpp
=====================================
@@ -29,6 +29,10 @@ R"~~~(
Latest changes in Praat.
+##6.3.19# (20 October 2023)
+• MacOS: resolved a crash when Praat started up on macOS 12 or older
+ (worked around a bug in the Xcode linker that comes with macOS 14 Sonoma).
+
##6.3.18# (8 October 2023)
• @SpeechSynthesizer: included the new version of eSpeak (development 1.52), which has 133 languages.
• @@Add to menu...@: you can now add separators, headers and indented submenus to menus in editor windows.
=====================================
sys/GuiControl.cpp
=====================================
@@ -1,6 +1,6 @@
/* GuiControl.cpp
*
- * Copyright (C) 1993-2012,2013,2015,2017,2020,2021 Paul Boersma,
+ * Copyright (C) 1993-2012,2013,2015,2017,2020,2021,2023 Paul Boersma,
* 2008 Stefan de Koninck, 2010 Franz Brausse, 2013 Tom Naughton
*
* This code is free software; you can redistribute it and/or modify
@@ -43,7 +43,7 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
//parentHeight = parent -> d_top;
if (left < 0) left += parentWidth;
if (right <= 0) right += parentWidth;
- if (top < 0) top += parentHeight;
+ if (top < 0) top += parentHeight;
if (bottom <= 0) bottom += parentHeight;
trace (U"fixed: parent width ", parentWidth, U" height ", parentHeight);
gtk_widget_set_size_request (GTK_WIDGET (widget), right - left, bottom - top);
@@ -73,28 +73,26 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
XtVaSetValues (widget, XmNbottomAttachment, XmATTACH_FORM, XmNbottomOffset, - bottom, XmNheight, bottom - top, nullptr);
}
#elif cocoa
- NSView *superView = (NSView *) parent -> d_widget;
- NSView *widgetView = (NSView *) widget;
+ NSView *superView = (NSView *) parent -> d_widget;
+ NSView *widgetView = (NSView *) widget;
NSRect parentRect = [superView frame];
- int parentWidth = parentRect.size.width;
- int parentHeight = parentRect.size.height;
-
- NSUInteger horizMask = 0;
- if (left >= 0) {
- if (right <= 0) {
- horizMask = NSViewWidthSizable;
- }
- } else {
- horizMask = NSViewMinXMargin;
- }
-
- NSUInteger vertMask = 0;
- if (top >= 0) {
- vertMask = NSViewMinYMargin;
- if (bottom <= 0) {
- vertMask = NSViewHeightSizable;
- }
- }
+ int parentWidth = parentRect.size.width;
+ int parentHeight = parentRect.size.height;
+
+ NSUInteger horizMask = 0;
+ if (left >= 0) {
+ if (right <= 0)
+ horizMask = NSViewWidthSizable;
+ } else {
+ horizMask = NSViewMinXMargin;
+ }
+
+ NSUInteger vertMask = 0;
+ if (top >= 0) {
+ vertMask = NSViewMinYMargin;
+ if (bottom <= 0)
+ vertMask = NSViewHeightSizable;
+ }
if (left < 0) left += parentWidth;
if (right <= 0) right += parentWidth;
@@ -102,8 +100,8 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
if (bottom <= 0) bottom += parentHeight;
top = parentHeight - top; // flip
bottom = parentHeight - bottom; // flip
- int width = right - left;
- int height = top - bottom;
+ int width = right - left;
+ int height = top - bottom;
if ([widgetView isKindOfClass: [NSButton class]]) {
if (! [widgetView isKindOfClass: [NSPopUpButton class]]) {
/*
@@ -116,10 +114,11 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
height += 5;
}
}
- NSRect rect = NSMakeRect (left, bottom, width, height);
- [widgetView setAutoresizingMask: horizMask | vertMask];
- [superView addSubview: widgetView]; // parent will retain the subview...
- [widgetView setFrame: rect];
+ NSRect rect = NSMakeRect (left, bottom, width, height);
+ [widgetView setAutoresizingMask: horizMask | vertMask];
+ [superView addSubview: widgetView]; // parent will retain the subview...
+ [widgetView setFrame: rect];
+ [widgetView setClipsToBounds: true]; // 20231019: seems to be needed from SDK 14.0
[widgetView release]; // ... so we can release the item already
#endif
}
=====================================
sys/praat_version.h
=====================================
@@ -1,5 +1,5 @@
-#define PRAAT_VERSION_STR 6.3.18
-#define PRAAT_VERSION_NUM 6318
+#define PRAAT_VERSION_STR 6.3.19
+#define PRAAT_VERSION_NUM 6319
#define PRAAT_YEAR 2023
#define PRAAT_MONTH October
-#define PRAAT_DAY 8
+#define PRAAT_DAY 20
View it on GitLab: https://salsa.debian.org/med-team/praat/-/commit/4bc7cec32b229eca5c71b38336334e47a3ce9716
--
View it on GitLab: https://salsa.debian.org/med-team/praat/-/commit/4bc7cec32b229eca5c71b38336334e47a3ce9716
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231024/025ade9b/attachment-0001.htm>
More information about the debian-med-commit
mailing list