Re: [PR PATCH] [Updated] libfcitx-qt5: update to 1.2.7.

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages libfcitx-qt
https://github.com/void-linux/void-packages/pull/37898

libfcitx-qt5: update to 1.2.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #37798 

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37898.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libfcitx-qt-37898.patch --]
[-- Type: text/x-diff, Size: 2737 bytes --]

From ac0048eeebc63a1070eb695f2314ff8d66d82326 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: 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 | 28 ++++++++++++++++++++++------
 srcpkgs/libfcitx-qt6          |  1 +
 3 files changed, 24 insertions(+), 6 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..8ca7898496aa 100644
--- a/srcpkgs/libfcitx-qt5/template
+++ b/srcpkgs/libfcitx-qt5/template
@@ -1,29 +1,45 @@
 # 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
+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"
+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 <orphan@voidlinux.org>"
 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