From ee8a51cfe047f2edc86da6e276473c6d7d2d08eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 7 May 2021 07:52:40 +0700
Subject: [PATCH] fcitx5-qt: enable fcitx5-qt6

---
 srcpkgs/fcitx5-qt/template  | 66 +++++++++++++++++++++++++++++++++++++
 srcpkgs/fcitx5-qt5          |  1 +
 srcpkgs/fcitx5-qt5-devel    |  2 +-
 srcpkgs/fcitx5-qt5/template | 33 -------------------
 srcpkgs/fcitx5-qt5/update   |  1 -
 srcpkgs/fcitx5-qt6          |  1 +
 srcpkgs/fcitx5-qt6-devel    |  1 +
 7 files changed, 70 insertions(+), 35 deletions(-)
 create mode 100644 srcpkgs/fcitx5-qt/template
 create mode 120000 srcpkgs/fcitx5-qt5
 delete mode 100644 srcpkgs/fcitx5-qt5/template
 delete mode 100644 srcpkgs/fcitx5-qt5/update
 create mode 120000 srcpkgs/fcitx5-qt6
 create mode 120000 srcpkgs/fcitx5-qt6-devel

diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
new file mode 100644
index 000000000000..14693c45ae1c
--- /dev/null
+++ b/srcpkgs/fcitx5-qt/template
@@ -0,0 +1,66 @@
+# Template file for 'fcitx5-qt'
+pkgname=fcitx5-qt
+version=5.0.5
+revision=2
+wrksrc=fcitx5-qt-$version
+build_style=cmake
+configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules qt5-qmake qt5-host-tools qt6-base-devel"
+makedepends="libfcitx5-devel fmt-devel qt5-devel libxkbcommon-devel
+ qt6-base-devel"
+short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
+checksum=4b3b79abd2daae70255c098252e79928bb8d0ab966035b7e76378805b6cb5b6f
+lib32disabled=yes
+
+post_install() {
+	sed -e 's/<year.*owner>/2012-2021 CSSlayer <wengxt@gmail.com>/' \
+		LICENSES/BSD-3-Clause.txt >LICENSE
+	vlicense LICENSE
+}
+
+fcitx5-qt5_package() {
+	depends="fcitx5-qt-${version}_${revision}"
+	short_desc+="5"
+	lib32disabled=yes
+	pkg_install() {
+		vmove usr/lib/fcitx5/qt5
+		vmove usr/lib/qt5
+		vmove "usr/libexec/*-qt5-*"
+		vmove "usr/lib/*Qt5*.so.*"
+	}
+}
+
+fcitx5-qt5-devel_package() {
+	depends="fcitx5-qt5>=${version}_${revision} qt5-devel"
+	short_desc+="5 - development files"
+	pkg_install() {
+		vmove usr/include/Fcitx5Qt5
+		vmove "usr/lib/cmake/Fcitx5Qt5*"
+		vmove "usr/lib/*Qt5*.so"
+	}
+}
+
+fcitx5-qt6_package() {
+	depends="fcitx5-qt-${version}_${revision}"
+	short_desc+="6"
+	lib32disabled=yes
+	pkg_install() {
+		vmove usr/lib/qt6
+		vmove "usr/lib/*Qt6*.so.*"
+	}
+}
+
+fcitx5-qt6-devel_package() {
+	depends="fcitx5-qt6>=${version}_${revision} qt6-base-devel"
+	short_desc+="6 - development files"
+	pkg_install() {
+		vmove usr/include/Fcitx5Qt6
+		vmove "usr/lib/cmake/Fcitx5Qt6*"
+		vmove "usr/lib/*Qt6*.so"
+	}
+}
diff --git a/srcpkgs/fcitx5-qt5 b/srcpkgs/fcitx5-qt5
new file mode 120000
index 000000000000..36e8c54babb2
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5
@@ -0,0 +1 @@
+fcitx5-qt
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-qt5-devel b/srcpkgs/fcitx5-qt5-devel
index b06bf33725d5..36e8c54babb2 120000
--- a/srcpkgs/fcitx5-qt5-devel
+++ b/srcpkgs/fcitx5-qt5-devel
@@ -1 +1 @@
-fcitx5-qt5
\ No newline at end of file
+fcitx5-qt
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-qt5/template b/srcpkgs/fcitx5-qt5/template
deleted file mode 100644
index ced97810285e..000000000000
--- a/srcpkgs/fcitx5-qt5/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'fcitx5-qt5'
-pkgname=fcitx5-qt5
-version=5.0.5
-revision=1
-wrksrc=fcitx5-qt-$version
-build_style=cmake
-configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=OFF"
-hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
- extra-cmake-modules qt5-qmake qt5-host-tools"
-makedepends="libfcitx5-devel fmt-devel qt5-devel libxkbcommon-devel"
-short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt5"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="LGPL-2.1-or-later, BSD-3-Clause"
-homepage="https://fcitx-im.org/wiki/Fcitx"
-distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
-checksum=4b3b79abd2daae70255c098252e79928bb8d0ab966035b7e76378805b6cb5b6f
-lib32disabled=yes
-
-post_install() {
-	sed -e 's/<year.*owner>/2012-2021 CSSlayer <wengxt@gmail.com>/' \
-		LICENSES/BSD-3-Clause.txt >LICENSE
-	vlicense LICENSE
-}
-
-fcitx5-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} qt5-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/fcitx5-qt5/update b/srcpkgs/fcitx5-qt5/update
deleted file mode 100644
index 92b65ebc90e4..000000000000
--- a/srcpkgs/fcitx5-qt5/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=fcitx5-qt
diff --git a/srcpkgs/fcitx5-qt6 b/srcpkgs/fcitx5-qt6
new file mode 120000
index 000000000000..36e8c54babb2
--- /dev/null
+++ b/srcpkgs/fcitx5-qt6
@@ -0,0 +1 @@
+fcitx5-qt
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-qt6-devel b/srcpkgs/fcitx5-qt6-devel
new file mode 120000
index 000000000000..36e8c54babb2
--- /dev/null
+++ b/srcpkgs/fcitx5-qt6-devel
@@ -0,0 +1 @@
+fcitx5-qt
\ No newline at end of file