[gentoo-commits] repo/gentoo:master commit in: app-text/stardict/files/, app-text/stardict/

[Andrew Savchenko]

commit: c11676602622fd25323682d41237ddba5433d7d1
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon Dec  5 10:58:02 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Mon Dec  5 12:06:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1167660

app-text/stardict: fix whitespace handling in tabfile tool

Patch by Nikolay Korotkiy  gmail.com>,
git commit adb01aafd94b6bd5b5cc49889f4f09d483ee5ac4 from
https://github.com/sikmir/stardict-3.git repository.

Package-Manager: portage-2.3.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../files/stardict-4.0.0_pre20160518-tabfile.patch | 38 ++
 .../stardict/stardict-4.0.0_pre20160518.ebuild |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch 
b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
new file mode 100644
index ..49cb284
--- /dev/null
+++ b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
@@ -0,0 +1,38 @@
+From adb01aafd94b6bd5b5cc49889f4f09d483ee5ac4 Mon Sep 17 00:00:00 2001
+From: Nikolay Korotkiy 
+Date: Thu, 1 Sep 2016 14:11:41 +0300
+Subject: [PATCH] tabfile: incorrectly handles whitespace in file name
+
+Signed-off-by: Andrew Savchenko 
+---
+ tools/src/libtabfile.cpp | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tools/src/libtabfile.cpp b/tools/src/libtabfile.cpp
+index dda256a..2ee9dfd 100644
+--- a/tools/src/libtabfile.cpp
 b/tools/src/libtabfile.cpp
+@@ -22,6 +22,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+@@ -228,9 +229,10 @@ static bool write_dictionary(const char *filename, GArray 
*array)
+   g_message("%s wordcount: %d.", get_impl(basefilename), array->len);
+ 
+ #ifndef _WIN32
+-  std::string command(std::string("dictzip ") + dicfilename);
++  std::stringstream command;
++  command << "dictzip \"" << dicfilename << "\"";
+   int result;
+-  result = system(command.c_str());
++  result = system(command.str().c_str());
+   if (result == -1) {
+   g_print("system() error!\n");
+   }
+-- 
+2.10.2
+

diff --git a/app-text/stardict/stardict-4.0.0_pre20160518.ebuild 
b/app-text/stardict/stardict-4.0.0_pre20160518.ebuild
index da192f9..5a09f99 100644
--- a/app-text/stardict/stardict-4.0.0_pre20160518.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20160518.ebuild
@@ -69,6 +69,8 @@ REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 # docs are messy, installed manually below
 DOCS=""
 
+PATCHES=( "${FILESDIR}/${P}-tabfile.patch" )
+
 src_prepare() {
# From Fedora
# Remove unneeded sigc++ header files to make it sure

[gentoo-commits] repo/gentoo:master commit in: app-text/stardict/files/, app-text/stardict/

[Michael Palimaka]

commit: 6f4d2e0e63058d50ee9560884c111a2f0b900aa0
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 23 12:57:00 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 23 12:59:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4d2e0e

app-text/stardict: remove old.

Package-Manager: portage-2.2.20.1

 app-text/stardict/Manifest |   1 -
 .../files/stardict-3.0.3-zlib-1.2.5.2.patch|  39 --
 app-text/stardict/stardict-3.0.4.ebuild| 132 -
 3 files changed, 172 deletions(-)

diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index c8cbd9e..bf64d7c 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -1,4 +1,3 @@
 DIST QQWry.Dat.bz2 4114875 SHA256 
3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83 SHA512 
46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae
 WHIRLPOOL 
456bab65658a8af76160f162fc66868c8a74653a88a1a115e2a20dd90ba9ae8a93b1aa1ee9856cc811d1b1229ca910868ea5db764a119ae9b31cbabf962cab5f
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 
96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870 SHA512 
1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
 WHIRLPOOL 
210c121c25c7726cee62c2f2beb3186f0799d68c5537442eda967694f176cbbbc6d09a8c3759de093226e283ae651348ed7173a9f93bbf776325fb656e19720c
-DIST stardict-3.0.4.tar.bz2 8961622 SHA256 
c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8 SHA512 
a1cbf58202b5430b0869955bfb7df961debab12abf55022f7c07537246c81dc182c3be50fa66273c13c289471c15afba74d15933cb202ae292f4388aa2fb6fd5
 WHIRLPOOL 
b0476e5f38862e4c2a747206a8f1d8c55dc889d1138961390aa9f415ec310cabce242e7a4f484a4c260a004e3a8a152726cf936f0ec030586ddcd91979912aa0
 DIST stardict-3.0.6.tar.bz2 9341740 SHA256 
6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7 SHA512 
81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
 WHIRLPOOL 
9502af310d5eba5ed23457fff9e9f00e2d8453873cece3c20e2c5daf861bd665fc7b9c8e292be5b1d886f9a9fd0d5ad9bd1d8fbd043d221e6637c1c8185f444f

diff --git a/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch 
b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
deleted file mode 100644
index 6a320bd..000
--- a/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/401887
-
-diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp
-index 16770a3..a4299e7 100644
 a/lib/src/libcommon.cpp
-+++ b/lib/src/libcommon.cpp
-@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* 
out_file_name)
-   return EXIT_FAILURE;
-   }
-   while(true) {
--  len = gzread(get_impl(in), buf, buffer_size);
-+  len = gzread((gzFile)get_impl(in), buf, buffer_size);
-   if(len < 0) {
-   g_critical(read_file_err, arch_file_name, "");
-   return EXIT_FAILURE;
-@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path)
-   return res;
-   }
- }
-+
-+int gzclose_compat(void * file)
-+{
-+return gzclose ((gzFile)file);
-+}
-diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h
-index 10f13b4..bdcbf2f 100644
 a/lib/src/libcommon.h
-+++ b/lib/src/libcommon.h
-@@ -187,8 +187,9 @@ namespace clib {
-   typedef ResourceWrapper File;
- }
- 
-+extern int gzclose_compat(void * file);
- namespace zip {
--typedef ResourceWrapper gzFile;
-+typedef ResourceWrapper gzFile;
- }
- 
- /* Create a new temporary file. Return file name in file name encoding.

diff --git a/app-text/stardict/stardict-3.0.4.ebuild 
b/app-text/stardict/stardict-3.0.4.ebuild
deleted file mode 100644
index 0dde8d4..000
--- a/app-text/stardict/stardict-3.0.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#   their indexes seem to be in a different format. So we'll keep them
-#   seperate for now.
-
-# NOTE: Festival plugin crashes, bug 188684. Disable for now.
-
-GNOME2_LA_PUNT=yes
-GCONF_DEBUG=no
-
-inherit eutils gnome2
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style 
matching"
-HOMEPAGE="https://code.google.com/p/stardict-3/;
-SRC_URI="https://${PN}-3.googlecode.com/files/${P}.tar.bz2
-   pronounce? ( 
https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
-   qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"