kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass in DO_ICONV_CAST on Solaris and NetBSD instead of incorrect

Browse source 
patch. Noted by Alexander Polakov in PR 43113.
This commit is contained in:
wiz 2010-04-05 18:50:48 +00:00
parent 19577eb54f
commit a983c33bf2
4 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
misc/fbreader/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:13 wiz Exp $
# $NetBSD: Makefile,v 1.8 2010/04/05 18:50:48 wiz Exp $
#
DISTNAME= fbreader-sources-0.10.7
@ -24,6 +24,12 @@ MAKE_ENV+= DESTDIR=${DESTDIR}
MAKE_ENV+= LDFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib
MAKE_ENV+= TARGET_ARCH=desktop
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
CPPFLAGS+= -DDO_ICONV_CAST
.endif
.include "options.mk"
.include "../../archivers/bzip2/buildlink3.mk"

5
misc/fbreader/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.2 2009/10/31 03:20:35 wiz Exp $
$NetBSD: distinfo,v 1.3 2010/04/05 18:50:48 wiz Exp $
SHA1 (fbreader-sources-0.10.7.tgz) = d47a2fa46d43057cac9408db1f2c409f0d3a9942
RMD160 (fbreader-sources-0.10.7.tgz) = dec4d8ee716697dd021535295c9fe62970f059a2
@ -6,10 +6,9 @@ Size (fbreader-sources-0.10.7.tgz) = 1600984 bytes
SHA1 (patch-aa) = c76391244ee4a5f2efb1729157638ddb1ca97d3e
SHA1 (patch-ab) = b2b2efd7389a847429003e460bd3ccfe4fb27722
SHA1 (patch-ac) = 95c7a7bee4cfc017cdf52ac04895d78fde2530df
SHA1 (patch-ad) = 1ba41ce767a7affeae6a02953eea390b8db88bf7
SHA1 (patch-ae) = 29b33b9440e013cf87ae02ec4d32826f62e6b2ba
SHA1 (patch-af) = dad6ecbf5ca5663d11ea4a5dbb0bed1ab3cae6d8
SHA1 (patch-ag) = 19e92bd82df3cfb134ff17c9bdbb59028aceff95
SHA1 (patch-ah) = 1a154c4650eefd8d255e3b17583e401000c07a54
SHA1 (patch-ai) = d851a0cc23f9515afa5433cb31755a792b5a9345
SHA1 (patch-ai) = d62ca84596a94f1ec020d419eb0c4f0a28422e1e
SHA1 (patch-aj) = 5db2865b8975eb9972ec78ebc0914a81bd382b4c

22
misc/fbreader/patches/patch-ad
View file

@ -1,22 +0,0 @@
$NetBSD: patch-ad,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
--- zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp.orig 2009-01-11 01:44:33.000000000 +0100
+++ zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp
@@ -89,7 +89,7 @@ iconvlabel:
#ifdef DO_ICONV_CAST
iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize);
#else // DO_ICONV_CAST
- iconv(myIConverter, &in, &inSize, &out, &outSize);
+ iconv(myIConverter, (const char **)&in, &inSize, &out, &outSize);
#endif // DO_ICONV_CAST
if (inSize != 0) {
if (myBuffer.empty()) {
@@ -132,7 +132,7 @@ bool IConvEncodingConverter::fillTable(i
#ifdef DO_ICONV_CAST
iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize);
#else // DO_ICONV_CAST
- iconv(myIConverter, &in, &inSize, &out, &outSize);
+ iconv(myIConverter, (const char **)&in, &inSize, &out, &outSize);
#endif // DO_ICONV_CAST
if (inSize == 0) {
ZLUnicodeUtil::Ucs4Char ch;

10
misc/fbreader/patches/patch-ai
View file

@ -1,12 +1,14 @@
$NetBSD: patch-ai,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
$NetBSD: patch-ai,v 1.2 2010/04/05 18:50:48 wiz Exp $
--- makefiles/arch/desktop.mk.orig 2008-03-22 13:00:31.000000000 +0000
--- makefiles/arch/desktop.mk.orig 2009-03-30 12:56:07.000000000 +0000
+++ makefiles/arch/desktop.mk
@@ -11,7 +11,6 @@ AR = ar rsu
@@ -10,8 +10,7 @@ CC = gcc
AR = ar rsu
LD = g++
CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
-LDFLAGS =
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG ${CPPFLAGS}
ifeq "$(UI_TYPE)" "qt"
MOC = moc-qt3