CVS commit: pkgsrc/misc/fbreader

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Tue Oct 29 14:09:10 UTC 2019

Modified Files:
        pkgsrc/misc/fbreader: Makefile distinfo
Added Files:
        pkgsrc/misc/fbreader/patches:
            patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp

Log Message:
fbreader: Adapt for NetBSD POSIX iconv(3)


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/misc/fbreader/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/misc/fbreader/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/fbreader/patches/patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/fbreader/Makefile
diff -u pkgsrc/misc/fbreader/Makefile:1.72 pkgsrc/misc/fbreader/Makefile:1.73
--- pkgsrc/misc/fbreader/Makefile:1.72  Thu Aug 22 12:23:30 2019
+++ pkgsrc/misc/fbreader/Makefile       Tue Oct 29 14:09:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2019/08/22 12:23:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2019/10/29 14:09:09 kamil Exp $
 
 DISTNAME=      fbreader-sources-0.99.4
 PKGNAME=       ${DISTNAME:S/-sources//}
@@ -23,7 +23,7 @@ MAKE_ENV+=    TARGET_ARCH=desktop
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "SunOS"
 CPPFLAGS+=     -DDO_ICONV_CAST
 .endif
 

Index: pkgsrc/misc/fbreader/distinfo
diff -u pkgsrc/misc/fbreader/distinfo:1.14 pkgsrc/misc/fbreader/distinfo:1.15
--- pkgsrc/misc/fbreader/distinfo:1.14  Tue Sep 10 16:38:31 2019
+++ pkgsrc/misc/fbreader/distinfo       Tue Oct 29 14:09:09 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2019/09/10 16:38:31 maya Exp $
+$NetBSD: distinfo,v 1.15 2019/10/29 14:09:09 kamil Exp $
 
 SHA1 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292
 RMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed
@@ -15,6 +15,7 @@ SHA1 (patch-fbreader_src_formats_html_Ht
 SHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692
 SHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436
 SHA1 (patch-zlibrary_core_Makefile) = 141543c94a63f9c56858c43f07892e05b060bf01
+SHA1 (patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp) = 386911122a0a7ec00ee74b4edb04da302433671b
 SHA1 (patch-zlibrary_text_Makefile) = aa7d8a7e3d170e903af704edafe49297e158fd51
 SHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78
 SHA1 (patch-zlibrary_ui_Makefile) = 9586070b53f415ec757fb6648c66c36684e801ea

Added files:

Index: pkgsrc/misc/fbreader/patches/patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp
diff -u /dev/null pkgsrc/misc/fbreader/patches/patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp:1.1
--- /dev/null   Tue Oct 29 14:09:10 2019
+++ pkgsrc/misc/fbreader/patches/patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp  Tue Oct 29 14:09:09 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-zlibrary_core_src_unix_iconv_IConvEncodingConverter.cpp,v 1.1 2019/10/29 14:09:09 kamil Exp $
+
+Handle NetBSD POSIX iconv(3) switch.
+
+--- zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp.orig       2012-11-30 12:41:25.000000000 +0000
++++ zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp
+@@ -23,6 +23,13 @@
+ 
+ #include "IConvEncodingConverter.h"
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if !__NetBSD_Prereq__(9,99,17)
++#define DO_ICONV_CAST 1
++#endif
++#endif
++
+ class IConvEncodingConverter : public ZLEncodingConverter {
+ 
+ private: