add goldendict to pkgsrc-wip

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: add goldendict to pkgsrc-wip
From: Jake Slazenger <jake.slazenger%yandex.com@localhost>
Date: Thu, 01 Mar 2018 19:24:36 +0000
Module Name:	pkgsrc-wip
Committed By:	Jake Slazenger <jake.slazenger%yandex.com@localhost>
Pushed By:	jakeSlaz
Date:		Thu Mar 1 22:24:36 2018 +0300
Changeset:	2faf30b8df6d85a83add75deb31bc5af31d418e1

Added Files:
	goldendict/DESCR
	goldendict/Makefile
	goldendict/PLIST
	goldendict/TODO
	goldendict/distinfo
	goldendict/patches/patch-bgl_babylon.cc
	goldendict/patches/patch-goldendict.pro
	goldendict/patches/patch-iconv.cc
	goldendict/patches/patch-mdictparser.cc

Log Message:
add goldendict to pkgsrc-wip

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2faf30b8df6d85a83add75deb31bc5af31d418e1

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

diffstat:
 goldendict/DESCR                        |  5 ++++
 goldendict/Makefile                     | 44 +++++++++++++++++++++++++++++++++
 goldendict/PLIST                        | 40 ++++++++++++++++++++++++++++++
 goldendict/TODO                         |  5 ++++
 goldendict/distinfo                     | 10 ++++++++
 goldendict/patches/patch-bgl_babylon.cc | 20 +++++++++++++++
 goldendict/patches/patch-goldendict.pro | 30 ++++++++++++++++++++++
 goldendict/patches/patch-iconv.cc       | 33 +++++++++++++++++++++++++
 goldendict/patches/patch-mdictparser.cc | 19 ++++++++++++++
 9 files changed, 206 insertions(+)

diffs:
diff --git a/goldendict/DESCR b/goldendict/DESCR
new file mode 100644
index 0000000000..85d315c7a3
--- /dev/null
+++ b/goldendict/DESCR
@@ -0,0 +1,5 @@
+A feature-rich dictionary lookup program, supporting multiple
+dictionary formats (StarDict/Babylon/Lingvo/Dictd) and online dictionaries,
+featuring perfect article rendering with the complete markup,
+illustrations and other content retained, and allowing you to
+type in words without any accents or correct case.
diff --git a/goldendict/Makefile b/goldendict/Makefile
new file mode 100644
index 0000000000..965ae10f4b
--- /dev/null
+++ b/goldendict/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD$
+
+GITHUB_PROJECT=	goldendict
+DISTNAME=		goldendict-1.5.0rc2
+CATEGORIES=		lang
+MASTER_SITES=	-https://github.com/${GITHUB_PROJECT}/${DIST_SUBDIR}/archive/1.5.0-RC2.tar.gz
+DIST_SUBDIR=	${GITHUB_PROJECT}
+WRKSRC=			${WRKDIR}/goldendict-1.5.0-RC2
+
+QMAKE= ${QTDIR}/bin/qmake
+
+MAINTAINER=	jake.slazenger%yandex.com@localhost
+HOMEPAGE=	https://github.com/goldendict/goldendict/
+COMMENT=	Dictionary lookup program
+LICENSE=	gnu-gpl-v3
+
+USE_LANGUAGES=	c c++
+
+do-configure:
+	cd ${WRKSRC} && \
+		${QMAKE} -o Makefile goldendict.pro  \
+		INCLUDEPATH+="${PREFIX}/${BUILDLINK_INCDIRS.ffmpeg3}" \
+		QMAKE_LIBDIR+="${PREFIX}/${BUILDLINK_LIBDIRS.ffmpeg3}" \
+		PREFIX=${DESTDIR}/${PREFIX} \
+		#CONFIG+=debug   # Debug mode for GoldenDict
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/lzo/buildlink3.mk"
+.include "../../audio/libao/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/phonon/buildlink3.mk"
+.include "../../textproc/eb/buildlink3.mk"
+.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/recordproto/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/goldendict/PLIST b/goldendict/PLIST
new file mode 100644
index 0000000000..ce025ba532
--- /dev/null
+++ b/goldendict/PLIST
@@ -0,0 +1,40 @@
+@comment $NetBSD$
+bin/goldendict
+share/applications/goldendict.desktop
+share/goldendict/help/gdhelp_en.qch
+share/goldendict/help/gdhelp_ru.qch
+share/goldendict/locale/ar_SA.qm
+share/goldendict/locale/ay_WI.qm
+share/goldendict/locale/be_BY.qm
+share/goldendict/locale/be_BY%latin.qm@localhost
+share/goldendict/locale/bg_BG.qm
+share/goldendict/locale/cs_CZ.qm
+share/goldendict/locale/de_DE.qm
+share/goldendict/locale/el_GR.qm
+share/goldendict/locale/es_AR.qm
+share/goldendict/locale/es_BO.qm
+share/goldendict/locale/es_ES.qm
+share/goldendict/locale/fa_IR.qm
+share/goldendict/locale/fr_FR.qm
+share/goldendict/locale/it_IT.qm
+share/goldendict/locale/ja_JP.qm
+share/goldendict/locale/ko_KR.qm
+share/goldendict/locale/lt_LT.qm
+share/goldendict/locale/mk_MK.qm
+share/goldendict/locale/nl_NL.qm
+share/goldendict/locale/pl_PL.qm
+share/goldendict/locale/pt_BR.qm
+share/goldendict/locale/qu_WI.qm
+share/goldendict/locale/ru_RU.qm
+share/goldendict/locale/sk_SK.qm
+share/goldendict/locale/sq_AL.qm
+share/goldendict/locale/sr_SR.qm
+share/goldendict/locale/sv_SE.qm
+share/goldendict/locale/tg_TJ.qm
+share/goldendict/locale/tk_TM.qm
+share/goldendict/locale/tr_TR.qm
+share/goldendict/locale/uk_UA.qm
+share/goldendict/locale/vi_VN.qm
+share/goldendict/locale/zh_CN.qm
+share/goldendict/locale/zh_TW.qm
+share/pixmaps/goldendict.png
diff --git a/goldendict/TODO b/goldendict/TODO
new file mode 100644
index 0000000000..dbd4b1ff52
--- /dev/null
+++ b/goldendict/TODO
@@ -0,0 +1,5 @@
+* remove liconv
+* groupcombobox (or qt4(???)) problem
+* BGL dicts problem
+* check dependencies
+* remove obsolete patches
diff --git a/goldendict/distinfo b/goldendict/distinfo
new file mode 100644
index 0000000000..669a187068
--- /dev/null
+++ b/goldendict/distinfo
@@ -0,0 +1,10 @@
+$NetBSD$
+
+SHA1 (goldendict/goldendict-1.5.0rc2.tar.gz) = e91fe659d5ca3e08b337bae46e926702b04c03d1
+RMD160 (goldendict/goldendict-1.5.0rc2.tar.gz) = 036861c9a4d4b92cdb42ea7f6de15db13b638d45
+SHA512 (goldendict/goldendict-1.5.0rc2.tar.gz) = b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
+Size (goldendict/goldendict-1.5.0rc2.tar.gz) = 19413751 bytes
+SHA1 (patch-bgl_babylon.cc) = 5f26f0c3211cc14dc06c3919113b4d59cc4959a1
+SHA1 (patch-goldendict.pro) = cd33dba2b4aef895ebd4f36885f92520bfefb457
+SHA1 (patch-iconv.cc) = 0c336e5bc4f98b65a4829ebb0fa91f0deb180aad
+SHA1 (patch-mdictparser.cc) = 33abe38c30b9b58187d14e027da64f5f744e65f9
diff --git a/goldendict/patches/patch-bgl_babylon.cc b/goldendict/patches/patch-bgl_babylon.cc
new file mode 100644
index 0000000000..80a6fea667
--- /dev/null
+++ b/goldendict/patches/patch-bgl_babylon.cc
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Set inbuf to const char type because it's a second argument to iconv function,
+which on NetBSD has type const char.
+
+--- bgl_babylon.cc	2016-04-26 16:32:50.000000000 +0000
++++ bgl_babylon.cc
+@@ -803,7 +803,12 @@ void Babylon::convertToUtf8( std::string
+   inbufbytes = s.size();
+   outbufbytes = s.size() * 6;
+ 
++#if defined(__NetBSD__)
++  const char *inbuf;
++#else
+   char *inbuf;
++#endif
++
+   inbuf = (char *)s.data();
+   outbuf = (char*)malloc( outbufbytes + 1 );
+   if( !outbuf )
diff --git a/goldendict/patches/patch-goldendict.pro b/goldendict/patches/patch-goldendict.pro
new file mode 100644
index 0000000000..e092a65df1
--- /dev/null
+++ b/goldendict/patches/patch-goldendict.pro
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Add some libraries to the linker. And remove unneeded.
+
+--- goldendict.pro	2016-04-26 16:32:50.000000000 +0000
++++ goldendict.pro
+@@ -44,7 +44,12 @@ RCC_DIR = build
+ LIBS += \
+         -lz \
+         -lbz2 \
+-        -llzo2
++        -llzo2 \
++        -lexecinfo \
++        -lintl \
++        -lavutil \
++        -lavformat \
++        -lavcodec
+ 
+ !isEmpty(DISABLE_INTERNAL_PLAYER): DEFINES += DISABLE_INTERNAL_PLAYER
+ 
+@@ -157,9 +162,6 @@ unix:!mac {
+         hunspell
+     isEmpty(DISABLE_INTERNAL_PLAYER) {
+         PKGCONFIG += ao \
+-            libavutil \
+-            libavformat \
+-            libavcodec
+     }
+     arm {
+         LIBS += -liconv
diff --git a/goldendict/patches/patch-iconv.cc b/goldendict/patches/patch-iconv.cc
new file mode 100644
index 0000000000..2aa4ed127e
--- /dev/null
+++ b/goldendict/patches/patch-iconv.cc
@@ -0,0 +1,33 @@
+$NetBSD$
+
+NetBSD doesn't support "WCHAR_T" so set Iconv::GdWchar to "UCS-4LE" codeset.
+
+Set inBuf to const char type because it's a second argument to iconv function,
+which on NetBSD has type const char.
+
+--- iconv.cc	2016-04-26 16:32:50.000000000 +0000
++++ iconv.cc
+@@ -6,7 +6,7 @@
+ #include <errno.h>
+ #include <string.h>
+ 
+-#ifdef __WIN32
++#if defined (__WIN32) || defined (__NetBSD__)
+ char const * const Iconv::GdWchar = "UCS-4LE";
+ #else
+ char const * const Iconv::GdWchar = "WCHAR_T";
+@@ -45,10 +45,11 @@ Iconv::Result Iconv::convert( void const
+ {
+   size_t result = iconv( state,
+ //                         #ifdef __WIN32
+-//                         (char const **)&inBuf,
+-//                         #else
++		  				 #if defined(__NetBSD__)
++                         (char const **)&inBuf,
++                         #else
+                          (char **)&inBuf,
+-//                         #endif
++                         #endif
+                                            &inBytesLeft,
+                          (char **)&outBuf, &outBytesLeft );
+ 
diff --git a/goldendict/patches/patch-mdictparser.cc b/goldendict/patches/patch-mdictparser.cc
new file mode 100644
index 0000000000..f096596cd4
--- /dev/null
+++ b/goldendict/patches/patch-mdictparser.cc
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Set inBuf to const char type because it's a second argument to iconv function,
+which on NetBSD has type const char.
+
+--- mdictparser.cc	2016-04-26 16:32:50.000000000 +0000
++++ mdictparser.cc
+@@ -187,7 +187,11 @@ QString MdictParser::toUtf16( const char
+   vector<char> result;
+   const static int CHUNK_SIZE = 512;
+   char buf[CHUNK_SIZE];
++#if defined(__NetBSD__)
++  const char ** inBuf = (const char ** )&from;
++#else
+   char ** inBuf = ( char ** )&from;
++#endif
+ 
+   while ( fromSize )
+   {
Prev by Date: libretro-glsl-shaders: Update to 20180228
Next by Date: updated TODO file
Previous by Thread: libretro-glsl-shaders: Update to 20180228
Next by Thread: updated TODO file
Indexes:
Home | Main Index | Thread Index | Old Index