diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-05-01 23:17:58 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-05-02 06:59:47 +0200 |
commit | fad84f0c7eabe4dcb52f921090b9a8dc258ad175 (patch) | |
tree | 886cc712f43e44d9fcb4277508b5a53a3651ada4 /source/l/speech-dispatcher | |
parent | 9b4be22e71a5affdb921f8ab706fbd12b27c40e0 (diff) | |
download | current-fad84f0c7eabe4dcb52f921090b9a8dc258ad175.tar.gz |
Sun May 1 23:17:58 UTC 202220220501231758
kde/calligra-3.2.1-x86_64-16.txz: Rebuilt.
Recompiled against openexr-3.1.5.
Thanks to Heinz Wiesinger for the link to the patch.
kde/kimageformats-5.93.0-x86_64-2.txz: Rebuilt.
Recompiled against openexr-3.1.5.
kde/kio-extras-22.04.0-x86_64-2.txz: Rebuilt.
Recompiled against Imath-3.1.5 and openexr-3.1.5.
kde/kjots-20220430_da83a5f-x86_64-1.txz: Upgraded.
kde/krita-5.0.6-x86_64-2.txz: Rebuilt.
Recompiled against Imath-3.1.5 and openexr-3.1.5.
kde/umbrello-22.04.0-x86_64-2.txz: Rebuilt.
Recompiled against kdevelop-22.04.0.
l/Imath-3.1.5-x86_64-1.txz: Added.
This library was split out from OpenEXR.
l/SDL2-2.0.22-x86_64-2.txz: Rebuilt.
Recompiled with -DSDL_STATIC=OFF. Thanks to jkh2cpu.
l/freetype-2.12.1-x86_64-1.txz: Upgraded.
l/gegl-0.4.36-x86_64-2.txz: Rebuilt.
Recompiled against openexr-3.1.5.
l/gst-plugins-bad-free-1.20.1-x86_64-2.txz: Rebuilt.
Recompiled against Imath-3.1.5 and openexr-3.1.5.
l/imagemagick-7.1.0_32-x86_64-1.txz: Upgraded.
Compiled against Imath-3.1.5 and openexr-3.1.5.
l/opencv-4.5.5-x86_64-2.txz: Rebuilt.
Recompiled against openexr-3.1.5.
l/openexr-3.1.5-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
Compiled against Imath-3.1.5.
l/speech-dispatcher-0.11.1-x86_64-1.txz: Upgraded.
n/cifs-utils-6.15-x86_64-1.txz: Upgraded.
n/mutt-2.2.4-x86_64-1.txz: Upgraded.
x/bitmap-1.1.0-x86_64-1.txz: Upgraded.
xap/gimp-2.10.30-x86_64-3.txz: Rebuilt.
Recompiled against Imath-3.1.5 and openexr-3.1.5.
Diffstat (limited to 'source/l/speech-dispatcher')
-rw-r--r-- | source/l/speech-dispatcher/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch | 102 | ||||
-rwxr-xr-x | source/l/speech-dispatcher/speech-dispatcher.SlackBuild | 5 |
2 files changed, 1 insertions, 106 deletions
diff --git a/source/l/speech-dispatcher/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch b/source/l/speech-dispatcher/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch deleted file mode 100644 index b4f7a840..00000000 --- a/source/l/speech-dispatcher/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch +++ /dev/null @@ -1,102 +0,0 @@ -From a2faab416e42cbdf3d73f98578a89eb7a235e25a Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@gnome.org> -Date: Tue, 2 Feb 2021 14:50:23 -0600 -Subject: [PATCH] Fix build after glib e38982df - -glib.h now includes <type_traits> when building as C++. But kali.cpp -includes it (via module_utils.h) inside an extern "C" block. This is -illegal. - -Best practice is to use extern "C" in project header files, not around -include statements. So let's do that. module_utils.h already includes -glib.h, so we can use G_BEGIN_DECLS/G_END_DECLS there. spd_audio.h does -not, so I decided to write out the usual boilerplate, as including all -of glib.h just for G_BEGIN_DECLS/G_END_DECLS seemed like overkill. -Finally, I'll move config.h at the very top of kali.cpp, since I'm -touching this code anyway and that is the usual place to put it. - -This is the minimum viable change required for speech-dispatcher to -build with glib master. As long as speech-dispatcher is combining C and -C++, it would be advisible to use extern "C" in all headers that declare -C functions and might be included from C++. ---- - src/modules/kali.cpp | 10 +++++----- - src/modules/module_utils.h | 4 ++++ - src/modules/spd_audio.h | 8 ++++++++ - 3 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/modules/kali.cpp b/src/modules/kali.cpp -index 193975d8..7b497626 100644 ---- a/src/modules/kali.cpp -+++ b/src/modules/kali.cpp -@@ -21,21 +21,21 @@ - * $Id: kali.c,v 1.59 2008-06-09 10:38:02 hanke Exp $ - */ - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <stdio.h> - #include <string.h> - #include <unistd.h> - #include <kali/Kali/kali.h> --extern "C" { --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -+ - #include <semaphore.h> - #include "spd_audio.h" - - #include <speechd_types.h> - - #include "module_utils.h" --} - #define MODULE_NAME "kali" - #define MODULE_VERSION "0.0" - #define DEBUG_MODULE 1 -diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h -index 6081e7e1..e82850b2 100644 ---- a/src/modules/module_utils.h -+++ b/src/modules/module_utils.h -@@ -41,6 +41,8 @@ - #include <speechd_types.h> - #include "spd_audio.h" - -+G_BEGIN_DECLS -+ - typedef struct SPDMarks { - unsigned num; - unsigned allocated; -@@ -420,4 +422,6 @@ char *module_getvoice(char *language, SPDVoiceType voice); - gboolean module_existsvoice(char *voicename); - char *module_getdefaultvoice(void); - -+G_END_DECLS -+ - #endif /* #ifndef __MODULE_UTILS_H */ -diff --git a/src/modules/spd_audio.h b/src/modules/spd_audio.h -index 25045e2f..b9de3cd5 100644 ---- a/src/modules/spd_audio.h -+++ b/src/modules/spd_audio.h -@@ -28,6 +28,10 @@ - - #define SPD_AUDIO_LIB_PREFIX "spd_" - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - AudioID *spd_audio_open(char *name, void **pars, char **error); - - int spd_audio_play(AudioID * id, AudioTrack track, AudioFormat format); -@@ -47,4 +51,8 @@ void spd_audio_set_loglevel(AudioID * id, int level); - - char const *spd_audio_get_playcmd(AudioID * id); - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* ifndef #__SPD_AUDIO_H */ diff --git a/source/l/speech-dispatcher/speech-dispatcher.SlackBuild b/source/l/speech-dispatcher/speech-dispatcher.SlackBuild index 28b76fcd..384fd8a8 100755 --- a/source/l/speech-dispatcher/speech-dispatcher.SlackBuild +++ b/source/l/speech-dispatcher/speech-dispatcher.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=speech-dispatcher SRCNAM=speech-dispatcher VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -90,9 +90,6 @@ find -L . \ sed -i "s/cicero //g" configure.ac sed -i "s/sd_cicero//g" src/modules/Makefile.am -# Fix build with glib-2.68.0: -zcat $CWD/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch.gz | patch -p1 --verbose || exit 1 - autoreconf -vif || exit 1 CFLAGS="$SLKCFLAGS" \ |