svn commit: r327062 - in head/textproc/goldendict: . files

[Boris Samorodov]

Author: bsam
Date: Thu Sep 12 13:33:00 2013
New Revision: 327062
URL: http://svnweb.freebsd.org/changeset/ports/327062

Log:
  1. Fix build with clang and libc++ (3 cases, add "#include <unistd.h>" to
  apropriate files):
  -----
  bgl_babylon.cc:97:19: error: use of undeclared identifier 'dup'
    file = gzdopen( DUP( fileno( f ) ), "r" );
                    ^
  bgl_babylon.cc:36:13: note: expanded from macro 'DUP'
  #define DUP dup
              ^
  -----
  processwrapper.cc:99:12: error: use of undeclared identifier 'getpid'
      return getpid();
             ^
  -----
  qtsingleapplication/src/qtlocalpeer.cpp:96:56: error: no member named 'getuid' in the global namespace
      socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
                                                       ~~^
  -----
  
  2. Use new syntax for LIB_DEPENDS.

Added:
  head/textproc/goldendict/files/patch-processwrapper.cc   (contents, props changed)
  head/textproc/goldendict/files/patch-qtsingleapplication-src-qtlocalpeer.cpp   (contents, props changed)
Modified:
  head/textproc/goldendict/Makefile
  head/textproc/goldendict/files/patch-bgl_babylon.cc

Modified: head/textproc/goldendict/Makefile
==============================================================================
--- head/textproc/goldendict/Makefile	Thu Sep 12 13:15:07 2013	(r327061)
+++ head/textproc/goldendict/Makefile	Thu Sep 12 13:33:00 2013	(r327062)
@@ -13,14 +13,15 @@ COMMENT=	Feature-rich Qt4 based dictiona
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	hunspell-1.3:${PORTSDIR}/textproc/hunspell \
-		execinfo:${PORTSDIR}/devel/libexecinfo \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
+		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 NO_WRKSUBDIR=	yes
 HAS_CONFIGURE=	yes
 USES=		desktop-file-utils pkgconfig
+USE_DOS2UNIX=	processwrapper.cc  # is needed only to apply a patch to this file
 USE_XORG=	xtst
 USE_QT4=	corelib gui webkit phonon \
 		qmake_build linguist_build moc_build rcc_build script_build uic_build

Modified: head/textproc/goldendict/files/patch-bgl_babylon.cc
==============================================================================
--- head/textproc/goldendict/files/patch-bgl_babylon.cc	Thu Sep 12 13:15:07 2013	(r327061)
+++ head/textproc/goldendict/files/patch-bgl_babylon.cc	Thu Sep 12 13:33:00 2013	(r327062)
@@ -1,5 +1,13 @@
 --- ./bgl_babylon.cc.orig	2010-12-04 00:12:46.000000000 +0300
 +++ ./bgl_babylon.cc	2010-12-28 11:46:37.203723541 +0300
+@@ -26,6 +26,7 @@
+ #include<stdlib.h>
+ #include<string.h>
+ #include<stdio.h>
++#include<unistd.h>
+ #include<iconv.h>
+ #include <QTextDocument>
+ 
 @@ -648,13 +648,8 @@
  
    inbufbytes = s.size();

Added: head/textproc/goldendict/files/patch-processwrapper.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/goldendict/files/patch-processwrapper.cc	Thu Sep 12 13:33:00 2013	(r327062)
@@ -0,0 +1,9 @@
+--- ./processwrapper.cc.orig	2013-09-12 13:03:02.450955685 +0400
++++ ./processwrapper.cc	2013-09-12 13:04:34.115949039 +0400
+@@ -1,5 +1,6 @@
+ #include "processwrapper.hh"
+ 
++#include <unistd.h>
+ #include <QtCore>
+ 
+ #ifdef Q_OS_WIN32

Added: head/textproc/goldendict/files/patch-qtsingleapplication-src-qtlocalpeer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/goldendict/files/patch-qtsingleapplication-src-qtlocalpeer.cpp	Thu Sep 12 13:33:00 2013	(r327062)
@@ -0,0 +1,10 @@
+--- qtsingleapplication/src/qtlocalpeer.cpp.orig	2013-09-12 13:40:34.269802688 +0400
++++ qtsingleapplication/src/qtlocalpeer.cpp	2013-09-12 13:41:07.606795170 +0400
+@@ -50,6 +50,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {