diff --git a/srcpkgs/libfcitx-qt-common b/srcpkgs/libfcitx-qt-common deleted file mode 120000 index 208964ab6ce..00000000000 --- a/srcpkgs/libfcitx-qt-common +++ /dev/null @@ -1 +0,0 @@ -libfcitx-qt5 \ No newline at end of file diff --git a/srcpkgs/libfcitx-qt5/template b/srcpkgs/libfcitx-qt5/template index 8ca7898496a..f5186aafd7d 100644 --- a/srcpkgs/libfcitx-qt5/template +++ b/srcpkgs/libfcitx-qt5/template @@ -1,45 +1,30 @@ # Template file for 'libfcitx-qt5' pkgname=libfcitx-qt5 -version=1.2.7 -revision=1 +reverts="1.2.7_1" +version=1.2.5 +revision=2 wrksrc="fcitx-qt5-${version}" build_style=cmake -build_helper=qemu -configure_args="-DENABLE_QT6=ON" hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools libfcitx" -makedepends="fcitx-devel libxkbcommon-devel qt5-devel qt6-base-devel" -depends="libfcitx-qt-common>=${version}" +makedepends="fcitx-devel libxkbcommon-devel qt5-devel" 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=951fcf8f1db23ed22ad91094eb4c6c906f92005a3643b52f666bd8a331163147 +checksum=e5c3ccdf406c19bde48ab5f59ac208967c3ca4f520626cdb66baf63f6160d946 -libfcitx-qt-common_package() { - short_desc+="${short_desc% Qt5*} Qt common files" - pkg_install() { - vmove usr/share - vlicense COPYING.BSD - } +post_install() { + vlicense COPYING.BSD } libfcitx-qt5-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} - libxkbcommon-devel qt5-devel" + depends="${sourcepkg}-${version}_${revision} ${makedepends}" 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 deleted file mode 120000 index 208964ab6ce..00000000000 --- a/srcpkgs/libfcitx-qt6 +++ /dev/null @@ -1 +0,0 @@ -libfcitx-qt5 \ No newline at end of file