svn commit: r308683 - in head/textproc/stardict3: . files

[Max Brazhnikov]

Author: makc
Date: Tue Dec 11 12:33:58 2012
New Revision: 308683
URL: http://svnweb.freebsd.org/changeset/ports/308683

Log:
  - Add patches to fix build with clang and recent gcc [1]
  - Trim Makefile header
  
  PR:		ports/172213 [1]
  Submitted by:	mbsd <mbsd at isgroup.com.ua>

Added:
  head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp   (contents, props changed)
  head/textproc/stardict3/files/patch-lib__src__libcommon.cpp   (contents, props changed)
  head/textproc/stardict3/files/patch-lib__src__libcommon.h   (contents, props changed)
Modified:
  head/textproc/stardict3/Makefile

Modified: head/textproc/stardict3/Makefile
==============================================================================
--- head/textproc/stardict3/Makefile	Tue Dec 11 12:33:12 2012	(r308682)
+++ head/textproc/stardict3/Makefile	Tue Dec 11 12:33:58 2012	(r308683)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   stardict3
-# Date created:        23 July 2008
-# Whom:                eric
-#
+# Created by: eric
 # $FreeBSD$
-#
 
 PORTNAME=	stardict
 PORTVERSION=	3.0.3

Added: head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/stardict3/files/patch-dict__tests__t_lookupdata.cpp	Tue Dec 11 12:33:58 2012	(r308683)
@@ -0,0 +1,13 @@
+--- ./dict/tests/t_lookupdata.cpp.orig	2012-12-11 08:15:24.000000000 +0000
++++ ./dict/tests/t_lookupdata.cpp	2012-12-11 08:29:56.172016591 +0000
+@@ -38,8 +38,8 @@
+ 	List dict_list;
+ 	libs.load(dict_list);
+ 	std::vector<InstantDictIndex> dictmask;
+-	std::vector<gchar *> reslist[dictmask.size()];
+-	if (libs.LookupData("letter", reslist, NULL, NULL, NULL, dictmask)) 
++	std::vector< std::vector<gchar *> > reslist(dictmask.size());
++	if (libs.LookupData("letter", &reslist[0], NULL, NULL, NULL, dictmask)) 
+ 		return EXIT_SUCCESS;
+ 	else
+ 		return EXIT_FAILURE;

Added: head/textproc/stardict3/files/patch-lib__src__libcommon.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/stardict3/files/patch-lib__src__libcommon.cpp	Tue Dec 11 12:33:58 2012	(r308683)
@@ -0,0 +1,11 @@
+--- ./lib/src/libcommon.cpp.orig	2011-07-08 12:35:48.000000000 +0000
++++ ./lib/src/libcommon.cpp	2012-12-11 07:48:00.601016758 +0000
+@@ -599,7 +599,7 @@
+ 
+ int unpack_zlib(const char* arch_file_name, const char* out_file_name)
+ {
+-	zip::gzFile in(gzopen(arch_file_name, "rb"));
++	zip::gzFileWrapper in(gzopen(arch_file_name, "rb"));
+ 	if(!in) {
+ 		g_critical("Unable to open archive file: %s.", arch_file_name);
+ 		return EXIT_FAILURE;

Added: head/textproc/stardict3/files/patch-lib__src__libcommon.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/stardict3/files/patch-lib__src__libcommon.h	Tue Dec 11 12:33:58 2012	(r308683)
@@ -0,0 +1,11 @@
+--- ./lib/src/libcommon.h.orig	2011-07-08 12:32:09.000000000 +0000
++++ ./lib/src/libcommon.h	2012-12-11 07:48:00.604014902 +0000
+@@ -188,7 +188,7 @@
+ }
+ 
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<struct gzFile_s, struct gzFile_s *, int, gzclose> gzFileWrapper;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.