diff --git a/common/shlibs b/common/shlibs index 321498a4eac..d8f498c7c73 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2256,9 +2256,6 @@ libpgf.so.6 libpgf-6.14.12_1 libqhull_r.so.8.0 libqhull-2020.2_1 libqhull.so.8.0 libqhull-2020.2_1 libKF5NetworkManagerQt.so.6 networkmanager-qt5-5.26.0_1 -libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1 -libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 -libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 libFcitx5Utils.so.2 libfcitx5-5.0.5_1 libFcitx5Core.so.7 libfcitx5-5.0.5_1 libFcitx5Config.so.6 libfcitx5-5.0.5_1 diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template index d72f83f5ae5..5b31e4ec1c2 100644 --- a/srcpkgs/fcitx5-qt/template +++ b/srcpkgs/fcitx5-qt/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5-qt' pkgname=fcitx5-qt -version=5.1.8 -revision=2 +version=5.1.10 +revision=1 build_style=cmake configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DCMAKE_INSTALL_QT6PLUGINDIR=/usr/lib/qt6/plugins @@ -15,8 +15,9 @@ maintainer="Đoàn Trần Công Danh " 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.zst" -checksum=fe3445509df62ade8e50b8533cc2b3a759e31c47ecdb4e8bb338f2a633020376 +checksum=ae021852cc8b259a7007314f8a10b484a79ce7d8f99f18109591c9a6ad78076c lib32disabled=yes +replaces="libfcitx-qt-common>=0 libfcitx-qt5-devel>=0" post_patch() { sed -i ';' qt6/platforminputcontext/* @@ -34,10 +35,11 @@ post_install() { fcitx5-qt5_package() { depends="fcitx5-qt-${version}_${revision}" + provides="libfcitx-qt5-5_1" + replaces="libfcitx-qt5>=0" short_desc+="5" pkg_install() { vmove usr/bin/fcitx5-qt5-* - vmove usr/lib/fcitx5/qt5 vmove usr/lib/qt5 vmove "usr/libexec/*qt5-*" vmove "usr/lib/*Qt5*.so.*" @@ -57,6 +59,8 @@ fcitx5-qt5-devel_package() { fcitx5-qt6_package() { depends="fcitx5-qt-${version}_${revision}" + provides="libfcitx-qt6-5_1" + replaces="libfcitx-qt6>=0" short_desc+="6" pkg_install() { vmove usr/bin/fcitx5-qt6-* 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-devel b/srcpkgs/libfcitx-qt5-devel deleted file mode 120000 index 208964ab6ce..00000000000 --- a/srcpkgs/libfcitx-qt5-devel +++ /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 deleted file mode 100644 index db46c337de2..00000000000 --- a/srcpkgs/libfcitx-qt5/template +++ /dev/null @@ -1,45 +0,0 @@ -# Template file for 'libfcitx-qt5' -pkgname=libfcitx-qt5 -version=1.2.7 -revision=4 -build_style=cmake -configure_args="-DENABLE_QT6=ON -DQT_HOST_PATH=/usr - -DCMAKE_INSTALL_QT6PLUGINDIR=/usr/lib/qt6/plugins" -hostmakedepends="extra-cmake-modules pkg-config qt5-qmake - qt5-host-tools libfcitx qt6-base-devel" -makedepends="fcitx-devel libxkbcommon-devel qt5-devel - qt6-base-private-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=951fcf8f1db23ed22ad91094eb4c6c906f92005a3643b52f666bd8a331163147 - -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} - 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-qt5/update b/srcpkgs/libfcitx-qt5/update deleted file mode 100644 index dad36611013..00000000000 --- a/srcpkgs/libfcitx-qt5/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=${pkgname#lib*} 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