From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] [WIP] fcitx5-qt: enable fcitx5-qt6
Date: Fri, 07 May 2021 02:59:56 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30714@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx5-qt6
https://github.com/void-linux/void-packages/pull/30714
[WIP] fcitx5-qt: enable fcitx5-qt6
<!-- Mark items with [x] where applicable -->
* cmake config for Qt6 is incorrect.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30714.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx5-qt6-30714.patch --]
[-- Type: text/x-diff, Size: 5371 bytes --]
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
next reply other threads:[~2021-05-07 0:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 0:59 sgn [this message]
2021-05-14 12:12 ` [PR PATCH] [Updated] " sgn
2021-05-14 14:37 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30714@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).