<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb4be78423fc5886346348688d2936039e2fc55c">https://github.com/macports/macports-ports/commit/fb4be78423fc5886346348688d2936039e2fc55c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fb4be78423f stardict: Update to 3.0.7
</span>fb4be78423f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fb4be78423fc5886346348688d2936039e2fc55c
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 6 18:45:37 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> stardict: Update to 3.0.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69399
</span>---
textproc/stardict/Portfile | 43 +++++---
textproc/stardict/files/LC_ALL.patch | 23 +++++
textproc/stardict/files/autogen-exit.patch | 119 -----------------------
textproc/stardict/files/autogen-libtoolize.patch | 77 ---------------
textproc/stardict/files/header-guard.patch | 23 -----
textproc/stardict/files/malloc.patch | 16 +++
6 files changed, 69 insertions(+), 232 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/Portfile b/textproc/stardict/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd3bc9ff9a0..f1914bfd952 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/stardict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,27 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name stardict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.7
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ac9a47173619148cc4004fc3cabed1792baaeb4e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 05ff1644497e8f9c5f4199d9ae1198fcc571052286b4707c4b61ed9d349cccbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3712100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cf0fb8a89ffba394c700c74be46690318aec0f80 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d766f4efb1ae868855a47f39b2def66dd7a3232ca54c651c9cb3327b1bec50ea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3744286
</span>
categories textproc
maintainers gmail.com:alexandernx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# dict/ChangeLog says the license for versions 3.0.1.3, 2.4.10, 4.0.0, 3.0.7,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 3.0.6.4, 3.0.6.3, and 3.0.6 is now public domain. It still ships with GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# COPYING and LICENSE files but the new file copy-right.txt says those files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# should be ignored. I could find no explanation for how this license change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# was legally accomplished (e.g. a statement that all contributors agreed to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the license change) and I suspect that it was not because it appears to have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# been subsequently reverted and the project's web page, at least the one on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SourceForge, still says it's "Licensed under GPL terms." It's impossible to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# follow this project's development since it has moved from SourceForge to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Google Code to SourceForge to GitHub to Gitee and the developer creates a new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# empty repository for each version of the software so there is no single place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# where the complete git history can be found and no single issue tracker.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The mind boggles.
</span> license GPL-3+
description A full featured gtk2 dictionary
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,19 +36,21 @@ long_description Very nice gnome dictionary. \
</span>
homepage http://stardict-4.sourceforge.net/index_en.php
master_sites sourceforge:project/stardict-4/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Ignore stealth update of 3.0.6.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites macports_distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-${version}-github-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_7z yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}-2-src
</span> worksrcdir ${name}-${version}
depends_build port:gnome-doc-utils \
port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:itstool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yelp-tools
</span>
depends_lib port:espeak-ng \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-2.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcanberra \
</span> port:libsigcxx2
# libsigcxx2 requires C++11 or newer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,14 +62,15 @@ configure.cxxflags-append \
</span> # https://github.com/huzheng001/stardict-3/issues/58
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles autogen-exit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autogen-libtoolize.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- header-guard.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles LC_ALL.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc.patch
</span>
# reconfigure with our intltool.m4
pre-configure {
copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/dict/m4/intltool.m4
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# No configure scripts in archive.
</span> use_autoreconf yes
autoreconf.cmd ./autogen.sh
depends_build-append port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +82,7 @@ configure.args --disable-espeak \
</span> --disable-festival \
--disable-flite \
--disable-gucharmap \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span> --disable-spell \
--disable-tools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/LC_ALL.patch b/textproc/stardict/files/LC_ALL.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..46fc454f45e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/stardict/files/LC_ALL.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: use of undeclared identifier 'LC_ALL'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/tests/t_articleview.cpp.orig 2023-10-02 16:32:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/tests/t_articleview.cpp 2024-03-06 23:24:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <clocale>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstring>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <list>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/tests/t_xml.cpp.orig 2023-10-02 16:32:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/tests/t_xml.cpp 2024-03-06 23:24:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <clocale>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstring>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/autogen-exit.patch b/textproc/stardict/files/autogen-exit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d32fa120f90..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/files/autogen-exit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,119 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix autogen.sh to exit with an error code if an error occurs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/huzheng001/stardict-3/pull/103
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,21 +6,21 @@ echo "Bootstrapping StarDict root..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo "You must have libtool installed to compile StarDict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (automake --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have automake installed to compile StarDict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (autoconf --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have autoconf installed to compile StarDict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Generating configuration files for StarDict, please wait...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,13 +40,13 @@ aclocal -I m4 || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo "Running autoheader...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # autoheader || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake --add-missing --copy...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--automake --add-missing --copy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+automake --add-missing --copy || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoconf ...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake ...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- automake || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$topdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${srcdir}/lib/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${srcdir}/dict/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${srcdir}/tools/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${srcdir}/lib/autogen.sh || exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${srcdir}/dict/autogen.sh || exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${srcdir}/tools/autogen.sh || exit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #"${srcdir}/configure" --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --disable-deprecations --disable-gucharmap --disable-dictdotcn --disable-gnome-support --disable-scrollkeeper "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,21 +6,21 @@ echo "Boostrapping common lib..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have libtool installed to compile common lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (automake --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have automake installed to compile common lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (autoconf --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have autoconf installed to compile common lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Generating configuration files for common lib, please wait...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@ aclocal -I m4 || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoheader...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoheader || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake --add-missing --copy...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--automake --add-missing --copy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+automake --add-missing --copy || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoconf ...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake ...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,21 +6,21 @@ echo "Boostrapping StarDict tools..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have libtool installed to compile Stardict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (automake --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have automake installed to compile Stardict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (autoconf --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have autoconf installed to compile Stardict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Generating configuration files for Stardict, please wait...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@ aclocal -I m4 || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoheader...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoheader || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake --add-missing --copy...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--automake --add-missing --copy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+automake --add-missing --copy || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running autoconf ...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running automake ...."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/autogen-libtoolize.patch b/textproc/stardict/files/autogen-libtoolize.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3453b62f698..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/files/autogen-libtoolize.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,77 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use glibtoolize if there is no libtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/huzheng001/stardict-3/pull/106
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Bootstrapping StarDict root..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# libtoolize=libtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# command -v "$libtoolize" > /dev/null || libtoolize=glibtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ("$libtoolize" --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo "You must have libtool installed to compile StarDict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,8 +34,8 @@ test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- topdir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# echo "Running libtoolize, please ignore non-fatal messages...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# echo n | libtoolize --copy --force || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# echo "Running $libtoolize, please ignore non-fatal messages...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# echo n | "$libtoolize" --copy --force || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running aclocal...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d m4 || mkdir m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Boostrapping common lib..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libtoolize=libtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+command -v "$libtoolize" > /dev/null || libtoolize=glibtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+("$libtoolize" --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have libtool installed to compile common lib";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,8 +34,8 @@ test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- topdir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Running libtoolize, please ignore non-fatal messages...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo n | libtoolize --copy --force || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Running $libtoolize, please ignore non-fatal messages...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo n | "$libtoolize" --copy --force || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running aclocal...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocal -I m4 || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Boostrapping StarDict tools..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libtoolize=libtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+command -v "$libtoolize" > /dev/null || libtoolize=glibtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+("$libtoolize" --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You must have libtool installed to compile Stardict";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,8 +34,8 @@ test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- topdir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Running libtoolize, please ignore non-fatal messages...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo n | libtoolize --copy --force || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "Running $libtoolize, please ignore non-fatal messages...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo n | "$libtoolize" --copy --force || exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Running aclocal...."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocal -I m4 || exit;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/header-guard.patch b/textproc/stardict/files/header-guard.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 11a4c7193a4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/files/header-guard.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-./pangoview.h:20:9: warning: 'PANGOVIEW_H' is used as a header guard here, followed by #define of a different macro [-Wheader-guard]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-./pangoview.h:21:9: note: 'PAGNOVIEW_H' is defined here; did you mean 'PANGOVIEW_H'?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define PAGNOVIEW_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1 warning generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/huzheng001/stardict-3/pull/102
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dict/src/pangoview.h.orig 2012-10-26 07:02:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dict/src/pangoview.h 2019-11-01 06:49:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PAGNOVIEW_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <list>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/malloc.patch b/textproc/stardict/files/malloc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e2b2b852c98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/stardict/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fatal error: 'malloc.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+malloc.h is Linux-specific so it should not be used in portable software.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+POSIX says malloc is defined in stdlib.h which is already included.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/src/lib/rsa.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/src/lib/rsa.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rsa.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>