diff options
Diffstat (limited to 'source/kde')
63 files changed, 132 insertions, 802 deletions
diff --git a/source/kde/kde/build/baloo b/source/kde/kde/build/baloo index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/baloo +++ b/source/kde/kde/build/baloo @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kdepim-addons b/source/kde/kde/build/kdepim-addons index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kdepim-addons +++ b/source/kde/kde/build/kdepim-addons @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kdiagram b/source/kde/kde/build/kdiagram index b8626c4cf..7ed6ff82d 100644 --- a/source/kde/kde/build/kdiagram +++ b/source/kde/kde/build/kdiagram @@ -1 +1 @@ -4 +5 diff --git a/source/kde/kde/build/kid3 b/source/kde/kde/build/kid3 index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kid3 +++ b/source/kde/kde/build/kid3 @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kross-interpreters b/source/kde/kde/build/kross-interpreters index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kross-interpreters +++ b/source/kde/kde/build/kross-interpreters @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kservice +++ b/source/kde/kde/build/kservice @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/marble b/source/kde/kde/build/marble index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/marble +++ b/source/kde/kde/build/marble @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/plasma-browser-integration b/source/kde/kde/build/plasma-browser-integration index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/plasma-browser-integration +++ b/source/kde/kde/build/plasma-browser-integration @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/prison b/source/kde/kde/build/prison index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/prison +++ b/source/kde/kde/build/prison @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/pulseaudio-qt b/source/kde/kde/build/pulseaudio-qt index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/pulseaudio-qt +++ b/source/kde/kde/build/pulseaudio-qt @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/solid b/source/kde/kde/build/solid index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/solid +++ b/source/kde/kde/build/solid @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/umbrello b/source/kde/kde/build/umbrello index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/umbrello +++ b/source/kde/kde/build/umbrello @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/cmake/analitza b/source/kde/kde/cmake/analitza deleted file mode 100644 index 813eb59ee..000000000 --- a/source/kde/kde/cmake/analitza +++ /dev/null @@ -1,24 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-ltermcap" \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="-ltermcap" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - .. - diff --git a/source/kde/kde/cmake/baloo b/source/kde/kde/cmake/baloo deleted file mode 100644 index b8f0cd654..000000000 --- a/source/kde/kde/cmake/baloo +++ /dev/null @@ -1,23 +0,0 @@ -# Change "-DKDEPIM_SUPPORT_BUILD=FALSE" to "-DKDEPIM_SUPPORT_BUILD=TRUE" -# if we have a kdepimlibs-framework package. - -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DBUILD_TESTING=OFF \ - -DKDEPIM_SUPPORT_BUILD=FALSE \ - .. - diff --git a/source/kde/kde/cmake/calligra b/source/kde/kde/cmake/calligra index 64b6f9ddd..e680ddd8d 100644 --- a/source/kde/kde/cmake/calligra +++ b/source/kde/kde/cmake/calligra @@ -3,17 +3,22 @@ cd cmake-build cmake \ $KDE_OPT_ARGS \ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -Wno-deprecated -Wno-deprecated-declarations" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DIHAVEPATCHEDQT:BOOL=ON \ - -DOPENJPEG_INCLUDE_DIR=/usr/include/openmj2-2.1 \ - -DOPENJPEG_NAMES=openmj2 \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -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 \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DCMAKE_CXX_STANDARD=17 \ .. diff --git a/source/kde/kde/cmake/cmake b/source/kde/kde/cmake/cmake index 24f8ebdaa..fc42943c0 100644 --- a/source/kde/kde/cmake/cmake +++ b/source/kde/kde/cmake/cmake @@ -18,5 +18,6 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ .. diff --git a/source/kde/kde/cmake/digikam b/source/kde/kde/cmake/digikam index b67ce275b..0f1d5ce33 100644 --- a/source/kde/kde/cmake/digikam +++ b/source/kde/kde/cmake/digikam @@ -1,16 +1,12 @@ -# https://bugs.kde.org/show_bug.cgi?id=377597 : -# Don't try to compile documentation translations for the moment. -# Only the English handbook compiles fine. -# Use cmake option "-DDIGIKAMSC_COMPILE_DOC=OFF" - mkdir cmake-build cd cmake-build cmake \ $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ @@ -22,13 +18,14 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - -DENABLE_AKONADICONTACTSUPPORT=ON \ - -DENABLE_APPSTYLES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DENABLE_KFILEMETADATASUPPORT=ON \ -DENABLE_MEDIAPLAYER=ON \ + -DENABLE_AKONADICONTACTSUPPORT=ON \ -DENABLE_MYSQLSUPPORT=ON \ - -DENABLE_OPENCV3=ON \ + -DENABLE_APPSTYLES=ON \ -DENABLE_QWEBENGINE=ON \ - -DOpenGL_GL_PREFERENCE=GLVND \ + -DSSE4_1_FOUND=OFF \ + -DSSE4_2_FOUND=OFF \ .. diff --git a/source/kde/kde/cmake/drkonqi b/source/kde/kde/cmake/drkonqi index 796c383ba..27cd8fc15 100644 --- a/source/kde/kde/cmake/drkonqi +++ b/source/kde/kde/cmake/drkonqi @@ -18,6 +18,7 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - -DWITH_SENTRY=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DWITH_GDB12=ON \ .. diff --git a/source/kde/kde/cmake/frameworkintegration b/source/kde/kde/cmake/frameworkintegration deleted file mode 100644 index 2ecffacee..000000000 --- a/source/kde/kde/cmake/frameworkintegration +++ /dev/null @@ -1,26 +0,0 @@ -# Workaround a bug in Qt 5.5.0 which makes OwnCloud crash when interacting -# with the systray menu (and possibly other applications too) -# by adding "-fno-strict-aliasing" to CFLAGS and CXXFLAGS -# See also http://bugzilla.redhat.com/1255902 -# and https://bugreports.qt.io/browse/QTBUG-47863 -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fno-strict-aliasing" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -fno-strict-aliasing" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fno-strict-aliasing" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -fno-strict-aliasing" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \ - .. - diff --git a/source/kde/kde/cmake/frameworks b/source/kde/kde/cmake/frameworks deleted file mode 100644 index 42e3bee31..000000000 --- a/source/kde/kde/cmake/frameworks +++ /dev/null @@ -1,21 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \ - .. - diff --git a/source/kde/kde/cmake/gwenview b/source/kde/kde/cmake/gwenview index 21da6c344..baf19ddba 100644 --- a/source/kde/kde/cmake/gwenview +++ b/source/kde/kde/cmake/gwenview @@ -18,6 +18,7 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DGWENVIEW_SEMANTICINFO_BACKEND="Baloo" \ .. diff --git a/source/kde/kde/cmake/k3b b/source/kde/kde/cmake/k3b deleted file mode 100644 index e0316f144..000000000 --- a/source/kde/kde/cmake/k3b +++ /dev/null @@ -1,21 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DBUILD_TESTING:BOOL=OFF \ - -DK3B_ENABLE_HAL_SUPPORT:BOOL=OFF \ - -DK3B_ENABLE_PERMISSION_HELPER:BOOL=ON \ - .. - diff --git a/source/kde/kde/cmake/kajongg b/source/kde/kde/cmake/kajongg deleted file mode 100644 index 0096aeffe..000000000 --- a/source/kde/kde/cmake/kajongg +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DINSTALL_KAJONGG=TRUE \ - .. - diff --git a/source/kde/kde/cmake/kcoreaddons b/source/kde/kde/cmake/kcoreaddons deleted file mode 100644 index 5945bbe36..000000000 --- a/source/kde/kde/cmake/kcoreaddons +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF \ - -DCMAKE_DISABLE_FIND_PACKAGE_FAM=ON \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - .. - diff --git a/source/kde/kde/cmake/kde4 b/source/kde/kde/cmake/kde4 deleted file mode 100644 index ad12a3115..000000000 --- a/source/kde/kde/cmake/kde4 +++ /dev/null @@ -1,19 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE4_ENABLE_FINAL="ON" \ - -DKDE4_BUILD_TESTS=OFF \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ - .. - diff --git a/source/kde/kde/cmake/kdevelop b/source/kde/kde/cmake/kdevelop index 0ef680aa1..814d1d95d 100644 --- a/source/kde/kde/cmake/kdevelop +++ b/source/kde/kde/cmake/kdevelop @@ -1,9 +1,3 @@ -# The -DCLANG_BUILTIN_DIR below is there because with our llvm-16.0.0 the -# cmake script to find the clang builtin includes directory doesn't seem -# to be working. In previous versions of LLVM the number in the path was -# the full version number (i.e. 16.0.0), but now it's just 16. Perhaps -# future versions of kdevelop will locate this properly, so test periodically -# to see if that's the case. mkdir cmake-build cd cmake-build cmake \ @@ -24,5 +18,7 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DCLANG_BUILTIN_DIR=$(/bin/ls -d /usr/lib$LIBDIRSUFFIX/clang/*/include) \ .. + diff --git a/source/kde/kde/cmake/kget b/source/kde/kde/cmake/kget deleted file mode 100644 index b4fcd7d91..000000000 --- a/source/kde/kde/cmake/kget +++ /dev/null @@ -1,22 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ - -DKDE4_BUILD_TESTS=OFF \ - -DWITH_NepomukCore=OFF \ - -DWITH_NepomukWidgets=OFF \ - -DWITH_KDE4Workspace=OFF \ - -DWITH_QGpgme=OFF \ - .. - diff --git a/source/kde/kde/cmake/kid3 b/source/kde/kde/cmake/kid3 index f893d9113..f3f692704 100644 --- a/source/kde/kde/cmake/kid3 +++ b/source/kde/kde/cmake/kid3 @@ -2,21 +2,29 @@ mkdir cmake-build cd cmake-build cmake \ $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DWITH_APPS="Qt;CLI;KDE" \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DWITH_APPS="CLI;Qt;KDE" \ -DWITH_CHROMAPRINT=OFF \ - -DWITH_DOCDIR=share/kid3/doc \ -DWITH_FFMPEG=ON \ - -DWITH_GSTREAMER_VERSION="1.0" \ + -DWITH_GSTREAMER=ON \ -DWITH_LIBDIR=lib$LIBDIRSUFFIX \ -DWITH_MANDIR=man \ - -DWITH_NO_MANCOMPRESS=ON \ + -DWITH_DOCDIR=share/kid3/doc \ .. diff --git a/source/kde/kde/cmake/kjots b/source/kde/kde/cmake/kjots deleted file mode 100644 index 51d009518..000000000 --- a/source/kde/kde/cmake/kjots +++ /dev/null @@ -1,22 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="-I/usr/include/KF5/KTextWidgets $SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="-I/usr/include/KF5/KTextWidgets $SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="-I/usr/include/KF5/KTextWidgets $SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="-I/usr/include/KF5/KTextWidgets $SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - .. - diff --git a/source/kde/kde/cmake/kmymoney b/source/kde/kde/cmake/kmymoney index bdf057699..e46065418 100644 --- a/source/kde/kde/cmake/kmymoney +++ b/source/kde/kde/cmake/kmymoney @@ -18,6 +18,7 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DENABLE_WEBENGINE=ON \ .. diff --git a/source/kde/kde/cmake/kopete b/source/kde/kde/cmake/kopete deleted file mode 100644 index c02a99537..000000000 --- a/source/kde/kde/cmake/kopete +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DWITH_wlm:BOOL=OFF \ - .. - diff --git a/source/kde/kde/cmake/kpat b/source/kde/kde/cmake/kpat index a7d40d83a..2798035e0 100644 --- a/source/kde/kde/cmake/kpat +++ b/source/kde/kde/cmake/kpat @@ -17,7 +17,8 @@ cd cmake-build -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ - -DWITH_BH_SOLVER=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DWITH_BH_SOLVER=OFF \ .. diff --git a/source/kde/kde/cmake/kpmcore b/source/kde/kde/cmake/kpmcore deleted file mode 100644 index a6e4ca2ee..000000000 --- a/source/kde/kde/cmake/kpmcore +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DENABLE_UDISKS2=ON \ - .. - diff --git a/source/kde/kde/cmake/krdc b/source/kde/kde/cmake/krdc deleted file mode 100644 index 578d053cd..000000000 --- a/source/kde/kde/cmake/krdc +++ /dev/null @@ -1,37 +0,0 @@ -# Since xfreerdp is a runtime dependency, krdc should not be looking for it -# and disabling support for RDP if the binary is not found at compile-time... -if which xfreerdp 1>/dev/null 2>&1 ; then - AB_REMOVE_KLUDGE=0 -else - AB_REMOVE_KLUDGE=1 - touch /usr/local/bin/xfreerdp - chmod 755 /usr/local/bin/xfreerdp -fi - -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - .. - -# Cleanup: -if [ $AB_REMOVE_KLUDGE -eq 1 ]; then - rm -f /usr/local/bin/xfreerdp -fi -unset AB_REMOVE_KLUDGE diff --git a/source/kde/kde/cmake/krita b/source/kde/kde/cmake/krita index 777cf7ec2..93664d940 100644 --- a/source/kde/kde/cmake/krita +++ b/source/kde/kde/cmake/krita @@ -17,9 +17,8 @@ cd cmake-build -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ - -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - -DPACKAGERS_BUILD=ON \ - -DUSE_QT_XCB=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON \ .. diff --git a/source/kde/kde/cmake/kross-interpreters b/source/kde/kde/cmake/kross-interpreters deleted file mode 100644 index b86b4e157..000000000 --- a/source/kde/kde/cmake/kross-interpreters +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DBUILD_ruby:BOOL=OFF \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - .. - diff --git a/source/kde/kde/cmake/krusader b/source/kde/kde/cmake/krusader deleted file mode 100644 index 79cf993bf..000000000 --- a/source/kde/kde/cmake/krusader +++ /dev/null @@ -1,22 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DKDESU_PATH=/usr/lib${LIBDIRSUFFIX}/libexec/kf5/kdesu \ - .. diff --git a/source/kde/kde/cmake/kscreenlocker b/source/kde/kde/cmake/kscreenlocker deleted file mode 100644 index 6e4e4a69a..000000000 --- a/source/kde/kde/cmake/kscreenlocker +++ /dev/null @@ -1,28 +0,0 @@ -if [ "$SLACKPAM" == "no" ]; then - DO_SLACKPAM="-DHAVE_SHADOW=TRUE -DPAM_REQUIRED=OFF" -else - DO_SLACKPAM="" -fi - -mkdir cmake-build -cd cmake-build - cmake \ - $DO_SLACKPAM \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - .. - diff --git a/source/kde/kde/cmake/kservice b/source/kde/kde/cmake/kservice deleted file mode 100644 index e6a6c5e32..000000000 --- a/source/kde/kde/cmake/kservice +++ /dev/null @@ -1,26 +0,0 @@ -# -# Need to append "-std=c99" to the # CMAKE_C_FLAGS, because of a bug in -# flex-2.6.0 which generates a C code # with C++-style comments. -# The bug has been fixed in flex 2.6.1 which is not part of Slackware. -# -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -std=c99" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c99" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DAPPLICATIONS_MENU_NAME="kf5-applications.menu" \ - .. - diff --git a/source/kde/kde/cmake/kwallet-pam b/source/kde/kde/cmake/kwallet-pam index f43485e31..321fca3cb 100644 --- a/source/kde/kde/cmake/kwallet-pam +++ b/source/kde/kde/cmake/kwallet-pam @@ -1,20 +1,23 @@ mkdir cmake-build cd cmake-build cmake \ + $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DCMAKE_INSTALL_PREFIX=/ \ - -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DKDE_INSTALL_MANDIR=/usr/man \ - -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -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 \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DCMAKE_INSTALL_PREFIX=/ \ .. diff --git a/source/kde/kde/cmake/kwave b/source/kde/kde/cmake/kwave deleted file mode 100644 index 62ab843f5..000000000 --- a/source/kde/kde/cmake/kwave +++ /dev/null @@ -1,24 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DWITH_MP3=ON \ - -DWITH_OGG_OPUS=OFF \ - .. - diff --git a/source/kde/kde/cmake/kwin b/source/kde/kde/cmake/kwin deleted file mode 100644 index 586ac6e2c..000000000 --- a/source/kde/kde/cmake/kwin +++ /dev/null @@ -1,28 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DKDE_INSTALL_MANDIR=/usr/man \ - -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF \ - -DHAVE_SHADOW=TRUE \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - .. - -# Nasty hack to fix something I could not fix in Qt5 package... -# 9729: /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory -# 9733: make[2]: *** [plugins/qpa/CMakeFiles/KWinQpaPlugin.dir/build.make:63: plugins/qpa/CMakeFiles/KWinQpaPlugin.dir/KWinQpaPlugin_autogen/mocs_compilation.cpp.o] Error 1 -sed -i ./plugins/qpa/CMakeFiles/KWinQpaPlugin.dir/flags.make \ - -e "s/isystem/I/g" diff --git a/source/kde/kde/cmake/marble b/source/kde/kde/cmake/marble index 1e6c6e64a..9fc7c82d3 100644 --- a/source/kde/kde/cmake/marble +++ b/source/kde/kde/cmake/marble @@ -1,7 +1,6 @@ -function marble_configure() -{ +mkdir cmake-build +cd cmake-build cmake \ - $* \ $KDE_OPT_ARGS \ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -11,43 +10,20 @@ function marble_configure() -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DBUILD_TESTING=OFF \ - .. -} - -# Configure the Qt5 support first: -mkdir cmake-build_qt5 -cd cmake-build_qt5 -marble_configure \ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DBUILD_TESTING=OFF \ + -DBUILD_TOUCH=ON \ + -DBUILD_MARBLE_EXAMPLES=OFF \ + -DBUILD_MARBLE_TESTS=OFF \ + -DMOBILE=OFF \ + .. -# -#cd - -# -## Add Qt4 support (needed by libkgeomap): -#mkdir cmake-build_qt4 -#cd cmake-build_qt4 -#QT5DIR="" \ -#QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ -#marble_configure \ -# -DQT_MOC_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/moc \ -# -DQT_QMAKE_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/qmake \ -# -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt/plugins \ -# -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt/plugins \ -# -DMARBLE_PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/marble4/plugins \ -# -DQT5BUILD=OFF \ -# -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON \ -# -DCMAKE_DISABLE_FIND_PACKAGE_KF5=ON \ -# -DBUILD_MARBLE_TESTS=OFF \ -# -DBUILD_MARBLE_APPS=OFF -# -## make can pick up from here, and first build the Qt4, then Qt5 stuff. -# diff --git a/source/kde/kde/cmake/messagelib b/source/kde/kde/cmake/messagelib deleted file mode 100644 index b66be20e3..000000000 --- a/source/kde/kde/cmake/messagelib +++ /dev/null @@ -1,22 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - .. - diff --git a/source/kde/kde/cmake/okular b/source/kde/kde/cmake/okular index 09b776662..deab6601e 100644 --- a/source/kde/kde/cmake/okular +++ b/source/kde/kde/cmake/okular @@ -18,6 +18,7 @@ cd cmake-build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DFORCE_NOT_REQUIRED_DEPENDENCIES=Discount \ .. diff --git a/source/kde/kde/cmake/partitionmanager b/source/kde/kde/cmake/partitionmanager deleted file mode 100644 index a6e4ca2ee..000000000 --- a/source/kde/kde/cmake/partitionmanager +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DENABLE_UDISKS2=ON \ - .. - diff --git a/source/kde/kde/cmake/plasma b/source/kde/kde/cmake/plasma deleted file mode 100644 index 330332ddd..000000000 --- a/source/kde/kde/cmake/plasma +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DKDE_INSTALL_MANDIR=/usr/man \ - -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF \ - -DHAVE_SHADOW=TRUE \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - .. - diff --git a/source/kde/kde/cmake/plasma-browser-integration b/source/kde/kde/cmake/plasma-browser-integration index e54868b8b..5ebecdb2e 100644 --- a/source/kde/kde/cmake/plasma-browser-integration +++ b/source/kde/kde/cmake/plasma-browser-integration @@ -9,15 +9,16 @@ cd cmake-build -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DKDE_INSTALL_MANDIR=/usr/man \ - -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -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 \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DINSTALL_CHROME_MANIFEST=ON \ .. diff --git a/source/kde/kde/cmake/sddm b/source/kde/kde/cmake/sddm index 8add3a98b..11b81a199 100644 --- a/source/kde/kde/cmake/sddm +++ b/source/kde/kde/cmake/sddm @@ -1,23 +1,6 @@ -if [ "$SLACKPAM" == "no" ]; then - DO_SLACKPAM="-DENABLE_PAM:BOOL=OFF" -else - DO_SLACKPAM="-DENABLE_PAM:BOOL=ON" -fi - -if [ "$SLKELOGIND" == "no" ]; then - DO_SLKELOGIND="" -else - DO_SLKELOGIND=" \ - -DNO_SYSTEMD:BOOL=TRUE \ - -DUSE_ELOGIND:BOOL=TRUE \ - " -fi - mkdir -p cmake-build cd cmake-build cmake \ - $DO_SLACKPAM \ - $DO_SLKELOGIND \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ @@ -28,8 +11,10 @@ cd cmake-build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_MAN_PAGES:BOOL=TRUE \ -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" \ - -DUSE_QT4:BOOL=FALSE \ -DUSE_QT5:BOOL=TRUE \ -DENABLE_JOURNALD:BOOL=FALSE \ + -DENABLE_PAM:BOOL=ON \ + -DNO_SYSTEMD:BOOL=TRUE \ + -DUSE_ELOGIND:BOOL=TRUE \ .. diff --git a/source/kde/kde/cmake/sddm-kcm b/source/kde/kde/cmake/sddm-kcm index 1c7976d3a..3d8e2c35e 100644 --- a/source/kde/kde/cmake/sddm-kcm +++ b/source/kde/kde/cmake/sddm-kcm @@ -9,16 +9,16 @@ cd cmake-build -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DKDE_INSTALL_MANDIR=/usr/man \ - -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ - -DHAVE_SHADOW=TRUE \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DSDDM_CONFIG_DIR=/etc/sddm.conf.d \ -DSDDM_CONFIG_FILE=/etc/sddm.conf \ .. diff --git a/source/kde/kde/cmake/solid b/source/kde/kde/cmake/solid index 045eeac95..30d5b647e 100644 --- a/source/kde/kde/cmake/solid +++ b/source/kde/kde/cmake/solid @@ -1,16 +1,10 @@ -# -# Separate cmake file for solid is needed to append "-std=c99" to the -# CMAKE_C_FLAGS, because of a bug in flex-2.6.0 which generates a C code -# with C++-style comments. The bug has been fixed in flex 2.6.1 which -# is not yet a part of Slackware. -# mkdir cmake-build cd cmake-build cmake \ $KDE_OPT_ARGS \ -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -std=c99" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c99" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ @@ -19,9 +13,14 @@ cd cmake-build -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DWITH_NEW_POWER_ASYNC_API:BOOL=ON \ + -DWITH_NEW_POWER_ASYNC_FREEDESKTOP:BOOL=ON \ + -DWITH_NEW_SOLID_JOB:BOOL=ON \ .. diff --git a/source/kde/kde/cmake/step b/source/kde/kde/cmake/step deleted file mode 100644 index fc42943c0..000000000 --- a/source/kde/kde/cmake/step +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc/kde \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ - -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -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 \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - .. - diff --git a/source/kde/kde/cmake/applications b/source/kde/kde/cmake/umbrello index 87762b0ed..c8c3ba960 100644 --- a/source/kde/kde/cmake/applications +++ b/source/kde/kde/cmake/umbrello @@ -16,9 +16,10 @@ cd cmake-build -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_APIDOC=OFF \ -DBUILD_TESTING=OFF \ - -DBUILD_unittests=OFF \ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DBUILD_UNITTESTS=OFF \ + -DBUILD_KF5=ON \ + -DBUILD_APIDOC=OFF \ .. diff --git a/source/kde/kde/cmake/xdg-desktop-portal-kde b/source/kde/kde/cmake/xdg-desktop-portal-kde deleted file mode 100644 index 07c348b8e..000000000 --- a/source/kde/kde/cmake/xdg-desktop-portal-kde +++ /dev/null @@ -1,23 +0,0 @@ -mkdir cmake-build -cd cmake-build - cmake \ - $KDE_OPT_ARGS \ - -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ - -DKDE_INSTALL_MANDIR=/usr/man \ - -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ - -DKDE_INSTALL_SYSCONFDIR=/etc/kde \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF \ - -DENABLE_PIPEWIRE=OFF \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ - .. - diff --git a/source/kde/kde/doinst.sh/kinit b/source/kde/kde/doinst.sh/kinit index 71da4cc7e..8cb319d1f 100644 --- a/source/kde/kde/doinst.sh/kinit +++ b/source/kde/kde/doinst.sh/kinit @@ -1,4 +1,6 @@ # Run the 'setcap' command as standard Slackware packages do not store caps: -if [ -f usr/lib/kf5/start_kdeinit ]; then +if [ -f elif usr/lib/libexec/kf5/start_kdeinit ]; then + /sbin/setcap CAP_SYS_RESOURCE=+ep usr/lib/libexec/kf5/start_kdeinit +elif [ -f usr/lib/kf5/start_kdeinit ]; then /sbin/setcap CAP_SYS_RESOURCE=+ep usr/lib/kf5/start_kdeinit fi diff --git a/source/kde/kde/kde.options b/source/kde/kde/kde.options index 4435ead77..38d0a01f8 100644 --- a/source/kde/kde/kde.options +++ b/source/kde/kde/kde.options @@ -53,16 +53,7 @@ export NUMJOBS # Do not use "final build" unless we build an actual release. export KDE_OPT_ARGS=" -Wno-dev -DBUILD_TESTING=OFF -DSITE=\"slackware.com\" -DKDE_DISTRIBUTION_TEXT=\"volkerdi@slackware.com\" " -# Choose correct options depending on whether PAM is installed: -if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - SLACKPAM=${SLACKPAM:-"yes"} -else - SLACKPAM=${SLACKPAM:-"no"} -fi - -# Choose correct options depending on whether elogind is installed: -if [ -L /lib${LIBDIRSUFFIX}/libelogind.so.? ]; then - SLKELOGIND=${SLKELOGIND:-"yes"} -else - SLKELOGIND=${SLKELOGIND:-"no"} -fi +# These options are no longer honored by anything shipped in Slackware, but +# we'll keep setting them anyway for now: +SLACKPAM=${SLACKPAM:-"yes"} +SLKELOGIND=${SLKELOGIND:-"yes"} diff --git a/source/kde/kde/make/marble b/source/kde/kde/make/marble deleted file mode 100644 index 95ba2b1be..000000000 --- a/source/kde/kde/make/marble +++ /dev/null @@ -1,29 +0,0 @@ -# -## Marble's cmake left us in build_qt4, -## so we build and install Qt4 support first: -#make $NUMJOBS || make || exit 1 -#make install DESTDIR=$PKG || exit 1 -## Move the marble4 cmake file so that it will be found: -#mkdir -p $PKG/usr/share/apps/cmake/modules -#mv $PKG/usr/share/marble/cmake/FindMarble.cmake \ -# $PKG/usr/share/apps/cmake/modules/FindMarble.cmake -## Rename the marble4 include dir to avoid a conflict with marble: -#mv $PKG/usr/include/marble{,4} -## And fix that include path in the cmake file too: -#sed -i $PKG/usr/share/apps/cmake/modules/FindMarble.cmake \ -# -e 's,marble/MarbleModel.h,marble4/MarbleModel.h,' -# -## Go back to build_qt5 and build/install the Qt5 support: -#cd .. -## Fix installation of the designer plugins - only a problem for the Qt5 libs: -#sed -i CMakeLists.txt \ -# -e 's,LIB_SUFFIX}/plugins,LIB_SUFFIX}/qt5/plugins,g' -#cd build_qt5 -# - -# Fix installation of the designer plugins: -sed -i ../CMakeLists.txt \ - -e 's,LIB_SUFFIX}/plugins,LIB_SUFFIX}/qt5/plugins,g' -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications index 0fe766e0c..e5a85fd53 100644 --- a/source/kde/kde/modules/all-packaged-applications +++ b/source/kde/kde/modules/all-packaged-applications @@ -140,6 +140,7 @@ kblocks lskat kreversi bovo +#kajongg granatier kmines kiriki diff --git a/source/kde/kde/patch/digikam.patch b/source/kde/kde/patch/digikam.patch index 9251ba705..d49c194e9 100644 --- a/source/kde/kde/patch/digikam.patch +++ b/source/kde/kde/patch/digikam.patch @@ -1 +1 @@ -cat $CWD/patch/digikam/no_sse4.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/digikam/akonadi-22.04.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/digikam/akonadi-22.04.patch b/source/kde/kde/patch/digikam/akonadi-22.04.patch new file mode 100644 index 000000000..74ffe1674 --- /dev/null +++ b/source/kde/kde/patch/digikam/akonadi-22.04.patch @@ -0,0 +1,12 @@ +diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake +index 4cb33d2f9e..610033425c 100644 +--- a/core/cmake/rules/RulesKDEFramework.cmake ++++ b/core/cmake/rules/RulesKDEFramework.cmake +@@ -39,6 +39,7 @@ if(ENABLE_AKONADICONTACTSUPPORT) + + find_package(KF5 ${AKONADI_MIN_VERSION} QUIET + OPTIONAL_COMPONENTS ++ Akonadi + AkonadiContact # For KDE Mail Contacts support. + Contacts # API for contacts/address book data. + ) diff --git a/source/kde/kde/patch/digikam/no_sse4.patch b/source/kde/kde/patch/digikam/no_sse4.patch deleted file mode 100644 index dca3d3579..000000000 --- a/source/kde/kde/patch/digikam/no_sse4.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ./core/cmake/macros/MacroSSE.cmake.orig 2023-04-12 11:24:31.000000000 -0500 -+++ ./core/cmake/macros/MacroSSE.cmake 2023-04-15 14:08:38.586047012 -0500 -@@ -90,28 +90,12 @@ - string(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) - string(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) - -- if(SSE41_TRUE) -- -- set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") -- -- else() -- -- set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") -- -- endif() -+ set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") - - string(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) - string(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) - -- if(SSE42_TRUE) -- -- set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") -- -- else() -- -- set(SSE4_2_FOUND false CACHE BOOL "SSE4.2 available on host") -- -- endif() -+ set(SSE4_2_FOUND false CACHE BOOL "SSE4.2 available on host") - - elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - diff --git a/source/kde/kde/post-install/kscreenlocker.post-install b/source/kde/kde/post-install/kscreenlocker.post-install deleted file mode 100644 index 203cff041..000000000 --- a/source/kde/kde/post-install/kscreenlocker.post-install +++ /dev/null @@ -1,4 +0,0 @@ -if [ "$SLACKPAM" == "no" ]; then - # For shadow, this file needs to be setuid root: - chmod +s $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass -fi diff --git a/source/kde/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install index 8f3839ec2..633d16274 100644 --- a/source/kde/kde/post-install/plasma-workspace.post-install +++ b/source/kde/kde/post-install/plasma-workspace.post-install @@ -35,23 +35,9 @@ rmdir $PKG/usr/lib$LIBDIRSUFFIX/qt5/plugins/plugins mkdir -p $PKG/etc mv $PKG/etc/kde/dbus-1 $PKG/etc/ -if [ "$SLACKPAM" == "no" ]; then - # For shadow, this file needs to be setuid root just like the KDE4 version: - if [ -f $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass ]; then - chmod +s $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass - fi - - # ck-launch-session is needed for a Wayland session, since we do not have PAM: - sed -e 's/^Exec=dbus-launch/Exec=ck-launch-session dbus-launch --sh-syntax/' \ - -i $PKG/usr/share/wayland-sessions/plasmawayland.desktop -else - # Install a PAM file for Plasma5 workspace: - install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde.new -fi - -if [ "$SLKELOGIND" == "yes" ]; then - # Since elogind does not set DBUS_SESSION_BUS_ADDRESS we need to start - # Plasma X11 session through dbus-run-session like Wayland is launched: - sed -i $PKG/usr/share/xsessions/plasma.desktop \ - -e "s,^Exec=/,Exec=dbus-run-session /," -fi +# Install a PAM file for Plasma5 workspace: +install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde.new + +# Since elogind does not set DBUS_SESSION_BUS_ADDRESS we need to start +# Plasma X11 session through dbus-run-session like Wayland is launched: +sed -i $PKG/usr/share/xsessions/plasma.desktop -e "s,^Exec=/,Exec=dbus-run-session /," |