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.

20 files changed, 241 insertions, 135 deletions

diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index 60d3b2f4a..b6a7d89c6 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-15
+16
diff --git a/source/kde/kde/build/kimageformats b/source/kde/kde/build/kimageformats
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kimageformats
+++ b/source/kde/kde/build/kimageformats
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kio-extras b/source/kde/kde/build/kio-extras
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kio-extras
+++ b/source/kde/kde/build/kio-extras
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/umbrello b/source/kde/kde/build/umbrello
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/umbrello
+++ b/source/kde/kde/build/umbrello
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/calligra.patch b/source/kde/kde/patch/calligra.patch
index 380aaa942..fb91a8179 100644
--- a/source/kde/kde/patch/calligra.patch
+++ b/source/kde/kde/patch/calligra.patch
@@ -2,3 +2,4 @@
 cat $CWD/patch/calligra/calligragemini_fix_blank_page_without_libgit2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 cat $CWD/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 cat $CWD/patch/calligra/calligra-gcc11.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/calligra-openexr3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/calligra/calligra-openexr3.patch b/source/kde/kde/patch/calligra/calligra-openexr3.patch
new file mode 100644
index 000000000..98d8bf7fa
--- /dev/null
+++ b/source/kde/kde/patch/calligra/calligra-openexr3.patch
@@ -0,0 +1,89 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+ 
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(Imath 3.0 CONFIG QUIET)
++if(TARGET Imath::Imath)
++    set(OPENEXR_LIBRARIES Imath::Imath)
++else()
++    macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+ 
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES}  ${Boost_INCLUDE_DIR})
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories( 
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+ 
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+     add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+     LcmsEnginePlugin.cpp
+ )
+ 
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+     set ( lcmsengine_SRCS
+         ${lcmsengine_SRCS}
+         colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+     ../colorprofiles
+     ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+     include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a77c4be50b..89636205c2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -341,6 +341,7 @@ endif ()
+ macro_optional_find_package(Imath 3.0 CONFIG QUIET)
+ if(TARGET Imath::Imath)
+     set(OPENEXR_LIBRARIES Imath::Imath)
++    set(OpenEXR_FOUND TRUE)
+ else()
+     macro_optional_find_package(OpenEXR)
+ endif()
diff --git a/source/l/Imath/Imath.SlackBuild b/source/l/Imath/Imath.SlackBuild
new file mode 100755
index 000000000..9e7657210
--- /dev/null
+++ b/source/l/Imath/Imath.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Copyright 2007, 2013, 2014  Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008, 2009, 2010, 2014, 2017, 2018, 2022  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Robby Workman <rworkman@slackware.com>
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=Imath
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# If there's a CHANGES.md file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES.md ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES.md | head -n 1000 > $DOCSDIR/CHANGES.md
+  touch -r CHANGES.md $DOCSDIR/CHANGES.md
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/Imath/Imath.url b/source/l/Imath/Imath.url
new file mode 100644
index 000000000..8515491d2
--- /dev/null
+++ b/source/l/Imath/Imath.url
@@ -0,0 +1 @@
+https://github.com/AcademySoftwareFoundation/Imath
diff --git a/source/l/Imath/slack-desc b/source/l/Imath/slack-desc
new file mode 100644
index 000000000..e0153de92
--- /dev/null
+++ b/source/l/Imath/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+Imath: Imath (Math library for graphics)
+Imath:
+Imath: Imath is a basic, light-weight, and efficient C++ representation of 2D
+Imath: and 3D vectors and matrices and other simple but useful mathematical
+Imath: objects, functions, and data types common in computer graphics
+Imath: applications, including the half 16-bit floating-point type. Imath
+Imath: also includes optional python bindings for all types and functions,
+Imath: including optimized implementations of vector and matrix arrays.
+Imath:
+Imath: Homepage: https:://github.com/AcademySoftwareFoundation/Imath
+Imath:
diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild
index b2afbddc7..17883399f 100755
--- a/source/l/SDL2/SDL2.SlackBuild
+++ b/source/l/SDL2/SDL2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=SDL2
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -97,18 +97,12 @@ cd cmake-build
     -DLIB_SUFFIX="$LIBDIRSUFFIX" \
     -DDOC_INSTALL_DIR="doc" \
     -DMAN_INSTALL_DIR=/usr/man \
+    -DSDL_STATIC=OFF \
     .. || exit 1
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
 cd ..
 
-# Don't package the static libraries:
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  for file in *.so ; do
-    rm -f $(basename $file .so).a
-  done
-)
-
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild
index 673123432..8f17c84aa 100755
--- a/source/l/gegl/gegl.SlackBuild
+++ b/source/l/gegl/gegl.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gegl
 VERSION=${VERSION:-$(echo gegl-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild
index 17d9735ba..f6e40311b 100755
--- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild
+++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gst-plugins-bad-free
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/opencv/opencv.SlackBuild b/source/l/opencv/opencv.SlackBuild
index fb2ccd052..391eb7d16 100755
--- a/source/l/opencv/opencv.SlackBuild
+++ b/source/l/opencv/opencv.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=opencv
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild
index e7e468d47..7b862744a 100755
--- a/source/l/openexr/openexr.SlackBuild
+++ b/source/l/openexr/openexr.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2007, 2013, 2014  Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2008, 2009, 2010, 2014, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2014, 2017, 2018, 2022  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=openexr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -86,9 +86,6 @@ cd cmake-build
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-    -DDOC_INSTALL_DIR="doc" \
-    -DMAN_INSTALL_DIR=/usr/man \
     .. || exit 1
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
diff --git a/source/l/openexr/slack-desc b/source/l/openexr/slack-desc
index 1e830614d..4653ee64e 100644
--- a/source/l/openexr/slack-desc
+++ b/source/l/openexr/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 openexr: openexr (HDR Image File Format & Library)
 openexr:
-openexr: OpenEXR is an image file format and library developed by Industrial
-openexr: Light & Magic, and later released to the public. It provides support
-openexr: for high dynamic range and a 16-bit floating point "half" data type
-openexr: which is compatible with the half data type in the Cg programming
-openexr: language.
+openexr: OpenEXR provides the specification and reference implementation of the
+openexr: EXR file format, the professional-grade image storage format of the
+openexr: motion picture industry. The purpose of EXR format is to accurately
+openexr: and efficiently represent high-dynamic-range scene-linear image data
+openexr: and associated metadata, with strong support for multi-part, multi-
+openexr: channel use cases.
 openexr:
 openexr: Homepage: http://www.openexr.org/
 openexr:
-openexr:
diff --git a/source/l/speech-dispatcher/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch b/source/l/speech-dispatcher/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch
deleted file mode 100644
index b4f7a840f..000000000
--- 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 28b76fcdd..384fd8a81 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" \
diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/bitmap
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/bitmap
+++ b/source/x/x11/build/bitmap
@@ -1 +1 @@
-3
+1
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index 85167c90b..ca6135862 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gimp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then