Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Apr 2006 01:43:04 -0400 (EDT)
From:      "Jeffrey H. Johnson" <trn@offworld.cqasys.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/95906: [PATCH] audio/wavpack: Fix compile failure on 4.x
Message-ID:  <20060417054305.033963982A@offworld.cqasys.com>
Resent-Message-ID: <200604170550.k3H5o5KI022078@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95906
>Category:       ports
>Synopsis:       [PATCH] audio/wavpack: Fix compile failure on 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 17 05:50:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jeffrey H. Johnson
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD offworld.cqasys.com 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #22: Thu Feb  9 18:21:45 EST
>Description:
Applied iconv patch.  Port author has been notified, patch will be fixed
upstream and included in 4.33.

Added file(s):
- files/patch-wavpack.c

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- wavpack-4.32_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/wavpack/Makefile /usr/home/trn/port-work/wavpack/Makefile
--- /usr/ports/audio/wavpack/Makefile	Sat Apr 15 11:52:53 2006
+++ /usr/home/trn/port-work/wavpack/Makefile	Mon Apr 17 01:40:41 2006
@@ -2,11 +2,12 @@
 # Date created:			Fri Jun 24 20:30:04 CEST 2005
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
-# $FreeBSD: ports/audio/wavpack/Makefile,v 1.7 2006/04/15 15:52:53 pav Exp $
+# $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/
 
diff -ruN --exclude=CVS /usr/ports/audio/wavpack/files/patch-wavpack.c /usr/home/trn/port-work/wavpack/files/patch-wavpack.c
--- /usr/ports/audio/wavpack/files/patch-wavpack.c	Wed Dec 31 19:00:00 1969
+++ /usr/home/trn/port-work/wavpack/files/patch-wavpack.c	Mon Apr 17 01:33:48 2006
@@ -0,0 +1,19 @@
+--- 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);
--- wavpack-4.32_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060417054305.033963982A>