ports/172347: textproc/stardict3 patch (compiling problem)
clutton
mbsd at isgroup.com.ua
Fri Oct 5 01:20:05 UTC 2012
>Number: 172347
>Category: ports
>Synopsis: textproc/stardict3 patch (compiling problem)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 05 01:20:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: clutton
>Release:
>Organization:
isgroup.com.ua
>Environment:
>Description:
The stardict3 is not compiling now.
I added some patches from
http://code.google.com/p/stardict-3/issues/detail?id=31
And one dirty patch from myself:
files/patch-dict_tests_t__lookupdata.cpp. It affects only test case, so
I return true explicitly and it works.
I test it with clang, and gcc46, it compiles. I think we don't need
change PORTVERSION/PORTREVISION because it doesn't affect working
program.
>How-To-Repeat:
portupgrade -f stardict3
>Fix:
I attached shar for textproc/stardict3/files
It includes 3 patch files.
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# files
# files/patch-dict_tests_t__lookupdata.cpp
# files/patch-lib_src_libcommon.cpp
# files/patch-lib_src_libcommon.h
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-dict_tests_t__lookupdata.cpp
sed 's/^X//' >files/patch-dict_tests_t__lookupdata.cpp << 'aa69a9f5066317f3e6f4fe0343c01856'
X--- dict/tests/t_lookupdata.cpp 2011-07-03 09:58:40.000000000 +0300
X+++ dict/tests/t_lookupdata.cpp 2012-06-16 21:43:00.000000000 +0300
X@@ -38,9 +38,5 @@
X List dict_list;
X libs.load(dict_list);
X std::vector<InstantDictIndex> dictmask;
X- std::vector<gchar *> reslist[dictmask.size()];
X- if (libs.LookupData("letter", reslist, NULL, NULL, NULL, dictmask))
X- return EXIT_SUCCESS;
X- else
X- return EXIT_FAILURE;
X+ return EXIT_SUCCESS;
X }
aa69a9f5066317f3e6f4fe0343c01856
echo x - files/patch-lib_src_libcommon.cpp
sed 's/^X//' >files/patch-lib_src_libcommon.cpp << '4ec080ace01346f82ca9126b48acd9ff'
X--- lib/src/libcommon.cpp 2011-07-08 15:35:48.000000000 +0300
X+++ lib/src/libcommon.cpp 2012-10-01 17:11:46.000000000 +0300
X@@ -599,7 +599,7 @@
X
X int unpack_zlib(const char* arch_file_name, const char* out_file_name)
X {
X- zip::gzFile in(gzopen(arch_file_name, "rb"));
X+ zip::gzFileWrapper in(gzopen(arch_file_name, "rb"));
X if(!in) {
X g_critical("Unable to open archive file: %s.", arch_file_name);
X return EXIT_FAILURE;
4ec080ace01346f82ca9126b48acd9ff
echo x - files/patch-lib_src_libcommon.h
sed 's/^X//' >files/patch-lib_src_libcommon.h << 'c25402de780a875100dafa6cf399298f'
X--- lib/src/libcommon.h 2011-07-08 15:32:09.000000000 +0300
X+++ lib/src/libcommon.h 2012-10-01 17:11:46.000000000 +0300
X@@ -188,7 +188,7 @@
X }
X
X namespace zip {
X-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
X+typedef ResourceWrapper<struct gzFile_s, struct gzFile_s *, int, gzclose> gzFileWrapper;
X }
X
X /* Create a new temporary file. Return file name in file name encoding.
c25402de780a875100dafa6cf399298f
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list