1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- 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>
This commit is contained in:
Max Brazhnikov 2012-12-11 12:33:58 +00:00
parent 8ddec8c585
commit 5302808264
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=308683
4 changed files with 36 additions and 5 deletions

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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.