Attachment 155888 Details for Bug 199634 – Unified diff

[patch] Unified diff

praat-diff.txt (text/plain), 10.62 KB, created by Jason W. Bacon on 2015-04-23 02:18:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2015-04-23 02:18:46 UTC

Size: 10.62 KB

patch

obsolete

>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/Makefile /usr/wip/audio/praat/Makefile
>--- /usr/ports/audio/praat/Makefile	2015-04-05 14:21:57.000000000 -0500
>+++ /usr/wip/audio/praat/Makefile	2015-04-19 11:47:08.000000000 -0500
>@@ -2,26 +2,31 @@
> # $FreeBSD: head/audio/praat/Makefile 383354 2015-04-05 19:21:57Z bapt $
> 
> PORTNAME=	praat
>-PORTVERSION=	5.3.59
>+PORTVERSION=	5.4.08
> CATEGORIES=	audio science
> MASTER_SITES=	http://www.fon.hum.uva.nl/praat/
>-DISTNAME=	praat5359_sources
>+DISTNAME=	praat5408_sources
> 
> MAINTAINER=	jwbacon@tds.net
> COMMENT=	Phonetics by Computer
> 
> LICENSE=	GPLv2
> 
>-BROKEN=		Unfetchable
> DOS2UNIX_REGEX=	.*Makefile
> USES=		dos2unix iconv motif pkgconfig
> USE_GNOME=	gtk20
>-WRKSRC=		${WRKDIR}/sources_5359
>+WRKSRC=		${WRKDIR}/sources_5408
> MAKEFILE=	makefile
> PLIST_FILES=	bin/praat man/man1/praat.1.gz
> 
> LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 1000000
>+BROKEN=	Requires uchar.h, which was introduced in FreeBSD 10.0
>+.endif
>+
> post-patch:
> 	@${FIND} ${WRKSRC} -name Makefile -exec \
> 		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \;
>@@ -42,4 +47,4 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/distinfo /usr/wip/audio/praat/distinfo
>--- /usr/ports/audio/praat/distinfo	2013-11-30 21:48:54.000000000 -0600
>+++ /usr/wip/audio/praat/distinfo	2015-04-15 18:58:15.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (praat5359_sources.tar.gz) = 0a2f27a0052f8197bd85036fa5c19e11b6854f3130a3fb66ad0055939ef6ed55
>-SIZE (praat5359_sources.tar.gz) = 6856136
>+SHA256 (praat5408_sources.tar.gz) = 7390668af1b221cdfed14f215e3ef7b27229cef2a9d416c9549e9a15f6bc1315
>+SIZE (praat5408_sources.tar.gz) = 7383306
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/makefile.defs.freebsd.alsa /usr/wip/audio/praat/files/makefile.defs.freebsd.alsa
>--- /usr/ports/audio/praat/files/makefile.defs.freebsd.alsa	2013-11-30 21:48:54.000000000 -0600
>+++ /usr/wip/audio/praat/files/makefile.defs.freebsd.alsa	2015-04-15 19:33:12.000000000 -0500
>@@ -10,7 +10,7 @@
> 
> CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1
> 
>-CXXFLAGS = -Wshadow -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include
>+CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include
> 
> LINK ?= $(CXX)
> 
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-sys-melder.h /usr/wip/audio/praat/files/patch-sys-melder.h
>--- /usr/ports/audio/praat/files/patch-sys-melder.h	2013-11-30 21:48:54.000000000 -0600
>+++ /usr/wip/audio/praat/files/patch-sys-melder.h	2015-04-22 21:15:26.000000000 -0500
>@@ -1,14 +1,69 @@
>---- sys/melder.h.orig	2013-10-22 08:29:40.000000000 -0500
>-+++ sys/melder.h	2013-11-23 12:43:08.000000000 -0600
>-@@ -1073,6 +1073,11 @@
>- 			Melder_fclose (file, tmp);
>+--- sys/melder.h.orig	2015-04-21 17:43:51 UTC
>++++ sys/melder.h
>+@@ -51,6 +51,8 @@
>+ 	#define INT54_MIN  -9007199254740991LL
>+ #endif
>+ 
>++#include <uchar.h>
>++
>+ typedef wchar_t wchar;
>+ typedef uint8_t  char8_t;
>+ typedef char32_t char32;
>+@@ -222,7 +224,7 @@ static inline int64_t str16len (const ch
>+ 		return (int64_t) wcslen ((const wchar_t *) string);
>+ 	} else {
>+ 		int64_t result = 0;
>+-		while (* string ++ != u'\0') result ++;
>++		while (* string ++ != (char16_t)'\0') result ++;
>+ 		return result;
>+ 	}
>+ }
>+@@ -230,8 +232,8 @@ static inline void str16cpy (char16_t *t
>+ 	if (sizeof (wchar_t) == 2) {
>+ 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
>+ 	} else {
>+-		while (* source != u'\0') * target ++ = * source ++;
>+-		* target = u'\0';
>++		while (* source != (char16_t)'\0') * target ++ = * source ++;
>++		* target = (char16_t)'\0';
>+ 	}
>+ }
>+ static inline int str16cmp (const char16_t *string1, const char16_t *string2) {
>+@@ -239,7 +241,7 @@ static inline int str16cmp (const char16
>+ 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
>+ 	} else {
>+ 		while (*string1 == *string2 ++) {
>+-			if (*string1 ++ == u'\0') {
>++			if (*string1 ++ == (char16_t)'\0') {
>+ 				return 0;
>+ 			}
>  		}
>+@@ -251,7 +253,7 @@ static inline int64_t str32len (const ch
>+ 		return (int64_t) wcslen ((const wchar_t *) string);
>+ 	} else {
>+ 		int64_t result = 0;
>+-		while (* string ++ != U'\0') result ++;
>++		while (* string ++ != (char32_t)'\0') result ++;
>+ 		return result;
>  	}
>-+	// operator () is not working in Sound_files.cpp:226 for some reason
>-+	FILE * get_ptr(void)
>-+	{
>-+		return ptr;
>-+	}
>- };
>- 
>- class autoMelderFile {
>+ }
>+@@ -259,8 +261,8 @@ static inline void str32cpy (char32_t *t
>+ 	if (sizeof (wchar_t) == 4) {
>+ 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
>+ 	} else {
>+-		while (* source != U'\0') * target ++ = * source ++;
>+-		* target = U'\0';
>++		while (* source != (char32_t)'\0') * target ++ = * source ++;
>++		* target = (char32_t)'\0';
>+ 	}
>+ }
>+ static inline int str32cmp (const char32_t *string1, const char32_t *string2) {
>+@@ -268,7 +270,7 @@ static inline int str32cmp (const char32
>+ 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
>+ 	} else {
>+ 		while (*string1 == *string2 ++) {
>+-			if (*string1 ++ == U'\0') {
>++			if (*string1 ++ == (char32_t)'\0') {
>+ 				return 0;
>+ 			}
>+ 		}
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-sys_melder.h /usr/wip/audio/praat/files/patch-sys_melder.h
>--- /usr/ports/audio/praat/files/patch-sys_melder.h	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/wip/audio/praat/files/patch-sys_melder.h	2015-04-15 19:16:35.000000000 -0500
>@@ -0,0 +1,69 @@
>+--- sys/melder.h.orig	2015-04-15 19:10:29.000000000 -0500
>++++ sys/melder.h	2015-04-15 19:16:34.000000000 -0500
>+@@ -51,6 +51,8 @@
>+ 	#define INT54_MIN  -9007199254740991LL
>+ #endif
>+ 
>++#include <uchar.h>
>++
>+ typedef wchar_t wchar;
>+ typedef uint8_t  char8_t;
>+ typedef char32_t char32;
>+@@ -222,7 +224,7 @@
>+ 		return (int64_t) wcslen ((const wchar_t *) string);
>+ 	} else {
>+ 		int64_t result = 0;
>+-		while (* string ++ != u'\0') result ++;
>++		while (* string ++ != (char16_t)'\0') result ++;
>+ 		return result;
>+ 	}
>+ }
>+@@ -230,8 +232,8 @@
>+ 	if (sizeof (wchar_t) == 2) {
>+ 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
>+ 	} else {
>+-		while (* source != u'\0') * target ++ = * source ++;
>+-		* target = u'\0';
>++		while (* source != (char16_t)'\0') * target ++ = * source ++;
>++		* target = (char16_t)'\0';
>+ 	}
>+ }
>+ static inline int str16cmp (const char16_t *string1, const char16_t *string2) {
>+@@ -239,7 +241,7 @@
>+ 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
>+ 	} else {
>+ 		while (*string1 == *string2 ++) {
>+-			if (*string1 ++ == u'\0') {
>++			if (*string1 ++ == (char16_t)'\0') {
>+ 				return 0;
>+ 			}
>+ 		}
>+@@ -251,7 +253,7 @@
>+ 		return (int64_t) wcslen ((const wchar_t *) string);
>+ 	} else {
>+ 		int64_t result = 0;
>+-		while (* string ++ != U'\0') result ++;
>++		while (* string ++ != (char32_t)'\0') result ++;
>+ 		return result;
>+ 	}
>+ }
>+@@ -259,8 +261,8 @@
>+ 	if (sizeof (wchar_t) == 4) {
>+ 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
>+ 	} else {
>+-		while (* source != U'\0') * target ++ = * source ++;
>+-		* target = U'\0';
>++		while (* source != (char32_t)'\0') * target ++ = * source ++;
>++		* target = (char32_t)'\0';
>+ 	}
>+ }
>+ static inline int str32cmp (const char32_t *string1, const char32_t *string2) {
>+@@ -268,7 +270,7 @@
>+ 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
>+ 	} else {
>+ 		while (*string1 == *string2 ++) {
>+-			if (*string1 ++ == U'\0') {
>++			if (*string1 ++ == (char32_t)'\0') {
>+ 				return 0;
>+ 			}
>+ 		}
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-sys_melder__alloc.cpp /usr/wip/audio/praat/files/patch-sys_melder__alloc.cpp
>--- /usr/ports/audio/praat/files/patch-sys_melder__alloc.cpp	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/wip/audio/praat/files/patch-sys_melder__alloc.cpp	2015-04-22 21:15:26.000000000 -0500
>@@ -0,0 +1,13 @@
>+--- sys/melder_alloc.cpp.orig	2015-01-30 17:35:26 UTC
>++++ sys/melder_alloc.cpp
>+@@ -317,8 +317,8 @@ int Melder_strcmp (const char *string1, 
>+ }
>+ 
>+ int Melder_str32cmp (const char32 *string1, const char32 *string2) {
>+-	if (string1 == NULL) string1 = U"";
>+-	if (string2 == NULL) string2 = U"";
>++	if (string1 == NULL) string1 = (char32 *)"";
>++	if (string2 == NULL) string2 = (char32 *)"";
>+ 	return str32cmp (string1, string2);
>+ }
>+ 
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-sys_melder__files.cpp /usr/wip/audio/praat/files/patch-sys_melder__files.cpp
>--- /usr/ports/audio/praat/files/patch-sys_melder__files.cpp	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/wip/audio/praat/files/patch-sys_melder__files.cpp	2015-04-22 21:15:26.000000000 -0500
>@@ -0,0 +1,11 @@
>+--- sys/melder_files.cpp.orig	2015-03-24 09:58:31 UTC
>++++ sys/melder_files.cpp
>+@@ -301,7 +301,7 @@ void MelderFile_setToNull (MelderFile fi
>+ }
>+ 
>+ bool MelderFile_isNull (MelderFile file) {
>+-	return file == nullptr || file -> path [0] == '\0';
>++	return file == NULL || file -> path [0] == '\0';
>+ }
>+ 
>+ void MelderDir_setToNull (MelderDir dir) {
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/audio/praat/files/patch-sys_melder__strings.cpp /usr/wip/audio/praat/files/patch-sys_melder__strings.cpp
>--- /usr/ports/audio/praat/files/patch-sys_melder__strings.cpp	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/wip/audio/praat/files/patch-sys_melder__strings.cpp	2015-04-22 21:15:26.000000000 -0500
>@@ -0,0 +1,11 @@
>+--- sys/melder_strings.cpp.orig	2015-02-01 16:38:59 UTC
>++++ sys/melder_strings.cpp
>+@@ -386,7 +386,7 @@ void MelderString32_appendCharacter (Mel
>+ 	expandIfNecessary (char32)
>+ 	my string [my length] = character;
>+ 	my length ++;
>+-	my string [my length] = U'\0';
>++	my string [my length] = (char32)'\0';
>+ }
>+ 
>+ void MelderString_get (MelderString *me, wchar_t *destination) {

Actions: View | Diff

Attachments on bug 199634: 155887 | 155888 | 156661 | 156799