diff options
Diffstat (limited to 'source/kde')
| -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 |
6 files changed, 24 insertions, 3 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 |