summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/zsh/zsh.SlackBuild2
-rw-r--r--source/kde/kde/build/kglobalaccel2
-rw-r--r--source/kde/kde/build/ktexteditor2
-rw-r--r--source/kde/kde/patch/ktexteditor.patch2
-rw-r--r--source/kde/kde/patch/ktexteditor/804e4944.patch104
-rw-r--r--source/kde/kde/patch/ktexteditor/c80f935c.patch55
-rwxr-xr-xsource/l/libspectre/libspectre.SlackBuild2
-rwxr-xr-xsource/xap/hexchat/hexchat.SlackBuild2
-rw-r--r--source/xap/hexchat/hexchat.url2
-rwxr-xr-xsource/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild2
-rw-r--r--source/xfce/xfce4-notifyd/xfce4-notifyd.url2
11 files changed, 8 insertions, 169 deletions
diff --git a/source/ap/zsh/zsh.SlackBuild b/source/ap/zsh/zsh.SlackBuild
index 748094d4b..3a5aa5c69 100755
--- a/source/ap/zsh/zsh.SlackBuild
+++ b/source/ap/zsh/zsh.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=zsh
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.xz | 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/kde/kde/build/kglobalaccel b/source/kde/kde/build/kglobalaccel
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kglobalaccel
+++ b/source/kde/kde/build/kglobalaccel
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/ktexteditor b/source/kde/kde/build/ktexteditor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/ktexteditor
+++ b/source/kde/kde/build/ktexteditor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/ktexteditor.patch b/source/kde/kde/patch/ktexteditor.patch
deleted file mode 100644
index c658b7739..000000000
--- a/source/kde/kde/patch/ktexteditor.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-cat $CWD/patch/ktexteditor/804e4944.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-cat $CWD/patch/ktexteditor/c80f935c.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/ktexteditor/804e4944.patch b/source/kde/kde/patch/ktexteditor/804e4944.patch
deleted file mode 100644
index 854cf0da4..000000000
--- a/source/kde/kde/patch/ktexteditor/804e4944.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 804e49444c093fe58ec0df2ab436565e50dc147e Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 20 Jan 2022 09:46:34 +0100
-Subject: [PATCH] only start programs in user's path
-
-don't use QProcess with just program name
-first search the right program in the user's path
----
- src/document/katedocument.cpp | 29 ++++++++++++++++------------
- src/swapfile/kateswapdiffcreator.cpp | 17 ++++++++++++----
- 2 files changed, 30 insertions(+), 16 deletions(-)
-
-diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
-index 01f74da1..05d0e91b 100644
---- a/src/document/katedocument.cpp
-+++ b/src/document/katedocument.cpp
-@@ -72,6 +72,7 @@
- #include <QMimeDatabase>
- #include <QProcess>
- #include <QRegularExpression>
-+#include <QStandardPaths>
- #include <QTemporaryFile>
- #include <QTextCodec>
- #include <QTextStream>
-@@ -5054,18 +5055,22 @@ void KTextEditor::DocumentPrivate::slotDelayedHandleModOnHd()
- // skip that, if document is modified!
- // only do that, if the file is still there, else reload makes no sense!
- if (m_modOnHd && !isModified() && QFile::exists(url().toLocalFile())) {
-- QProcess git;
-- const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
-- git.start(QStringLiteral("git"), args);
-- if (git.waitForStarted()) {
-- git.closeWriteChannel();
-- if (git.waitForFinished()) {
-- if (git.exitCode() == 0) {
-- // this hash exists still in git => just reload
-- m_modOnHd = false;
-- m_modOnHdReason = OnDiskUnmodified;
-- m_prevModOnHdReason = OnDiskUnmodified;
-- documentReload();
-+ // we only want to use git from PATH, cache this
-+ static const QString fullGitPath = QStandardPaths::findExecutable(QStringLiteral("git"));
-+ if (!fullGitPath.isEmpty()) {
-+ QProcess git;
-+ const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
-+ git.start(fullGitPath, args);
-+ if (git.waitForStarted()) {
-+ git.closeWriteChannel();
-+ if (git.waitForFinished()) {
-+ if (git.exitCode() == 0) {
-+ // this hash exists still in git => just reload
-+ m_modOnHd = false;
-+ m_modOnHdReason = OnDiskUnmodified;
-+ m_prevModOnHdReason = OnDiskUnmodified;
-+ documentReload();
-+ }
- }
- }
- }
-diff --git a/src/swapfile/kateswapdiffcreator.cpp b/src/swapfile/kateswapdiffcreator.cpp
-index 5c515c45..a185123a 100644
---- a/src/swapfile/kateswapdiffcreator.cpp
-+++ b/src/swapfile/kateswapdiffcreator.cpp
-@@ -14,6 +14,7 @@
- #include <KMessageBox>
-
- #include <QDir>
-+#include <QStandardPaths>
- #include <QTextCodec>
-
- // BEGIN SwapDiffCreator
-@@ -85,17 +86,25 @@ void SwapDiffCreator::viewDiff()
- connect(&m_proc, &QProcess::readyRead, this, &SwapDiffCreator::slotDataAvailable, Qt::UniqueConnection);
- connect(&m_proc, &QProcess::finished, this, &SwapDiffCreator::slotDiffFinished, Qt::UniqueConnection);
-
-- // try to start diff process, if we can't be started be done with error
-- m_proc.start(QStringLiteral("diff"), QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
-- if (!m_proc.waitForStarted()) {
-+ // use diff from PATH only => inform if not found at all
-+ const QString fullDiffPath = QStandardPaths::findExecutable(QStringLiteral("diff"));
-+ if (fullDiffPath.isEmpty()) {
- KMessageBox::sorry(nullptr,
-- i18n("The diff command could not be started. Please make sure that "
-+ i18n("The diff command could not be found. Please make sure that "
- "diff(1) is installed and in your PATH."),
- i18n("Error Creating Diff"));
- deleteLater();
- return;
- }
-
-+ // try to start the diff program, might fail, too
-+ m_proc.start(fullDiffPath, QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
-+ if (!m_proc.waitForStarted()) {
-+ KMessageBox::sorry(nullptr, i18n("The diff command '%1' could not be started.").arg(fullDiffPath), i18n("Error Creating Diff"));
-+ deleteLater();
-+ return;
-+ }
-+
- // process is up and running, we can write data to it
- QTextStream ts(&m_proc);
- int lineCount = recoverDoc.lines();
---
-GitLab
-
diff --git a/source/kde/kde/patch/ktexteditor/c80f935c.patch b/source/kde/kde/patch/ktexteditor/c80f935c.patch
deleted file mode 100644
index 8cccfe3a9..000000000
--- a/source/kde/kde/patch/ktexteditor/c80f935c.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From c80f935c345de2e2fb10635202800839ca9697bf Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 20 Jan 2022 10:30:20 +0100
-Subject: [PATCH] only execute diff in path
-
----
- src/dialogs/katedialogs.cpp | 5 +++--
- src/dialogs/katedialogs.h | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/dialogs/katedialogs.cpp b/src/dialogs/katedialogs.cpp
-index 5b949f36..63a58aee 100644
---- a/src/dialogs/katedialogs.cpp
-+++ b/src/dialogs/katedialogs.cpp
-@@ -1317,6 +1317,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
- : QObject(doc)
- , m_doc(doc)
- , m_modtype(modtype)
-+ , m_fullDiffPath(QStandardPaths::findExecutable(QStringLiteral("diff")))
- , m_proc(nullptr)
- , m_diffFile(nullptr)
- , m_diffAction(nullptr)
-@@ -1334,7 +1335,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
- m_message->addAction(aAutoReload, false);
- connect(aAutoReload, &QAction::triggered, this, &KateModOnHdPrompt::autoReloadTriggered);
-
-- if (!QStandardPaths::findExecutable(QStringLiteral("diff")).isEmpty()) {
-+ if (!m_fullDiffPath.isEmpty()) {
- m_diffAction = new QAction(i18n("View &Difference"), this);
- m_diffAction->setIcon(QIcon::fromTheme(QStringLiteral("document-multiple")));
- m_diffAction->setToolTip(i18n("Shows a diff of the changes"));
-@@ -1394,7 +1395,7 @@ void KateModOnHdPrompt::slotDiff()
- // Start a KProcess that creates a diff
- m_proc = new KProcess(this);
- m_proc->setOutputChannelMode(KProcess::MergedChannels);
-- *m_proc << QStringLiteral("diff") << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
-+ *m_proc << m_fullDiffPath << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
- connect(m_proc, &KProcess::readyRead, this, &KateModOnHdPrompt::slotDataAvailable);
- connect(m_proc, &KProcess::finished, this, &KateModOnHdPrompt::slotPDone);
-
-diff --git a/src/dialogs/katedialogs.h b/src/dialogs/katedialogs.h
-index 80b611d9..e5574023 100644
---- a/src/dialogs/katedialogs.h
-+++ b/src/dialogs/katedialogs.h
-@@ -376,6 +376,7 @@ private:
- KTextEditor::DocumentPrivate *m_doc;
- QPointer<KTextEditor::Message> m_message;
- KTextEditor::ModificationInterface::ModifiedOnDiskReason m_modtype;
-+ QString m_fullDiffPath;
- KProcess *m_proc;
- QTemporaryFile *m_diffFile;
- QAction *m_diffAction;
---
-GitLab
-
diff --git a/source/l/libspectre/libspectre.SlackBuild b/source/l/libspectre/libspectre.SlackBuild
index 99d06b9d7..a4caf5bfc 100755
--- a/source/l/libspectre/libspectre.SlackBuild
+++ b/source/l/libspectre/libspectre.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libspectre
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild
index 0450388c7..775ad012f 100755
--- a/source/xap/hexchat/hexchat.SlackBuild
+++ b/source/xap/hexchat/hexchat.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=hexchat
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/xap/hexchat/hexchat.url b/source/xap/hexchat/hexchat.url
index 120a4f05a..d70cfd663 100644
--- a/source/xap/hexchat/hexchat.url
+++ b/source/xap/hexchat/hexchat.url
@@ -1 +1 @@
-https://dl.hexchat.net/hexchat/hexchat-2.16.0.tar.xz
+https://dl.hexchat.net/hexchat/hexchat-2.16.1.tar.xz
diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
index f92b8d816..df8dda2d8 100755
--- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfce4-notifyd
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.url b/source/xfce/xfce4-notifyd/xfce4-notifyd.url
index ac57908de..3954124c2 100644
--- a/source/xfce/xfce4-notifyd/xfce4-notifyd.url
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.4.tar.bz2
+http://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.3.tar.bz2
generated by cgit v1.2.3-65-gdbad (git 2.45.1) at 2024-06-19 05:19:14 +0000