summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/buildlist-from-changelog.sh8
-rw-r--r--source/k/kernel-configs/config-generic-5.14.10 (renamed from source/k/kernel-configs/config-generic-5.14.9)2
-rw-r--r--source/k/kernel-configs/config-generic-5.14.10.x64 (renamed from source/k/kernel-configs/config-generic-5.14.9.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.14.10-smp (renamed from source/k/kernel-configs/config-generic-smp-5.14.9-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.14.10 (renamed from source/k/kernel-configs/config-huge-5.14.9)2
-rw-r--r--source/k/kernel-configs/config-huge-5.14.10.x64 (renamed from source/k/kernel-configs/config-huge-5.14.9.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.14.10-smp (renamed from source/k/kernel-configs/config-huge-smp-5.14.9-smp)2
-rw-r--r--source/kde/kde/build/kio2
-rw-r--r--source/kde/kde/patch/kio.patch2
-rw-r--r--source/kde/kde/patch/kio/kio.allow.change.panel.launcher.icons.diff10
-rwxr-xr-xsource/n/epic5/epic5.SlackBuild2
-rw-r--r--source/n/httpd/httpd.url4
12 files changed, 26 insertions, 14 deletions
diff --git a/source/buildlist-from-changelog.sh b/source/buildlist-from-changelog.sh
index 24e676098..3ad1265d7 100755
--- a/source/buildlist-from-changelog.sh
+++ b/source/buildlist-from-changelog.sh
@@ -136,9 +136,9 @@ done | tac | while IFS= read -r line ; do
elif echo "$line" | grep -q -e ": Upgraded.$" -e ": Rebuilt.$" -e ": Added.$" ; then
# Output the name of the matching built package under ${SLACKPKGS}.
PACKAGE=$(findpkg $(echo $line | cut -f 1 -d :) | rev | cut -f 1,2 -d / | rev)
- if echo $PACKAGE | grep -q "^a/aaa_elflibs" ; then
- # The aaa_elflibs package must be build last, so put it in its own list:
- LISTPKG=aaa_elflibs
+ if echo $PACKAGE | grep -q "^a/aaa_libraries" ; then
+ # The aaa_libraries package must be build last, so put it in its own list:
+ LISTPKG=aaa_libraries
elif echo $PACKAGE | grep -q "^kde/" ; then
# KDE packages should be built after all sobumps and normal packages:
LISTPKG=kde
@@ -214,7 +214,7 @@ EOF
fi
# Convert the buildlist from *.txz packages to SlackBuilds:
-cat $TMPDIR/header $TMPDIR/kernel $TMPDIR/sobumps $TMPDIR/perl $TMPDIR/packages $TMPDIR/kde $TMPDIR/aaa_elflibs 2> /dev/null | while IFS= read -r line ; do
+cat $TMPDIR/header $TMPDIR/kernel $TMPDIR/sobumps $TMPDIR/perl $TMPDIR/packages $TMPDIR/kde $TMPDIR/aaa_libraries 2> /dev/null | while IFS= read -r line ; do
if echo "$line" | grep -q "^#" ; then
# Commented out line:
echo "$line" >> $TMPDIR/output
diff --git a/source/k/kernel-configs/config-generic-5.14.9 b/source/k/kernel-configs/config-generic-5.14.10
index f51ff955c..19e0598a7 100644
--- a/source/k/kernel-configs/config-generic-5.14.9
+++ b/source/k/kernel-configs/config-generic-5.14.10
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.9 Kernel Configuration
+# Linux/x86 5.14.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.14.9.x64 b/source/k/kernel-configs/config-generic-5.14.10.x64
index 7abe4afd9..765322a19 100644
--- a/source/k/kernel-configs/config-generic-5.14.9.x64
+++ b/source/k/kernel-configs/config-generic-5.14.10.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.9 Kernel Configuration
+# Linux/x86 5.14.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.14.9-smp b/source/k/kernel-configs/config-generic-smp-5.14.10-smp
index 3ac1eedb0..945f1d72e 100644
--- a/source/k/kernel-configs/config-generic-smp-5.14.9-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.14.10-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.9 Kernel Configuration
+# Linux/x86 5.14.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.14.9 b/source/k/kernel-configs/config-huge-5.14.10
index faeed6aa7..00def25b0 100644
--- a/source/k/kernel-configs/config-huge-5.14.9
+++ b/source/k/kernel-configs/config-huge-5.14.10
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.9 Kernel Configuration
+# Linux/x86 5.14.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.14.9.x64 b/source/k/kernel-configs/config-huge-5.14.10.x64
index a8c107f4f..fd7e75a0d 100644
--- a/source/k/kernel-configs/config-huge-5.14.9.x64
+++ b/source/k/kernel-configs/config-huge-5.14.10.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.9 Kernel Configuration
+# Linux/x86 5.14.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.14.9-smp b/source/k/kernel-configs/config-huge-smp-5.14.10-smp
index 6f51ba4b7..fa171baff 100644
--- a/source/k/kernel-configs/config-huge-smp-5.14.9-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.14.10-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.14.9 Kernel Configuration
+# Linux/x86 5.14.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/kde/kde/build/kio b/source/kde/kde/build/kio
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/kio
+++ b/source/kde/kde/build/kio
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/patch/kio.patch b/source/kde/kde/patch/kio.patch
new file mode 100644
index 000000000..7a91249d0
--- /dev/null
+++ b/source/kde/kde/patch/kio.patch
@@ -0,0 +1,2 @@
+# Allow changing panel launcher icons:
+cat $CWD/patch/kio/kio.allow.change.panel.launcher.icons.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kio/kio.allow.change.panel.launcher.icons.diff b/source/kde/kde/patch/kio/kio.allow.change.panel.launcher.icons.diff
new file mode 100644
index 000000000..ccd0c680a
--- /dev/null
+++ b/source/kde/kde/patch/kio/kio.allow.change.panel.launcher.icons.diff
@@ -0,0 +1,10 @@
+--- ./src/widgets/kpropertiesdialog.cpp.orig 2021-09-05 14:40:56.000000000 -0500
++++ ./src/widgets/kpropertiesdialog.cpp 2021-10-07 13:51:57.301053426 -0500
+@@ -1227,6 +1227,7 @@
+ Q_ASSERT(ro); // false isn't supported
+ if (ro && d->m_ui->fileNameLabel->isHidden()) {
+ Q_ASSERT(!d->m_bFromTemplate);
++ disconnect(d->m_ui->fileNameLineEdit, &QLineEdit::textChanged, this, &KFilePropsPlugin::nameFileChanged);
+ d->m_ui->fileNameLineEdit->setText(QString());
+ d->m_ui->fileNameLineEdit->hide();
+
diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild
index 698d78a6e..29f1547d7 100755
--- a/source/n/epic5/epic5.SlackBuild
+++ b/source/n/epic5/epic5.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=epic5
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
EPICVER=5
HELPFILE=current
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
## Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible.
## Patches to fix this are welcome, otherwise we'll keep an eye on upstream.
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
index e21c78ba4..e9acbe714 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.50.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.50.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.51.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.51.tar.bz2.asc
generated by cgit v1.2.3 (git 2.26.2) at 2024-05-07 03:41:00 +0000