summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/a/elogind/doinst.sh3
-rwxr-xr-xsource/a/elogind/elogind.SlackBuild3
-rwxr-xr-xsource/a/kmod/kmod.SlackBuild2
-rw-r--r--source/a/kmod/slack-desc2
-rw-r--r--source/l/FTBFSlog5
-rw-r--r--source/l/avahi/doinst.sh4
-rwxr-xr-xsource/l/brotli/brotli.SlackBuild2
-rw-r--r--source/l/libieee1284/libieee1284-add-more-python-bindings.patch62
-rw-r--r--source/l/libieee1284/libieee1284-fix-warnings.patch103
-rw-r--r--source/l/libieee1284/libieee1284-python3.patch266
-rwxr-xr-xsource/l/libieee1284/libieee1284.SlackBuild15
-rwxr-xr-xsource/l/libimobiledevice/libimobiledevice.SlackBuild3
-rwxr-xr-xsource/l/opencv/opencv.SlackBuild10
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild2
-rw-r--r--source/xap/xlockmore/slack-desc2
-rw-r--r--source/xfce/xfce4-screensaver/doinst.sh18
-rwxr-xr-xsource/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild7
17 files changed, 48 insertions, 461 deletions
diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh
index 3f311c5f5..e529fda15 100644
--- a/source/a/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
@@ -29,9 +29,10 @@ preserve_perms() {
preserve_perms etc/rc.d/rc.elogind.new
config etc/elogind/logind.conf.new
config etc/elogind/sleep.conf.new
+config etc/pam.d/elogind-user.new
+# Reload elogind-daemon:
if pgrep -f elogind-daemon 1> /dev/null 2> /dev/null ; then
- echo "Reloading elogind-daemon..."
pkill -HUP -f elogind-daemon
fi
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index e11ea435a..dd89aa081 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=elogind
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
@@ -143,6 +143,7 @@ ln -sf /bin/loginctl $PKG/usr/bin/loginctl
# Make sure we do not overwrite the user's customizations:
mv -i $PKG/etc/elogind/logind.conf{,.new}
mv -i $PKG/etc/elogind/sleep.conf{,.new}
+mv -i $PKG/etc/pam.d/elogind-user{,.new}
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/a/kmod/kmod.SlackBuild b/source/a/kmod/kmod.SlackBuild
index 104f7bfc1..b59ab405c 100755
--- a/source/a/kmod/kmod.SlackBuild
+++ b/source/a/kmod/kmod.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=kmod
-VERSION=${VERSION:-31}
+VERSION=${VERSION:-32}
BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
diff --git a/source/a/kmod/slack-desc b/source/a/kmod/slack-desc
index 091769091..d0ce3e440 100644
--- a/source/a/kmod/slack-desc
+++ b/source/a/kmod/slack-desc
@@ -16,4 +16,4 @@ kmod:
kmod: These tools are designed on top of libkmod, a library that is
kmod: shipped with kmod.
kmod:
-kmod: Homepage: http://www.kernel.org/pub/linux/utils/kernel/kmod/
+kmod: Homepage: https://www.kernel.org/pub/linux/utils/kernel/kmod/
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog
index a9a91c5cc..069ed0052 100644
--- a/source/l/FTBFSlog
+++ b/source/l/FTBFSlog
@@ -1,3 +1,8 @@
+Thu Mar 14 19:22:30 UTC 2024
+ libieee1284: drop unmaintained python support, following other distros
+ libimobiledevice: build --without-cython
+ opencv: Build with -DOpenGL_GL_PREFERENCE=LEGACY
++--------------------------+
Mon Mar 4 18:48:34 UTC 2024
giflib: fix build with NUMJOBS=-j1. Thanks to lucabon.
+--------------------------+
diff --git a/source/l/avahi/doinst.sh b/source/l/avahi/doinst.sh
index 86a70b185..77c716128 100644
--- a/source/l/avahi/doinst.sh
+++ b/source/l/avahi/doinst.sh
@@ -31,7 +31,7 @@ if [ -x /usr/bin/update-desktop-database ]; then
fi
# Reload messagebus service:
-if [ -x etc/rc.d/rc.messagebus ]; then
- chroot . /etc/rc.d/rc.messagebus reload
+if [ -x /etc/rc.d/rc.messagebus ]; then
+ sh /etc/rc.d/rc.messagebus reload 1> /dev/null 2> /dev/null
fi
diff --git a/source/l/brotli/brotli.SlackBuild b/source/l/brotli/brotli.SlackBuild
index 9bce33362..39aec12eb 100755
--- a/source/l/brotli/brotli.SlackBuild
+++ b/source/l/brotli/brotli.SlackBuild
@@ -107,7 +107,7 @@ cd cmake-build
cd ..
# Only add python3 support. We're not adding any Python 2 junk now...
-python3 setup.py install --root=$PKG
+python3 setup.py install --root=$PKG || exit 1
# No static libraries:
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
diff --git a/source/l/libieee1284/libieee1284-add-more-python-bindings.patch b/source/l/libieee1284/libieee1284-add-more-python-bindings.patch
deleted file mode 100644
index eea4cb4fc..000000000
--- a/source/l/libieee1284/libieee1284-add-more-python-bindings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b4d63327dfef8dbf12aabf4bba0f6818a3519995 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Tue, 8 Mar 2011 15:07:04 +0000
-Subject: [PATCH] 2011-03-08 Tim Waugh <twaugh@redhat.com>
-
-* src/ieee1284module.c: Added bindings for get_irq_fd and
-clear_irq. Patch by Sergey Temerkhanov.
----
- src/ieee1284module.c | 33 +++++++++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
-
-diff --git a/src/ieee1284module.c b/src/ieee1284module.c
-index 0093d6f..23c1f29 100644
---- a/src/ieee1284module.c
-+++ b/src/ieee1284module.c
-@@ -189,6 +189,33 @@ Parport_open (ParportObject *self, PyObject *args)
- return PyInt_FromLong (capabilities);
- }
-
-+static PyObject *
-+Parport_get_irq_fd (ParportObject *self)
-+{
-+ int fd = ieee1284_get_irq_fd (self->port);
-+ if (fd < 0) {
-+ handle_error (fd);
-+ return NULL;
-+ }
-+
-+ return PyInt_FromLong (fd);
-+}
-+
-+static PyObject *
-+Parport_clear_irq (ParportObject *self)
-+{
-+ int portcount = 0;
-+ int r;
-+
-+ int fd = ieee1284_clear_irq (self->port, &portcount);
-+ if (r < 0) {
-+ handle_error (r);
-+ return NULL;
-+ }
-+
-+ return PyInt_FromLong (portcount);
-+}
-+
- static PyObject *
- Parport_close (ParportObject *self)
- {
-@@ -484,6 +511,12 @@ PyMethodDef Parport_methods[] = {
- { "close", (PyCFunction) Parport_close, METH_NOARGS,
- "close() -> None\n"
- "Closes a port." },
-+ { "get_irq_fd", (PyCFunction) Parport_get_irq_fd, METH_VARARGS,
-+ "get_irq_fd() -> int\n"
-+ "Returns a pollable IRQ file descriptor." },
-+ { "clear_irq", (PyCFunction) Parport_clear_irq, METH_NOARGS,
-+ "clear_irq(portcount) -> int\n"
-+ "Clears IRQ and returns number of IRQs raised." },
- { "claim", (PyCFunction) Parport_claim, METH_NOARGS,
- "claim() -> None\n"
- "Claims a port." },
diff --git a/source/l/libieee1284/libieee1284-fix-warnings.patch b/source/l/libieee1284/libieee1284-fix-warnings.patch
deleted file mode 100644
index b65824c8a..000000000
--- a/source/l/libieee1284/libieee1284-fix-warnings.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From c48855528beee1397d883f9c8a5df7aed5c917a6 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Wed, 23 Jun 2010 11:58:04 +0000
-Subject: [PATCH] 2010-06-23 Tim Waugh <twaugh@redhat.com>
-
-* src/ieee1284module.c: Fixed warnings.
----
- src/ieee1284module.c | 37 ++++++++++++++++++++++++++++---------
- 2 files changed, 29 insertions(+), 9 deletions(-)
-
-diff --git a/src/ieee1284module.c b/src/ieee1284module.c
-index 30972f8..0093d6f 100644
---- a/src/ieee1284module.c
-+++ b/src/ieee1284module.c
-@@ -28,6 +28,17 @@ typedef struct {
- struct parport *port;
- } ParportObject;
-
-+static PyObject *
-+Parport_new (PyTypeObject *type, PyObject *args, PyObject *kwds)
-+{
-+ ParportObject *self;
-+ self = (ParportObject *) type->tp_alloc (type, 0);
-+ if (self != NULL)
-+ self->port = NULL;
-+
-+ return (PyObject *) self;
-+}
-+
- static int
- Parport_init (ParportObject *self, PyObject *args, PyObject *kwds)
- {
-@@ -215,7 +226,6 @@ Parport_release (ParportObject *self)
- static PyObject *
- Parport_read_data (ParportObject *self)
- {
-- unsigned char b[2];
- int r = ieee1284_read_data (self->port);
- if (r < 0) {
- handle_error (r);
-@@ -258,7 +268,6 @@ Parport_data_dir (ParportObject *self, PyObject *args)
- static PyObject *
- Parport_read_status (ParportObject *self)
- {
-- unsigned char b[2];
- int r = ieee1284_read_status (self->port);
- if (r < 0) {
- handle_error (r);
-@@ -293,7 +302,6 @@ Parport_wait_status (ParportObject *self, PyObject *args)
- static PyObject *
- Parport_read_control (ParportObject *self)
- {
-- unsigned char b[2];
- int r = ieee1284_read_control (self->port);
- if (r < 0) {
- handle_error (r);
-@@ -435,7 +443,6 @@ Parport_##x (ParportObject *self, PyObject *args) \
- int len; \
- char *buffer; \
- ssize_t wrote; \
-- PyObject *ret; \
- \
- if (!PyArg_ParseTuple (args, "s#|i", &buffer, &len, &flags)) \
- return NULL; \
-@@ -562,6 +569,23 @@ static PyTypeObject ParportType = {
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT, /* tp_flags */
- "parallel port object", /* tp_doc */
-+ 0, /* tp_traverse */
-+ 0, /* tp_clear */
-+ 0, /* tp_richcompare */
-+ 0, /* tp_weaklistoffset */
-+ 0, /* tp_iter */
-+ 0, /* tp_iternext */
-+ Parport_methods, /* tp_methods */
-+ 0, /* tp_members */
-+ Parport_getseters, /* tp_getset */
-+ 0, /* tp_base */
-+ 0, /* tp_dict */
-+ 0, /* tp_descr_get */
-+ 0, /* tp_descr_set */
-+ 0, /* tp_dictoffset */
-+ (initproc)Parport_init, /* tp_init */
-+ 0, /* tp_alloc */
-+ Parport_new, /* tp_new */
- };
-
- static PyObject *
-@@ -625,14 +649,9 @@ initieee1284 (void)
- PyObject *d = PyModule_GetDict (m);
- PyObject *c;
-
-- ParportType.tp_new = PyType_GenericNew;
-- ParportType.tp_init = (initproc) Parport_init;
-- ParportType.tp_getset = Parport_getseters;
-- ParportType.tp_methods = Parport_methods;
- if (PyType_Ready (&ParportType) < 0)
- return;
-
-- Py_INCREF (&ParportType);
- PyModule_AddObject (m, "Parport", (PyObject *) &ParportType);
-
- pyieee1284_error = PyErr_NewException("ieee1284.error", NULL, NULL);
diff --git a/source/l/libieee1284/libieee1284-python3.patch b/source/l/libieee1284/libieee1284-python3.patch
deleted file mode 100644
index bed2be230..000000000
--- a/source/l/libieee1284/libieee1284-python3.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff --git a/src/ieee1284module.c b/src/ieee1284module.c
-index 23c1f29..c6d6928 100644
---- a/src/ieee1284module.c
-+++ b/src/ieee1284module.c
-@@ -52,33 +52,32 @@ Parport_dealloc (ParportObject *self)
- {
- if (self->port)
- ieee1284_unref (self->port);
--
-- self->ob_type->tp_free ((PyObject *) self);
-+ Py_TYPE(self)->tp_free((PyObject *) self);
- }
-
- static PyObject *
- Parport_getname (ParportObject *self, void *closure)
- {
-- return PyString_FromString (self->port->name);
-+ return PyBytes_FromString (self->port->name);
- }
-
- static PyObject *
- Parport_getbase_addr (ParportObject *self, void *closure)
- {
-- return PyInt_FromLong (self->port->base_addr);
-+ return PyLong_FromLong (self->port->base_addr);
- }
-
- static PyObject *
- Parport_gethibase_addr (ParportObject *self, void *closure)
- {
-- return PyInt_FromLong (self->port->hibase_addr);
-+ return PyLong_FromLong (self->port->hibase_addr);
- }
-
- static PyObject *
- Parport_getfilename (ParportObject *self, void *closure)
- {
- if (self->port->filename)
-- return PyString_FromString (self->port->filename);
-+ return PyBytes_FromString (self->port->filename);
-
- Py_INCREF (Py_None);
- return Py_None;
-@@ -168,7 +167,7 @@ Parport_get_deviceid (ParportObject *self, PyObject *args)
- return NULL;
- }
-
-- return PyString_FromStringAndSize (buffer, r);
-+ return PyBytes_FromStringAndSize (buffer, r);
- }
-
- static PyObject *
-@@ -186,7 +185,7 @@ Parport_open (ParportObject *self, PyObject *args)
- return NULL;
- }
-
-- return PyInt_FromLong (capabilities);
-+ return PyLong_FromLong (capabilities);
- }
-
- static PyObject *
-@@ -198,7 +197,7 @@ Parport_get_irq_fd (ParportObject *self)
- return NULL;
- }
-
-- return PyInt_FromLong (fd);
-+ return PyLong_FromLong (fd);
- }
-
- static PyObject *
-@@ -213,7 +212,7 @@ Parport_clear_irq (ParportObject *self)
- return NULL;
- }
-
-- return PyInt_FromLong (portcount);
-+ return PyLong_FromLong (portcount);
- }
-
- static PyObject *
-@@ -259,7 +258,7 @@ Parport_read_data (ParportObject *self)
- return NULL;
- }
-
-- return PyInt_FromLong (r);
-+ return PyLong_FromLong (r);
- }
-
- static PyObject *
-@@ -301,7 +300,7 @@ Parport_read_status (ParportObject *self)
- return NULL;
- }
-
-- return PyInt_FromLong (r);
-+ return PyLong_FromLong (r);
- }
-
- static PyObject *
-@@ -335,7 +334,7 @@ Parport_read_control (ParportObject *self)
- return NULL;
- }
-
-- return PyInt_FromLong (r);
-+ return PyLong_FromLong (r);
- }
-
- static PyObject *
-@@ -452,7 +451,7 @@ Parport_##x (ParportObject *self, PyObject *args) \
- return NULL; \
- } \
- \
-- ret = PyString_FromStringAndSize (buffer, got); \
-+ ret = PyBytes_FromStringAndSize (buffer, got); \
- free (buffer); \
- return ret; \
- }
-@@ -480,7 +479,7 @@ Parport_##x (ParportObject *self, PyObject *args) \
- return NULL; \
- } \
- \
-- return PyInt_FromLong (wrote); \
-+ return PyLong_FromLong (wrote); \
- }
-
- #define WRITE_METHOD(x) \
-@@ -581,44 +580,53 @@ WRITE_METHOD(ecp_write_addr)
-
- static PyTypeObject ParportType = {
- PyObject_HEAD_INIT(NULL)
-- 0, /* ob_size */
-- "ieee1284.Parport", /* tp_name */
-- sizeof (ParportObject), /* tp_basicsize */
-- 0, /* tp_itemsize */
-- (destructor)Parport_dealloc, /* tp_dealloc */
-- 0, /* tp_print */
-- 0, /* tp_getattr */
-- 0, /* tp_setattr */
-- 0, /* tp_compare */
-- 0, /* tp_repr */
-- 0, /* tp_as_number */
-- 0, /* tp_as_sequence */
-- 0, /* tp_as_mapping */
-- 0, /* tp_hash */
-- 0, /* tp_call */
-- 0, /* tp_str */
-- 0, /* tp_getattro */
-- 0, /* tp_setattro */
-- 0, /* tp_as_buffer */
-- Py_TPFLAGS_DEFAULT, /* tp_flags */
-- "parallel port object", /* tp_doc */
-- 0, /* tp_traverse */
-- 0, /* tp_clear */
-- 0, /* tp_richcompare */
-- 0, /* tp_weaklistoffset */
-- 0, /* tp_iter */
-- 0, /* tp_iternext */
-- Parport_methods, /* tp_methods */
-- 0, /* tp_members */
-- Parport_getseters, /* tp_getset */
-- 0, /* tp_base */
-- 0, /* tp_dict */
-- 0, /* tp_descr_get */
-- 0, /* tp_descr_set */
-- 0, /* tp_dictoffset */
-- (initproc)Parport_init, /* tp_init */
-- 0, /* tp_alloc */
-- Parport_new, /* tp_new */
-+ "ieee1284.Parport", /* const char *tp_name; */
-+ sizeof (ParportObject), /* Py_ssize_t tp_basicsize */
-+ 0, /* Py_ssize_t tp_itemsize; */
-+ (destructor)Parport_dealloc, /* destructor tp_dealloc; */
-+ 0, /* printfunc tp_print; */
-+ 0, /* getattrfunc tp_getattr; */
-+ 0, /* setattrfunc tp_setattr; */
-+ 0, /* PyAsyncMethods *tp_as_async; */
-+ 0, /* reprfunc tp_repr; */
-+ 0, /* PyNumberMethods *tp_as_number; */
-+ 0, /* PySequenceMethods *tp_as_sequence; */
-+ 0, /* PyMappingMethods *tp_as_mapping; */
-+ 0, /* hashfunc tp_hash; */
-+ 0, /* ternaryfunc tp_call; */
-+ 0, /* reprfunc tp_str; */
-+ 0, /* getattrofunc tp_getattro; */
-+ 0, /* setattrofunc tp_setattro; */
-+ 0, /* PyBufferProcs *tp_as_buffer; */
-+ Py_TPFLAGS_DEFAULT, /* unsigned long tp_flags; */
-+ "parallel port object", /* const char *tp_doc; */
-+ 0, /* traverseproc tp_traverse; */
-+ 0, /* inquiry tp_clear; */
-+ 0, /* richcmpfunc tp_richcompare; */
-+ 0, /* Py_ssize_t tp_weaklistoffset; */
-+ 0, /* getiterfunc tp_iter; */
-+ 0, /* iternextfunc tp_iternext; */
-+ Parport_methods, /* struct PyMethodDef *tp_methods; */
-+ 0, /* struct PyMemberDef *tp_members; */
-+ Parport_getseters, /* struct PyGetSetDef *tp_getset; */
-+ 0, /* struct _typeobject *tp_base; */
-+ 0, /* PyObject *tp_dict; */
-+ 0, /* descrgetfunc tp_descr_get; */
-+ 0, /* descrsetfunc tp_descr_set; */
-+ 0, /* Py_ssize_t tp_dictoffset; */
-+ (initproc)Parport_init, /* initproc tp_init; */
-+ 0, /* allocfunc tp_alloc; */
-+ Parport_new, /* newfunc tp_new; */
-+ 0, /* freefunc tp_free; */
-+ 0, /* inquiry tp_is_gc; */
-+ 0, /* PyObject *tp_bases; */
-+ 0, /* PyObject *tp_mro; */
-+ 0, /* PyObject *tp_cache; */
-+ 0, /* PyObject *tp_subclasses; */
-+ 0, /* PyObject *tp_weaklist; */
-+ 0, /* destructor tp_del; */
-+ 0, /* unsigned int tp_version_tag; */
-+ 0 /* destructor tp_finalize; */
- };
-
- static PyObject *
-@@ -672,18 +680,30 @@ static PyMethodDef Ieee1284Methods[] = {
- {NULL, NULL, 0, NULL}
- };
-
-+static struct PyModuleDef Ieee1284Module = {
-+ PyModuleDef_HEAD_INIT,
-+ "ieee1284",
-+ NULL, /* documentation */
-+ -1,
-+ Ieee1284Methods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL
-+};
-+
- #ifndef PyMODINIT_FUNC
- #define PyMODINIT_FUNC void
- #endif
- PyMODINIT_FUNC
--initieee1284 (void)
-+PyInit_ieee1284module (void)
- {
-- PyObject *m = Py_InitModule ("ieee1284", Ieee1284Methods);
-+ PyObject *m = PyModule_Create (&Ieee1284Module);
- PyObject *d = PyModule_GetDict (m);
- PyObject *c;
-
- if (PyType_Ready (&ParportType) < 0)
-- return;
-+ return NULL;
-
- PyModule_AddObject (m, "Parport", (PyObject *) &ParportType);
-
-@@ -693,7 +713,7 @@ initieee1284 (void)
-
- #define CONSTANT(x) \
- do { \
-- c = PyInt_FromLong (x); \
-+ c = PyLong_FromLong (x); \
- PyDict_SetItemString (d, #x, c); \
- Py_DECREF (c); \
- } while (0)
-@@ -740,4 +760,6 @@ initieee1284 (void)
- CONSTANT (F1284_SWE);
- CONSTANT (F1284_RLE);
- CONSTANT (F1284_FASTEPP);
-+
-+ return m;
- }
diff --git a/source/l/libieee1284/libieee1284.SlackBuild b/source/l/libieee1284/libieee1284.SlackBuild
index 1827ffda3..65397a04b 100755
--- a/source/l/libieee1284/libieee1284.SlackBuild
+++ b/source/l/libieee1284/libieee1284.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -78,20 +78,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Upstream commits around better python bindings support
-zcat $CWD/libieee1284-fix-warnings.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/libieee1284-add-more-python-bindings.patch.gz | patch -p1 --verbose || exit 1
-
-# Arch patch to update python bindings to python3
-zcat $CWD/libieee1284-python3.patch.gz | patch -p1 --verbose || exit 1
-
-sed -i "s|print sys.version\[:3\]|print(sys.version\[:3\])|" ./configure
-sed -i "s|print sys.platform|print(sys.platform)|" ./configure
-sed -i "s|lib/python|lib$LIBDIRSUFFIX/python|" ./configure
-
# Configure:
CFLAGS="$SLKCFLAGS" \
-PYTHON="/usr/bin/python3" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -99,6 +87,7 @@ PYTHON="/usr/bin/python3" \
--mandir=/usr/man \
--program-prefix= \
--program-suffix= \
+ --without-python \
--build=$ARCH-slackware-linux || exit 1
# Build and install:
diff --git a/source/l/libimobiledevice/libimobiledevice.SlackBuild b/source/l/libimobiledevice/libimobiledevice.SlackBuild
index a991f6941..d02786674 100755
--- a/source/l/libimobiledevice/libimobiledevice.SlackBuild
+++ b/source/l/libimobiledevice/libimobiledevice.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2015, 2017, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2017, 2018, 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -93,6 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PKGNAM-$VERSION \
--mandir=/usr/man \
--disable-static \
+ --without-cython \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
diff --git a/source/l/opencv/opencv.SlackBuild b/source/l/opencv/opencv.SlackBuild
index 0a542b2a7..fafc4ac92 100755
--- a/source/l/opencv/opencv.SlackBuild
+++ b/source/l/opencv/opencv.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2015, 2017, 2019 Eric Hameleers, Eindhoven, NL
-# Copyright 2020, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -88,10 +88,14 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Broken build without this?
+BROKEN="-DOpenGL_GL_PREFERENCE=LEGACY"
+
# Configure, build, and install:
mkdir cmake-build
cd cmake-build
cmake \
+ $BROKEN \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -127,10 +131,6 @@ cd cmake-build
make install DESTDIR=$PKG || exit 1
cd ..
-# COMMENTED OUT as mlt finds opencv4.pc just fine.
-# Add a symlink to opencv.pc to make eg. mlt find it:
-#( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ; ln -sf opencv4.pc opencv.pc )
-
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 1533f8bcc..d36d456b9 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=mesa
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
AMBERVERS=${AMBERVERS:-21.3.9}
DEMOVERS=${DEMOVERS:-8.5.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
BUILD_AMBER=${BUILD_AMBER:-YES}
BUILD_DEMOS=${BUILD_DEMOS:-YES}
CODECS=${CODECS:-h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec}
diff --git a/source/xap/xlockmore/slack-desc b/source/xap/xlockmore/slack-desc
index a18d57a20..b583b28be 100644
--- a/source/xap/xlockmore/slack-desc
+++ b/source/xap/xlockmore/slack-desc
@@ -15,5 +15,5 @@ xlockmore: The 'Bob' bitmap has been included especially for Slackware, as well
xlockmore: as a Linux penguin logo. (NOTE: the image of J. R. "Bob" Dobbs is a
xlockmore: registered trademark of The Subgenius Foundation, used by permission)
xlockmore:
-xlockmore: Homepage: http://sillycycle.com/xlockmore.html
+xlockmore: Homepage: https://sillycycle.com/xlockmore.html
xlockmore:
diff --git a/source/xfce/xfce4-screensaver/doinst.sh b/source/xfce/xfce4-screensaver/doinst.sh
new file mode 100644
index 000000000..91f6e6af6
--- /dev/null
+++ b/source/xfce/xfce4-screensaver/doinst.sh
@@ -0,0 +1,18 @@
+# Handle the incoming configuration files:
+config() {
+ for infile in $1; do
+ NEW="$infile"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+ done
+}
+
+config etc/pam.d/xfce4-screensaver.new
+
diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index 3538d7eb9..8f310838a 100755
--- a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for xfce4-screensaver
# Copyright 2019 Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, 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=xfce4-screensaver
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
@@ -103,6 +103,9 @@ CXXFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Make sure we do not overwrite the user's customizations:
+mv -i $PKG/etc/pam.d/xfce4-screensaver{,.new}
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true