summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-12-12 19:54:42 +0000
committer Eric Hameleers <alien@slackware.com>2023-12-12 22:06:31 +0100
commitad1b1833ef7c081fab1d2fa8a45f2f663180b68d (patch)
treeacb6fac900d968caa6af8f4a29acc0ff230d6a3b /source
parentb04af892853e58c426e27bff4f0acbcd3d524f06 (diff)
downloadcurrent-ad1b1833ef7c081fab1d2fa8a45f2f663180b68d.tar.gz
current-ad1b1833ef7c081fab1d2fa8a45f2f663180b68d.tar.xz
Tue Dec 12 19:54:42 UTC 202320231212195442
a/aaa_libraries-15.1-x86_64-24.txz: Rebuilt. Upgraded: libglib-2.0.so.0.7800.3, libgmodule-2.0.so.0.7800.3, libgobject-2.0.so.0.7800.3, libgthread-2.0.so.0.7800.3. Removed: libicudata.so.73.2, libicui18n.so.73.2, libicuio.so.73.2, libicutest.so.73.2, libicutu.so.73.2, libicuuc.so.73.2. ap/rpm-4.19.1-x86_64-1.txz: Upgraded. l/frei0r-plugins-2.3.2-x86_64-1.txz: Upgraded. l/icu4c-74.2-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-115.5.2-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/115.5.2/releasenotes/ xap/x3270-4.3ga4-x86_64-1.txz: Upgraded. extra/brltty/brltty-6.6-x86_64-2.txz: Rebuilt. Recompiled against icu4c-74.2.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/aaa_libraries/aaa_libraries.SlackBuild2
-rw-r--r--source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c7
-rwxr-xr-xsource/ap/rpm/rpm.SlackBuild27
-rw-r--r--source/kde/kde/patch/kdoctools.patch1
-rw-r--r--source/kde/kde/patch/kdoctools/kdoctools.libxml2-2.12.patch10
-rw-r--r--source/l/FTBFSlog3
-rw-r--r--source/l/frei0r-plugins/frei0r-plugins.url2
-rw-r--r--source/l/icu4c/icu4c.url2
-rw-r--r--source/l/libsoup/ced3c5d8cad0177b297666343f1561799dfefb0d.patch43
-rwxr-xr-xsource/l/libsoup/libsoup.SlackBuild2
-rwxr-xr-xsource/xap/x3270/x3270.SlackBuild12
11 files changed, 79 insertions, 32 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index b8a9fdcd6..63297e886 100755
--- a/source/a/aaa_libraries/aaa_libraries.SlackBuild
+++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_libraries
VERSION=${VERSION:-15.1}
-BUILD=${BUILD:-23}
+BUILD=${BUILD:-24}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c
deleted file mode 100644
index 69b337cdf..000000000
--- a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c
+++ /dev/null
@@ -1,7 +0,0 @@
-# We'll keep these around for a little while... probably remove on 2023-12-01 or thereabouts
-/usr/lib/libicudata.so.73
-/usr/lib/libicui18n.so.73
-/usr/lib/libicuio.so.73
-/usr/lib/libicutest.so.73
-/usr/lib/libicutu.so.73
-/usr/lib/libicuuc.so.73
diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
index 68948eea8..1120faa73 100755
--- a/source/ap/rpm/rpm.SlackBuild
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -109,28 +109,18 @@ cd cmake-build
-DWITH_AUDIT=OFF \
-DWITH_SELINUX=OFF \
-DWITH_INTERNAL_OPENPGP=ON \
+ -DENABLE_TESTSUITE=OFF \
.. || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
cd ..
-# Put this in the system directory:
-mkdir -p $PKG/usr/share
-mv $PKG/etc/dbus-1 $PKG/usr/share
-rmdir $PKG/etc
-
-# It seems this doesn't work...
-#make install-man DESTDIR=$PKG || exit 1
-#for dir in . fr ja ko pl ru sk ; do
-# if /bin/ls docs/man/$dir/*.1 1> /dev/null 2> /dev/null ; then
-# mkdir -p $PKG/usr/man/$dir/man1
-# cp -a docs/man/$dir/*.1 $PKG/usr/man/$dir/man1
-# fi
-# if /bin/ls docs/man/$dir/*.8 1> /dev/null 2> /dev/null ; then
-# mkdir -p $PKG/usr/man/$dir/man8
-# cp -a docs/man/$dir/*.8 $PKG/usr/man/$dir/man8
-# fi
-#done
+if [ -d $PKG/etc/dbus-1 ]; then
+ # Put this in the system directory:
+ mkdir -p $PKG/usr/share
+ mv $PKG/etc/dbus-1 $PKG/usr/share
+ rmdir $PKG/etc
+fi
# This used to be at /bin/rpm, so make a symlink from there to the new
# location:
@@ -163,7 +153,7 @@ rmdir $PKG/usr/share/doc/rpm
mrdir $PKG/usr/share/doc
rm -rf $PKG/usr/doc/rpm-$VERSION/API
cp -a \
- COPYING* CREDITS* GROUPS* INSTALL* README* TODO* doc/manual \
+ CONTRIBUTING* COPYING* CREDITS* INSTALL* README* docs/manual \
$PKG/usr/doc/rpm-$VERSION
# If there's a ChangeLog file, installing at least part of the recent history
@@ -180,4 +170,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $TMP/rpm-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/kde/kde/patch/kdoctools.patch b/source/kde/kde/patch/kdoctools.patch
new file mode 100644
index 000000000..d1f001b95
--- /dev/null
+++ b/source/kde/kde/patch/kdoctools.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kdoctools/kdoctools.libxml2-2.12.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kdoctools/kdoctools.libxml2-2.12.patch b/source/kde/kde/patch/kdoctools/kdoctools.libxml2-2.12.patch
new file mode 100644
index 000000000..fa6fa23c3
--- /dev/null
+++ b/source/kde/kde/patch/kdoctools/kdoctools.libxml2-2.12.patch
@@ -0,0 +1,10 @@
+--- ./src/xslt.cpp.orig 2023-11-04 05:02:07.000000000 -0500
++++ ./src/xslt.cpp 2023-12-11 21:07:11.333261959 -0600
+@@ -14,6 +14,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/parserInternals.h>
+ #include <libxml/xmlIO.h>
++#include <libxml/xmlsave.h>
+ #include <libxslt/transform.h>
+ #include <libxslt/xsltInternals.h>
+ #include <libxslt/xsltconfig.h>
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index e61c32a4e..550790db3 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,6 @@
+Tue Dec 12 19:23:30 UTC 2023
+ libsoup: patch to fix build with libxml2-2.12. Thanks to marav.
++--------------------------+
Fri Oct 27 17:55:58 UTC 2023
ffmpeg: fix building HTML documentation with texinfo-7.1.
Thanks to rizitis.
diff --git a/source/l/frei0r-plugins/frei0r-plugins.url b/source/l/frei0r-plugins/frei0r-plugins.url
index d11be4a86..0b6de368e 100644
--- a/source/l/frei0r-plugins/frei0r-plugins.url
+++ b/source/l/frei0r-plugins/frei0r-plugins.url
@@ -1,3 +1,3 @@
#https://files.dyne.org/frei0r
https://github.com/dyne/frei0r
-https://github.com/dyne/frei0r/archive/v2.3.1/frei0r-plugins-2.3.1.tar.gz
+https://github.com/dyne/frei0r/archive/v2.3.2/frei0r-plugins-2.3.2.tar.gz
diff --git a/source/l/icu4c/icu4c.url b/source/l/icu4c/icu4c.url
index 8a2e5c5b2..69c9c8d0f 100644
--- a/source/l/icu4c/icu4c.url
+++ b/source/l/icu4c/icu4c.url
@@ -1,2 +1,2 @@
https://github.com/unicode-org/icu
-https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz
+https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src.tgz
diff --git a/source/l/libsoup/ced3c5d8cad0177b297666343f1561799dfefb0d.patch b/source/l/libsoup/ced3c5d8cad0177b297666343f1561799dfefb0d.patch
new file mode 100644
index 000000000..4aba5357b
--- /dev/null
+++ b/source/l/libsoup/ced3c5d8cad0177b297666343f1561799dfefb0d.patch
@@ -0,0 +1,43 @@
+From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 22 Nov 2023 18:49:10 -0800
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes build errors about missing function prototypes with clang-17
+
+Fixes
+| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libsoup/soup-xmlrpc-old.c | 1 +
+ libsoup/soup-xmlrpc.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c
+index c57086b6a..527e3b235 100644
+--- a/libsoup/soup-xmlrpc-old.c
++++ b/libsoup/soup-xmlrpc-old.c
+@@ -11,6 +11,7 @@
+
+ #include <string.h>
+
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+
+ #include "soup-xmlrpc-old.h"
+diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c
+index 42dcda9c7..e991cbf01 100644
+--- a/libsoup/soup-xmlrpc.c
++++ b/libsoup/soup-xmlrpc.c
+@@ -17,6 +17,7 @@
+
+ #include <string.h>
+ #include <errno.h>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include "soup-xmlrpc.h"
+ #include "soup.h"
+--
+GitLab
+
diff --git a/source/l/libsoup/libsoup.SlackBuild b/source/l/libsoup/libsoup.SlackBuild
index 0fcdcbfb8..4799f579a 100755
--- a/source/l/libsoup/libsoup.SlackBuild
+++ b/source/l/libsoup/libsoup.SlackBuild
@@ -73,6 +73,8 @@ cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+cat $CWD/ced3c5d8cad0177b297666343f1561799dfefb0d.patch | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/xap/x3270/x3270.SlackBuild b/source/xap/x3270/x3270.SlackBuild
index 95c4ae7fd..769b328b9 100755
--- a/source/xap/x3270/x3270.SlackBuild
+++ b/source/xap/x3270/x3270.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2012, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2018, 2021, 2023 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=x3270
-VERSION=4.0
+VERSION=4.3
TARBVER=${TARBVER:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
VERSION=$(echo $TARBVER | cut -f 1,2 -d .)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -126,11 +126,17 @@ for i in $( find $PKG/usr/man -type l ) ; do
rm $i
done
+# Most of these docs are gone, but we'll keep trying ;-)
mkdir -p $PKG/usr/doc/x3270-$TARBVER
cp -a \
x3270/LICENSE* x3270/README* x3270/Examples \
README* \
$PKG/usr/doc/x3270-$TARBVER
+# If there's no LICENSE, we do need to do something about that:
+if [ ! -r $PKG/usr/doc/x3270-$TARBVER/LICENSE ]; then
+ sed -n '3,28p;28q' x3270/conf.h > $PKG/usr/doc/x3270-$TARBVER/LICENSE
+fi
+## COMMENTED OUT as there doesn't seem to be anything useful here any more:
# Dereference symbolic links while copying html docs:
mkdir -p $PKG/usr/doc/x3270-$TARBVER/html
( cd x3270/html