Attachment #64529 for bug #95906

View | Details | Raw Unified | Return to bug 95906
Collapse All | Expand All




# Date created:			Fri Jun 24 20:30:04 CEST 2005
# Whom:				Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD: ports/audio/wavpack/Makefile,v 1.6 2006/04/14 23:25:05 linimon Exp $
#

PORTNAME=	wavpack
PORTVERSION=	4.32
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	http://www.wavpack.com/





--- wavpack.c.orig	Thu Apr  6 02:17:41 2006
+++ wavpack.c	Mon Apr 17 01:30:57 2006
@@ -1604,6 +1604,7 @@
     MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1);
     WideCharToUTF8 (temp, (uchar *) string, len);
 #else
+    iconv_t converter;
     char *temp = malloc (len);
     char *outp = temp;
     char *inp = string;
@@ -1614,7 +1615,7 @@
 
     memset(temp, 0, len);
     old_locale = setlocale (LC_CTYPE, "");
-    iconv_t converter = iconv_open ("UTF-8", "");
+    converter = iconv_open ("UTF-8", "");
     err = iconv (converter, &inp, &insize, &outp, &outsize);
     iconv_close (converter);
     setlocale (LC_CTYPE, old_locale);

Return to bug 95906

Lines 2-12 Link Here

(-)/usr/home/trn/port-work/wavpack/Makefile (-1 / +2 lines)
2	# Date created: Fri Jun 24 20:30:04 CEST 2005	2	# Date created: Fri Jun 24 20:30:04 CEST 2005
3	# Whom: Koop Mast <kwm@FreeBSD.org>	3	# Whom: Koop Mast <kwm@FreeBSD.org>
4	#	4	#
5	# $FreeBSD: ports/audio/wavpack/Makefile,v 1.7 2006/04/15 15:52:53 pav Exp $	5	# $FreeBSD: ports/audio/wavpack/Makefile,v 1.6 2006/04/14 23:25:05 linimon Exp $
6	#	6	#
7		7
8	PORTNAME= wavpack	8	PORTNAME= wavpack
9	PORTVERSION= 4.32	9	PORTVERSION= 4.32
		10	PORTREVISION= 1
10	CATEGORIES= audio	11	CATEGORIES= audio
11	MASTER_SITES= http://www.wavpack.com/	12	MASTER_SITES= http://www.wavpack.com/
12		13

Line 0 Link Here

(-)/usr/home/trn/port-work/wavpack/files/patch-wavpack.c (+19 lines)
	1	--- wavpack.c.orig Thu Apr 6 02:17:41 2006
	2	+++ wavpack.c Mon Apr 17 01:30:57 2006
	3	@@ -1604,6 +1604,7 @@
	4	MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1);
	5	WideCharToUTF8 (temp, (uchar *) string, len);
	6	#else
	7	+ iconv_t converter;
	8	char *temp = malloc (len);
	9	char *outp = temp;
	10	char *inp = string;
	11	@@ -1614,7 +1615,7 @@
	12
	13	memset(temp, 0, len);
	14	old_locale = setlocale (LC_CTYPE, "");
	15	- iconv_t converter = iconv_open ("UTF-8", "");
	16	+ converter = iconv_open ("UTF-8", "");
	17	err = iconv (converter, &inp, &insize, &outp, &outsize);
	18	iconv_close (converter);
	19	setlocale (LC_CTYPE, old_locale);