8 files changed, 84 insertions, 5 deletions
diff --git a/source/kde/kde/build/kleopatra b/source/kde/kde/build/kleopatra
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kleopatra
+++ b/source/kde/kde/build/kleopatra
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/kleopatra.patch b/source/kde/kde/patch/kleopatra.patch
new file mode 100644
index 000000000..df864bb66
--- /dev/null
+++ b/source/kde/kde/patch/kleopatra.patch
@@ -0,0 +1,2 @@
+# Fix build with gpgme-1.18.0:
+cat $CWD/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch b/source/kde/kde/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch
new file mode 100644
index 000000000..eb5f52460
--- /dev/null
+++ b/source/kde/kde/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch
@@ -0,0 +1,67 @@
+From a3684049dd4f0d2d47dcc6605ff31ce753254ef9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Fri, 19 Aug 2022 13:43:41 +0200
+Subject: [PATCH] Use ReceiveKeysJob for refreshing OpenPGP keys
+
+This refreshes the OpenPGP key from the configured key server.
+
+GnuPG-bug-id: 5903
+
+CHANGELOG: Fix building against QGpgME 1.18.0
+BUG: 458044
+FIXED-IN: 22.08.1
+
+(cherry picked from commit 87d8b00d4b2286489d5fadc9cfa07f1d721cdfe3)
+---
+ src/commands/refreshcertificatecommand.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/commands/refreshcertificatecommand.cpp b/src/commands/refreshcertificatecommand.cpp
+index 226d791f..6a88bbf4 100644
+--- a/src/commands/refreshcertificatecommand.cpp
++++ b/src/commands/refreshcertificatecommand.cpp
+@@ -19,7 +19,7 @@
+ #include <QGpgME/Protocol>
+ #ifdef QGPGME_SUPPORTS_KEY_REFRESH
+ #include <QGpgME/RefreshKeysJob>
+-#include <QGpgME/RefreshOpenPGPKeysJob>
++#include <QGpgME/ReceiveKeysJob>
+ #endif
+ 
+ #include <gpgme++/importresult.h>
+@@ -44,7 +44,7 @@ public:
+     void cancel();
+ 
+ #ifdef QGPGME_SUPPORTS_KEY_REFRESH
+-    std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> startOpenPGPJob();
++    std::unique_ptr<QGpgME::ReceiveKeysJob> startOpenPGPJob();
+     std::unique_ptr<QGpgME::RefreshKeysJob> startSMIMEJob();
+ #endif
+     void onOpenPGPJobResult(const ImportResult &result);
+@@ -136,19 +136,19 @@ void RefreshCertificateCommand::Private::cancel()
+ }
+ 
+ #ifdef QGPGME_SUPPORTS_KEY_REFRESH
+-std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob()
++std::unique_ptr<QGpgME::ReceiveKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob()
+ {
+-    std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> refreshJob{QGpgME::openpgp()->refreshOpenPGPKeysJob()};
++    std::unique_ptr<QGpgME::ReceiveKeysJob> refreshJob{QGpgME::openpgp()->receiveKeysJob()};
+     Q_ASSERT(refreshJob);
+ 
+-    connect(refreshJob.get(), &QGpgME::RefreshOpenPGPKeysJob::result,
++    connect(refreshJob.get(), &QGpgME::ReceiveKeysJob::result,
+             q, [this](const GpgME::ImportResult &result) {
+                 onOpenPGPJobResult(result);
+             });
+     connect(refreshJob.get(), &QGpgME::Job::progress,
+             q, &Command::progress);
+ 
+-    const GpgME::Error err = refreshJob->start({key});
++    const GpgME::Error err = refreshJob->start({QString::fromLatin1(key.primaryFingerprint())});
+     if (err) {
+         showError(err);
+         return {};
+-- 
+GitLab
+
diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild
index 0b05f7621..23b718be6 100755
--- a/source/l/babl/babl.SlackBuild
+++ b/source/l/babl/babl.SlackBuild
@@ -79,8 +79,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# fix to build with meson-0.62.0
-sed 's/Description/description/' -i meson.build
+zcat $CWD/babl.ftbfs.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
diff --git a/source/l/babl/babl.ftbfs.diff b/source/l/babl/babl.ftbfs.diff
new file mode 100644
index 000000000..60b6804f6
--- /dev/null
+++ b/source/l/babl/babl.ftbfs.diff
@@ -0,0 +1,10 @@
+--- ./meson.build.orig	2022-08-21 08:29:13.000000000 -0500
++++ ./meson.build	2022-08-22 21:49:35.157658553 -0500
+@@ -451,7 +451,6 @@
+     git_bin,
+     'rev-parse',
+     '--is-inside-work-tree',
+-    check: true,
+ ).returncode() == 0
+   git_version_h = vcs_tag(
+     input : 'git-version.h.in',
diff --git a/source/l/hunspell/hunspell.url b/source/l/hunspell/hunspell.url
new file mode 100644
index 000000000..bce7bdda2
--- /dev/null
+++ b/source/l/hunspell/hunspell.url
@@ -0,0 +1 @@
+https://github.com/hunspell/hunspell
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index d9063c207..2e790226f 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gpgme
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/x/ibus/ibus.SlackBuild b/source/x/ibus/ibus.SlackBuild
index 96ddde33e..212a6ed20 100755
--- a/source/x/ibus/ibus.SlackBuild
+++ b/source/x/ibus/ibus.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}