aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorltlnx <ltlnx@disroot.org>2024-04-15 10:07:11 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-04-15 10:07:57 +0700
commit8e473367359bdb46f4c145184191ca8e1938e4ad (patch)
treedba28394945aacbecac531a30ca5ffe8efda9eac /misc
parent6ff29be62820306a5fa5a425a0d1a514208e2106 (diff)
misc/fcitx5-qt: Patch out qt6 dependency.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/fcitx5-qt/README23
-rw-r--r--misc/fcitx5-qt/fcitx5-qt.SlackBuild6
-rw-r--r--misc/fcitx5-qt/fcitx5-qt.info2
3 files changed, 22 insertions, 9 deletions
diff --git a/misc/fcitx5-qt/README b/misc/fcitx5-qt/README
index 3dfcdbe7761a7..2f83854aeae5e 100644
--- a/misc/fcitx5-qt/README
+++ b/misc/fcitx5-qt/README
@@ -1,5 +1,7 @@
-fcitx5-qt is the Qt im-module for fcitx5 and it's needed to use fcitx5
-with Qt-based applications. It currently supports Qt4, Qt5 and Qt6.
+fcitx5-qt is the Qt im-module for fcitx5 and it needs to be installed
+in order to use fcitx5 with Qt-based applications. It currently
+supports Qt4, Qt5 and Qt6.
+
You'll need several Qt modules if you're going to enable Qt5/Qt6
support, namely QtCore, QtDbus, QtWidgets and QtX11Extras. Qt5 is
bundled in Slackware, however if you want Qt6 support you're on your
@@ -7,8 +9,17 @@ own; but any app that requires Qt6 on SBo at this point should have
already pulled all the dependencies in.
Relevant CMake options are ENABLE_QT4, ENABLE_QT5 and ENABLE_QT6.
-Both ENABLE_QT4 and ENABLE_QT5 are turned on by default, and ENABLE_QT6
-is turned off by default; however Slackware has dropped Qt4 in Slackware
-15, so ENABLE_QT4 is turned off in the SlackBuild. You might want to
-turn on/off the flag depending on the Qt version you are using.
+ENABLE_QT4 is turned off by default, ENABLE_QT5 and ENABLE_QT6 are
+turned on by default. However to avoid pulling in excess dependencies,
+Qt6 support is turned off in the SlackBuild. If you need Qt4 or Qt6
+support, you might want to turn the flags on/off depending on the Qt
+version you are using. To enable Qt4, you need to modify
+
+ -DENABLE_QT4=Off \
+
+from "Off" to "On". Similarly, to turn on Qt6 support, turn
+
+ -DENABLE_QT6=Off \
+ -DENABLE_QT6_WAYLAND_WORKAROUND=Off ..
+from "Off" to "On".
diff --git a/misc/fcitx5-qt/fcitx5-qt.SlackBuild b/misc/fcitx5-qt/fcitx5-qt.SlackBuild
index f94a3a23de08d..d60735c8c436e 100644
--- a/misc/fcitx5-qt/fcitx5-qt.SlackBuild
+++ b/misc/fcitx5-qt/fcitx5-qt.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fcitx5-qt
VERSION=${VERSION:-5.1.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -81,7 +81,9 @@ cd build
-DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
- -DENABLE_QT4=Off ..
+ -DENABLE_QT4=Off \
+ -DENABLE_QT6=Off \
+ -DENABLE_QT6_WAYLAND_WORKAROUND=Off ..
make
make install/strip DESTDIR=$PKG
cd ..
diff --git a/misc/fcitx5-qt/fcitx5-qt.info b/misc/fcitx5-qt/fcitx5-qt.info
index 712526b3cb9f7..750d7f18ab645 100644
--- a/misc/fcitx5-qt/fcitx5-qt.info
+++ b/misc/fcitx5-qt/fcitx5-qt.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-5.1.5.tar.xz"
MD5SUM="91d1b828b5263843117c3d8a2c0fb1d0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="fcitx5 qt6"
+REQUIRES="fcitx5"
MAINTAINER="ltlnx"
EMAIL="ltlnx@disroot.org"