cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use locale_charset() from libiconv instead if nl_langinfo(CODESET)

Browse Source 
directly to get the codeset.  locale_charset() canonicalizes the
  codeset name "646", which libiconv does not understand, to "ASCII",
  which libiconv does understand.
- use my OpenBSD email address
- and of course, bump the PKGNAME

OK jolan@
This commit is contained in:
jakemsr 2005-12-08 05:47:26 +00:00
parent fa2f743dbf
commit 51e9b47b80
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/dvdauthor/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/09/28 06:52:55 jakemsr Exp $
# $OpenBSD: Makefile,v 1.2 2005/12/08 05:47:26 jakemsr Exp $
COMMENT= creates DVD file structures
DISTNAME= dvdauthor-0.6.11
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
HOMEPAGE= http://dvdauthor.sourceforge.net/
MAINTAINER= Jacob Meuser <jakemsr@jakemsr.com>
MAINTAINER= Jacob Meuser <jakemsr@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

21
multimedia/dvdauthor/patch-src_readxml_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_readxml_c,v 1.1 2005/12/08 05:47:28 jakemsr Exp $
--- src/readxml.c.orig Mon Dec 5 20:52:14 2005
+++ src/readxml.c Mon Dec 5 20:57:19 2005
@@ -34,6 +34,8 @@
#include <locale.h>
#endif
+#include <localcharset.h>
+
static const char RCSID[]="$Id: patch-src_readxml_c,v 1.1 2005/12/08 05:47:28 jakemsr Exp $";
int parser_err=0, parser_acceptbody=0;
@@ -207,7 +209,7 @@ static iconv_t get_conv()
}
} else
fprintf(stderr,"WARN: Error reading locale (%m), assuming C\n");
- enc=nl_langinfo(CODESET);
+ enc=locale_charset();
fprintf(stderr,"INFO: Converting filenames to %s\n",enc);
ic=iconv_open(enc,"UTF-8");
if( ic==((iconv_t)-1) ) {