From 5877fbd8be42dffc12c406ca5dcf6b6f5660cb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 6 Jul 2022 22:46:10 +0700 Subject: [PATCH] libfcitx-qt5: update to 1.2.7. --- srcpkgs/libfcitx-qt-common | 1 + srcpkgs/libfcitx-qt5/template | 29 ++++++++++++++++++++++------- srcpkgs/libfcitx-qt6 | 1 + 3 files changed, 24 insertions(+), 7 deletions(-) create mode 120000 srcpkgs/libfcitx-qt-common create mode 120000 srcpkgs/libfcitx-qt6 diff --git a/srcpkgs/libfcitx-qt-common b/srcpkgs/libfcitx-qt-common new file mode 120000 index 000000000000..208964ab6ce3 --- /dev/null +++ b/srcpkgs/libfcitx-qt-common @@ -0,0 +1 @@ +libfcitx-qt5 \ No newline at end of file diff --git a/srcpkgs/libfcitx-qt5/template b/srcpkgs/libfcitx-qt5/template index c519a3b617bc..5cfb765bdcfd 100644 --- a/srcpkgs/libfcitx-qt5/template +++ b/srcpkgs/libfcitx-qt5/template @@ -1,29 +1,44 @@ # Template file for 'libfcitx-qt5' pkgname=libfcitx-qt5 -version=1.2.5 +version=1.2.7 revision=1 wrksrc="fcitx-qt5-${version}" build_style=cmake +configure_args="-DENABLE_QT6=ON" hostmakedepends="extra-cmake-modules pkg-config qt5-qmake - qt5-host-tools libfcitx" -makedepends="fcitx-devel libxkbcommon-devel qt5-devel" + qt5-host-tools libfcitx qt6-base-devel" +makedepends="fcitx-devel libxkbcommon-devel qt5-devel qt6-base-devel" +depends="libfcitx-qt-common>=${version}" short_desc="Flexible Context-aware Input Tool with eXtension - Qt5 IM module" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/" distfiles="http://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-${version}.tar.xz" -checksum=e5c3ccdf406c19bde48ab5f59ac208967c3ca4f520626cdb66baf63f6160d946 +checksum=951fcf8f1db23ed22ad91094eb4c6c906f92005a3643b52f666bd8a331163147 -post_install() { - vlicense COPYING.BSD +libfcitx-qt-common_package() { + short_desc+="${short_desc% Qt5*} Qt common files" + pkg_install() { + vmove usr/share + vlicense COPYING.BSD + } } libfcitx-qt5-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision} ${makedepends}" + depends="${sourcepkg}>=${version}_${revision} + libxkbcommon-devel qt5-devel" pkg_install() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/cmake } } + +libfcitx-qt6_package() { + short_desc="${short_desc/Qt5/Qt6}" + depends="libfcitx-qt-common>=${version}" + pkg_install() { + vmove usr/lib/qt6 + } +} diff --git a/srcpkgs/libfcitx-qt6 b/srcpkgs/libfcitx-qt6 new file mode 120000 index 000000000000..208964ab6ce3 --- /dev/null +++ b/srcpkgs/libfcitx-qt6 @@ -0,0 +1 @@ +libfcitx-qt5 \ No newline at end of file