<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/818b513f1c61d2fa808b1ce5b02d7f77a241871c">https://github.com/macports/macports-ports/commit/818b513f1c61d2fa808b1ce5b02d7f77a241871c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 818b513f1c61d2fa808b1ce5b02d7f77a241871c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Nov 1 08:38:11 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> stardict: Update to 3.0.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix build failure by requiring C++11 due to libsigcxx2.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix gnome variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove unneeded patches and add new patches.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allow Clang to be used.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/34517
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Project moves away from Google Code to SourceForge.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/53467
</span>---
textproc/stardict/Portfile | 76 +++++++++++++---------
textproc/stardict/files/atoi.patch | 45 -------------
textproc/stardict/files/header-guard.patch | 21 ++++++
textproc/stardict/files/patch-zlib-1.2.6.diff | 23 -------
.../space-between-literal-and-identifier.patch | 44 +++++++++++++
5 files changed, 111 insertions(+), 98 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 78e8338..c6cc6e8 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;'>@@ -1,8 +1,12 @@
</span> PortSystem 1.0
name stardict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5f91e95ea5910a580981bf171d765cb53dcd17a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9341740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories textproc
maintainers gmail.com:alexandernx
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,57 +19,69 @@ long_description \
</span> Though it needs a handful of gnome libraries for \
installation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://code.google.com/p/stardict-3/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites googlecode:stardict-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://stardict-4.sourceforge.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/stardict-4/${version}
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 78f20b2092006951f35497b804b176b9c2a15195 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
port:intltool \
port:gnome-doc-utils
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gtk2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsigcxx2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:popt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsigcxx2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-zlib-1.2.6.diff atoi.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libsigcxx2 requires C++11 or newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# update dict/m4/intltool.m4 and autoreconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles header-guard.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ space-between-literal-and-identifier.patch
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# reconfigure with our intltool.m4
</span> pre-configure {
copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/dict/m4/intltool.m4
}
<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;'>-# autoreconf to reconfigure with our intltool.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnome-common \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# t_lookupdata.cpp:41:30: error: variable length array of non-POD element type 'std::vector<gchar *>'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://code.google.com/p/stardict-3/issues/detail?id=58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *clang*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-gnome-support \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-espeak \
</span> --disable-spell \
--disable-gucharmap \
--disable-festival \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-espeak \
</span> --disable-tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols "_g_module_close", "_g_module_open", "_g_module_symbol"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.libs -lgmodule-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant gnome description {Add Gnome support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#Should be more stable slower and with gnome deps.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-delete --disable-gnome-support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libgnome port:libgnomeui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libbonobo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgnome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:popt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The build system erroneously assumes that if you did not use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the --enable-darwin-support flag then you are not on Darwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and starts using ELF-specific --version-script flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_VERSION_SCRIPT_OPTION= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORDNET_LD_VERSION_SCRIPT_OPTION= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORDNET_PARSEDATA_LD_VERSION_SCRIPT_OPTION=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gnome]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gnome-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enabling Darwin support disables Gnome support.
</span> configure.args-append --enable-darwin-support
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/atoi.patch b/textproc/stardict/files/atoi.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4a606ce..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/files/atoi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp stardict-3.0.4.orig/dict/src/dictmanagedlg.cpp stardict-3.0.4/dict/src/dictmanagedlg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dict/src/dictmanagedlg.cpp 2012-12-24 02:04:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dict/src/dictmanagedlg.cpp 2015-10-12 23:36:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib/gi18n.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gdk/gdkwin32.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp stardict-3.0.4.orig/dict/src/lib/dict_client.cpp stardict-3.0.4/dict/src/lib/dict_client.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dict/src/lib/dict_client.cpp 2012-01-12 22:21:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dict/src/lib/dict_client.cpp 2015-10-12 23:36:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "sockets.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp stardict-3.0.4.orig/dict/src/lib/stddict.cpp stardict-3.0.4/dict/src/lib/stddict.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dict/src/lib/stddict.cpp 2012-02-17 00:58:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dict/src/lib/stddict.cpp 2015-10-12 23:36:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib/gstdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ifo_file.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "edit-distance.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp stardict-3.0.4.orig/dict/src/mainwin.cpp stardict-3.0.4/dict/src/mainwin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dict/src/mainwin.cpp 2012-12-24 02:50:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dict/src/mainwin.cpp 2015-10-12 23:36:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib/gi18n.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gdk/gdkkeysyms.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VERSION "3.0.4"
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8b03c8c
</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/header-guard.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./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:#e0ffe0;'>+#ifndef PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./pangoview.h:21:9: note: 'PAGNOVIEW_H' is defined here; did you mean 'PANGOVIEW_H'?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define PAGNOVIEW_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1 warning generated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/src/pangoview.h.orig 2012-10-26 07:02:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/src/pangoview.h 2019-11-01 06:49:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define PAGNOVIEW_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PANGOVIEW_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <list>
</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/patch-zlib-1.2.6.diff b/textproc/stardict/files/patch-zlib-1.2.6.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e5b7a83..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/files/patch-zlib-1.2.6.diff
</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;'>-http://code.google.com/p/stardict-3/issues/detail?id=31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/src/libcommon.cpp.orig 2012-01-13 00:21:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/src/libcommon.cpp 2013-09-23 22:51:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -599,7 +599,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int unpack_zlib(const char* arch_file_name, const char* out_file_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- zip::gzFile in(gzopen(arch_file_name, "rb"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ zip::gzFileWrapper in(gzopen(arch_file_name, "rb"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!in) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_critical("Unable to open archive file: %s.", arch_file_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return EXIT_FAILURE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/src/libcommon.h.orig 2012-01-13 00:21:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/src/libcommon.h 2013-09-23 22:51:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +188,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;'>- namespace zip {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef ResourceWrapper<struct gzFile_s, struct gzFile_s *, int, gzclose> gzFileWrapper;
</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;'>- /* Create a new temporary file. Return file name in file name encoding.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/files/space-between-literal-and-identifier.patch b/textproc/stardict/files/space-between-literal-and-identifier.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e3147ba
</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/space-between-literal-and-identifier.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/src/dictmanage.cpp.orig 2014-04-07 21:52:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/src/dictmanage.cpp 2019-11-01 06:51:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::list<std::string> plugin_disable_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::list<std::string> plugins_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins_dirs.push_back(conf_dirs->get_plugin_dir());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, plugin_order_list,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, plugin_order_list,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugin_disable_list, GetAllPluginList(plugin_all_list));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/src/lib/pluginmanager.cpp.orig 2012-03-03 01:01:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/src/lib/pluginmanager.cpp 2019-11-01 06:42:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::list<std::string> plugins_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins_dirs.push_back(dirpath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, order_list, disable_list, PluginLoader(*this));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, order_list, disable_list, PluginLoader(*this));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void StarDictPlugins::reorder(const std::list<std::string>& order_list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::list<std::string> plugins_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins_dirs.push_back(plugindirpath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::list<std::string> disable_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, order_list, disable_list, PluginInfoLoader(*this, virtualdict_pluginlist, netdict_pluginlist, specialdict_pluginlist, tts_pluginlist, parsedata_pluginlist, misc_pluginlist));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, order_list, disable_list, PluginInfoLoader(*this, virtualdict_pluginlist, netdict_pluginlist, specialdict_pluginlist, tts_pluginlist, parsedata_pluginlist, misc_pluginlist));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!virtualdict_pluginlist.empty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugin_list.push_back(std::pair<StarDictPlugInType, std::list<StarDictPluginInfo> >(StarDictPlugInType_VIRTUALDICT, virtualdict_pluginlist));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dict/src/lib/storage.cpp.orig 2013-11-18 02:10:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dict/src/lib/storage.cpp 2019-11-01 06:38:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -793,7 +793,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string name_pattern; // in file name encoding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!utf8_to_file_name(key, name_pattern))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FileHolder();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::string::size_type pos = name_pattern.find_last_of("."DB_DIR_SEPARATOR_S);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::string::size_type pos = name_pattern.find_last_of("." DB_DIR_SEPARATOR_S);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(pos != std::string::npos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(name_pattern[pos] == '.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name_pattern = name_pattern.substr(pos);
</span></pre><pre style='margin:0'>
</pre>