View | Details | Raw Unified | Return to bug 199634 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +11 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	praat
4
PORTNAME=	praat
5
PORTVERSION=	5.3.59
5
PORTVERSION=	5.4.08
6
CATEGORIES=	audio science
6
CATEGORIES=	audio science
7
MASTER_SITES=	http://www.fon.hum.uva.nl/praat/
7
MASTER_SITES=	http://www.fon.hum.uva.nl/praat/
8
DISTNAME=	praat5359_sources
8
DISTNAME=	praat5408_sources
9
9
10
MAINTAINER=	jwbacon@tds.net
10
MAINTAINER=	jwbacon@tds.net
11
COMMENT=	Phonetics by Computer
11
COMMENT=	Phonetics by Computer
Lines 12-27 Link Here
12
12
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
BROKEN=		Unfetchable
16
DOS2UNIX_REGEX=	.*Makefile
15
DOS2UNIX_REGEX=	.*Makefile
17
USES=		dos2unix iconv motif pkgconfig
16
USES=		dos2unix iconv motif pkgconfig
18
USE_GNOME=	gtk20
17
USE_GNOME=	gtk20
19
WRKSRC=		${WRKDIR}/sources_5359
18
WRKSRC=		${WRKDIR}/sources_5408
20
MAKEFILE=	makefile
19
MAKEFILE=	makefile
21
PLIST_FILES=	bin/praat man/man1/praat.1.gz
20
PLIST_FILES=	bin/praat man/man1/praat.1.gz
22
21
23
LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
22
LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
24
23
24
.include <bsd.port.pre.mk>
25
26
.if ${OSVERSION} < 1000000
27
# Requires std=g++11
28
USE_GCC=	yes
29
.endif
30
25
post-patch:
31
post-patch:
26
	@${FIND} ${WRKSRC} -name Makefile -exec \
32
	@${FIND} ${WRKSRC} -name Makefile -exec \
27
		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \;
33
		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \;
Lines 42-45 Link Here
42
	${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin
48
	${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin
43
	${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1
49
	${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1
44
50
45
.include <bsd.port.mk>
51
.include <bsd.port.post.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (praat5359_sources.tar.gz) = 0a2f27a0052f8197bd85036fa5c19e11b6854f3130a3fb66ad0055939ef6ed55
1
SHA256 (praat5408_sources.tar.gz) = 7390668af1b221cdfed14f215e3ef7b27229cef2a9d416c9549e9a15f6bc1315
2
SIZE (praat5359_sources.tar.gz) = 6856136
2
SIZE (praat5408_sources.tar.gz) = 7383306
(-)files/makefile.defs.freebsd.alsa (-1 / +1 lines)
Lines 10-16 Link Here
10
10
11
CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1
11
CFLAGS = -std=gnu99 -DUNIX -Dlinux -DALSA `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1
12
12
13
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
13
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 -I%%LOCALBASE%%/include/unicode
14
14
15
LINK ?= $(CXX)
15
LINK ?= $(CXX)
16
16
(-)files/patch-sys-melder.h (-14 lines)
Lines 1-14 Link Here
1
--- sys/melder.h.orig	2013-10-22 08:29:40.000000000 -0500
2
+++ sys/melder.h	2013-11-23 12:43:08.000000000 -0600
3
@@ -1073,6 +1073,11 @@
4
 			Melder_fclose (file, tmp);
5
 		}
6
 	}
7
+	// operator () is not working in Sound_files.cpp:226 for some reason
8
+	FILE * get_ptr(void)
9
+	{
10
+		return ptr;
11
+	}
12
 };
13
 
14
 class autoMelderFile {
(-)files/patch-sys_melder.h (-4 / +71 lines)
Lines 1-6 Link Here
1
--- sys/melder.h.orig	2013-10-22 08:29:40.000000000 -0500
1
--- sys/melder.h.orig	2015-03-22 17:29:26 UTC
2
+++ sys/melder.h	2013-11-23 12:43:08.000000000 -0600
2
+++ sys/melder.h
3
@@ -1073,6 +1073,11 @@
3
@@ -51,6 +51,8 @@
4
 	#define INT54_MIN  -9007199254740991LL
5
 #endif
6
 
7
+#include <uchar.h>
8
+
9
 typedef wchar_t wchar;
10
 typedef uint8_t  char8_t;
11
 typedef char32_t char32;
12
@@ -222,7 +224,7 @@ static inline int64_t str16len (const ch
13
 		return (int64_t) wcslen ((const wchar_t *) string);
14
 	} else {
15
 		int64_t result = 0;
16
-		while (* string ++ != u'\0') result ++;
17
+		while (* string ++ != (char16_t)'\0') result ++;
18
 		return result;
19
 	}
20
 }
21
@@ -230,8 +232,8 @@ static inline void str16cpy (char16_t *t
22
 	if (sizeof (wchar_t) == 2) {
23
 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
24
 	} else {
25
-		while (* source != u'\0') * target ++ = * source ++;
26
-		* target = u'\0';
27
+		while (* source != (char16_t)'\0') * target ++ = * source ++;
28
+		* target = (char16_t)'\0';
29
 	}
30
 }
31
 static inline int str16cmp (const char16_t *string1, const char16_t *string2) {
32
@@ -239,7 +241,7 @@ static inline int str16cmp (const char16
33
 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
34
 	} else {
35
 		while (*string1 == *string2 ++) {
36
-			if (*string1 ++ == u'\0') {
37
+			if (*string1 ++ == (char16_t)'\0') {
38
 				return 0;
39
 			}
40
 		}
41
@@ -251,7 +253,7 @@ static inline int64_t str32len (const ch
42
 		return (int64_t) wcslen ((const wchar_t *) string);
43
 	} else {
44
 		int64_t result = 0;
45
-		while (* string ++ != U'\0') result ++;
46
+		while (* string ++ != (char32_t)'\0') result ++;
47
 		return result;
48
 	}
49
 }
50
@@ -259,8 +261,8 @@ static inline void str32cpy (char32_t *t
51
 	if (sizeof (wchar_t) == 4) {
52
 		wcscpy ((wchar_t *) target, (const wchar_t *) source);
53
 	} else {
54
-		while (* source != U'\0') * target ++ = * source ++;
55
-		* target = U'\0';
56
+		while (* source != (char32_t)'\0') * target ++ = * source ++;
57
+		* target = (char32_t)'\0';
58
 	}
59
 }
60
 static inline int str32cmp (const char32_t *string1, const char32_t *string2) {
61
@@ -268,7 +270,7 @@ static inline int str32cmp (const char32
62
 		return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2);
63
 	} else {
64
 		while (*string1 == *string2 ++) {
65
-			if (*string1 ++ == U'\0') {
66
+			if (*string1 ++ == (char32_t)'\0') {
67
 				return 0;
68
 			}
69
 		}
70
@@ -1171,6 +1173,11 @@ public:
4
 			Melder_fclose (file, tmp);
71
 			Melder_fclose (file, tmp);
5
 		}
72
 		}
6
 	}
73
 	}
Lines 7-13 Link Here
7
+	// operator () is not working in Sound_files.cpp:226 for some reason
74
+	// operator () is not working in Sound_files.cpp:226 for some reason
8
+	FILE * get_ptr(void)
75
+	FILE * get_ptr(void)
9
+	{
76
+	{
10
+		return ptr;
77
+	        return ptr;
11
+	}
78
+	}
12
 };
79
 };
13
 
80
 
(-)files/patch-sys_melder__alloc.cpp (+13 lines)
Line 0 Link Here
1
--- sys/melder_alloc.cpp.orig	2015-01-30 17:35:26 UTC
2
+++ sys/melder_alloc.cpp
3
@@ -317,8 +317,8 @@ int Melder_strcmp (const char *string1, 
4
 }
5
 
6
 int Melder_str32cmp (const char32 *string1, const char32 *string2) {
7
-	if (string1 == NULL) string1 = U"";
8
-	if (string2 == NULL) string2 = U"";
9
+	if (string1 == NULL) string1 = (char32 *)"";
10
+	if (string2 == NULL) string2 = (char32 *)"";
11
 	return str32cmp (string1, string2);
12
 }
13
 
(-)files/patch-sys_melder__files.cpp (+11 lines)
Line 0 Link Here
1
--- sys/melder_files.cpp.orig	2015-03-24 09:58:31 UTC
2
+++ sys/melder_files.cpp
3
@@ -301,7 +301,7 @@ void MelderFile_setToNull (MelderFile fi
4
 }
5
 
6
 bool MelderFile_isNull (MelderFile file) {
7
-	return file == nullptr || file -> path [0] == '\0';
8
+	return file == NULL || file -> path [0] == '\0';
9
 }
10
 
11
 void MelderDir_setToNull (MelderDir dir) {
(-)files/patch-sys_melder__strings.cpp (+11 lines)
Line 0 Link Here
1
--- sys/melder_strings.cpp.orig	2015-02-01 16:38:59 UTC
2
+++ sys/melder_strings.cpp
3
@@ -386,7 +386,7 @@ void MelderString32_appendCharacter (Mel
4
 	expandIfNecessary (char32)
5
 	my string [my length] = character;
6
 	my length ++;
7
-	my string [my length] = U'\0';
8
+	my string [my length] = (char32)'\0';
9
 }
10
 
11
 void MelderString_get (MelderString *me, wchar_t *destination) {

Return to bug 199634