diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/kde/FTBFSlog | 4 | ||||
-rw-r--r-- | source/kde/kde/build/digikam | 2 | ||||
-rw-r--r-- | source/kde/kde/cmake/kid3 | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/kid3.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/kid3/build-with-qt5.patch | 15 | ||||
-rwxr-xr-x | source/kde/qcoro/qcoro.SlackBuild | 3 | ||||
-rw-r--r-- | source/l/FTBFSlog | 3 | ||||
-rwxr-xr-x | source/l/avahi/avahi.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/quazip/quazip.SlackBuild | 1 | ||||
-rwxr-xr-x | source/n/php/fetch-php.sh | 4 | ||||
-rw-r--r-- | source/n/php/php.imap.api.diff | 20 | ||||
-rwxr-xr-x | source/n/proftpd/proftpd.SlackBuild | 4 |
12 files changed, 43 insertions, 18 deletions
diff --git a/source/kde/FTBFSlog b/source/kde/FTBFSlog index 1c1b8b23d..af5f19911 100644 --- a/source/kde/FTBFSlog +++ b/source/kde/FTBFSlog @@ -1,3 +1,7 @@ +Thu Mar 14 18:59:29 UTC 2024 + qcoro: -DUSE_QT_VERSION=5 + kid3: -DQT_MAJOR_VERSION=5 -DBUILD_WITH_QT6=OFF, and then patch it to actually do that ++--------------------------+ Tue Apr 26 19:35:10 UTC 2022 kde/digikam: fix build with latest akonadi-contacts. Thanks to nobodino. +--------------------------+ diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index 7ed6ff82d..d00491fd7 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -5 +1 diff --git a/source/kde/kde/cmake/kid3 b/source/kde/kde/cmake/kid3 index f24109f91..6776fac3d 100644 --- a/source/kde/kde/cmake/kid3 +++ b/source/kde/kde/cmake/kid3 @@ -17,7 +17,7 @@ cd cmake-build -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DBUILD_WITH_QT6=OFF \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DWITH_APPS="CLI;Qt;KDE" \ -DWITH_CHROMAPRINT=OFF \ diff --git a/source/kde/kde/patch/kid3.patch b/source/kde/kde/patch/kid3.patch new file mode 100644 index 000000000..fdb8e61ef --- /dev/null +++ b/source/kde/kde/patch/kid3.patch @@ -0,0 +1 @@ +cat $CWD/patch/kid3/build-with-qt5.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kid3/build-with-qt5.patch b/source/kde/kde/patch/kid3/build-with-qt5.patch new file mode 100644 index 000000000..5287c4c36 --- /dev/null +++ b/source/kde/kde/patch/kid3/build-with-qt5.patch @@ -0,0 +1,15 @@ +--- ./CMakeLists.txt.orig 2024-02-23 16:50:39.000000000 -0000 ++++ ./CMakeLists.txt 2024-03-14 20:49:46.015432993 -0000 +@@ -271,11 +271,7 @@ + endif() + endif() + endif() +-if(BUILD_WITH_QT6) +- find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) +-else() +- find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED) +-endif() ++find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) + if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR LESS 2) + set(WITH_MULTIMEDIA OFF) + endif() diff --git a/source/kde/qcoro/qcoro.SlackBuild b/source/kde/qcoro/qcoro.SlackBuild index a3e935556..6dc1e1195 100755 --- a/source/kde/qcoro/qcoro.SlackBuild +++ b/source/kde/qcoro/qcoro.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# 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 @@ -95,6 +95,7 @@ cd cmake-build -DLIB_SUFFIX="$LIBDIRSUFFIX" \ -DDOC_INSTALL_DIR="doc" \ -DMAN_INSTALL_DIR=/usr/man \ + -DUSE_QT_VERSION=5 \ .. || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index 069ed0052..3842c6c08 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,6 @@ +Thu Mar 14 19:58:14 UTC 2024 + quazip: -DQUAZIP_QT_MAJOR_VERSION=5 ++--------------------------+ Thu Mar 14 19:22:30 UTC 2024 libieee1284: drop unmaintained python support, following other distros libimobiledevice: build --without-cython diff --git a/source/l/avahi/avahi.SlackBuild b/source/l/avahi/avahi.SlackBuild index 341bf7272..c27585761 100755 --- a/source/l/avahi/avahi.SlackBuild +++ b/source/l/avahi/avahi.SlackBuild @@ -106,7 +106,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PKPKGGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --with-systemdsystemunitdir=no \ --enable-tests \ --disable-static \ diff --git a/source/l/quazip/quazip.SlackBuild b/source/l/quazip/quazip.SlackBuild index 9d32c6aee..eb35a264b 100755 --- a/source/l/quazip/quazip.SlackBuild +++ b/source/l/quazip/quazip.SlackBuild @@ -98,6 +98,7 @@ cd cmake-build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DQUAZIP_QT_MAJOR_VERSION=5 \ .. || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index 9412f57db..a3dda52cf 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-8.3.3.tar.xz.asc -lftpget http://us.php.net/distributions/php-8.3.3.tar.xz +lftpget http://us.php.net/distributions/php-8.3.4.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.3.4.tar.xz diff --git a/source/n/php/php.imap.api.diff b/source/n/php/php.imap.api.diff index 8626c84c0..01b985dde 100644 --- a/source/n/php/php.imap.api.diff +++ b/source/n/php/php.imap.api.diff @@ -1,6 +1,6 @@ ---- ./configure.orig 2023-04-11 11:16:23.000000000 -0500 -+++ ./configure 2023-04-13 12:54:14.715770023 -0500 -@@ -43985,6 +43985,7 @@ +--- ./configure.orig 2024-03-12 18:42:26.000000000 -0500 ++++ ./configure 2024-03-15 13:22:46.014768956 -0500 +@@ -43591,6 +43591,7 @@ PHP_IMAP_EXPORT void mm_nocritical(void){} PHP_IMAP_EXPORT void mm_notify(void){} PHP_IMAP_EXPORT void mm_login(void){} @@ -8,7 +8,7 @@ PHP_IMAP_EXPORT void mm_diskerror(void){} PHP_IMAP_EXPORT void mm_status(void){} PHP_IMAP_EXPORT void mm_lsub(void){} -@@ -44164,6 +44165,7 @@ +@@ -43770,6 +43771,7 @@ PHP_IMAP_EXPORT void mm_nocritical(void){} PHP_IMAP_EXPORT void mm_notify(void){} PHP_IMAP_EXPORT void mm_login(void){} @@ -16,8 +16,8 @@ PHP_IMAP_EXPORT void mm_diskerror(void){} PHP_IMAP_EXPORT void mm_status(void){} PHP_IMAP_EXPORT void mm_lsub(void){} ---- ./ext/imap/config.m4.orig 2023-04-11 11:16:23.000000000 -0500 -+++ ./ext/imap/config.m4 2023-04-13 12:51:51.222777960 -0500 +--- ./ext/imap/config.m4.orig 2024-03-12 18:42:26.000000000 -0500 ++++ ./ext/imap/config.m4 2024-03-15 13:21:36.270772814 -0500 @@ -46,6 +46,7 @@ PHP_IMAP_EXPORT void mm_nocritical(void){} PHP_IMAP_EXPORT void mm_notify(void){} @@ -34,9 +34,9 @@ PHP_IMAP_EXPORT void mm_diskerror(void){} PHP_IMAP_EXPORT void mm_status(void){} PHP_IMAP_EXPORT void mm_lsub(void){} ---- ./ext/imap/php_imap.c.orig 2023-04-11 11:16:23.000000000 -0500 -+++ ./ext/imap/php_imap.c 2023-04-13 12:51:51.222777960 -0500 -@@ -4502,7 +4502,7 @@ +--- ./ext/imap/php_imap.c.orig 2024-03-12 18:42:26.000000000 -0500 ++++ ./ext/imap/php_imap.c 2024-03-15 13:21:36.271772814 -0500 +@@ -4778,7 +4778,7 @@ php debugger? */ } @@ -45,7 +45,7 @@ { if (*mb->user) { -@@ -4510,7 +4510,13 @@ +@@ -4786,7 +4786,13 @@ } else { strlcpy (user, IMAPG(imap_user), MAILTMPLEN); } diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index 35711a01a..902c1de66 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=proftpd VERSION=1.3.8b DIRVER=1.3.8b -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl" +PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl:mod_ldap" # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |