* [PR PATCH] fcitx: enable gir on cross
@ 2021-02-01 15:04 sgn
2021-02-01 15:08 ` [PR PATCH] [Updated] " sgn
2021-02-02 1:22 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2021-02-01 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx-gir-cross
https://github.com/void-linux/void-packages/pull/28387
fcitx: enable gir on cross
<!-- Mark items with [x] where applicable -->
#### 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/28387.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx-gir-cross-28387.patch --]
[-- Type: text/x-diff, Size: 3442 bytes --]
From e5e954b55abe5a0b4dbb4881bfd1fd4da52f790b 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: Mon, 1 Feb 2021 21:55:56 +0700
Subject: [PATCH] fcitx: enable gir on cross
---
srcpkgs/fcitx/template | 40 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 8373cf9ff97..ba9c6998d5a 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,8 +1,9 @@
# Template file for 'fcitx'
pkgname=fcitx
version=4.2.9.8
-revision=2
+revision=3
build_style=cmake
+build_helper=gir
short_desc="Flexible Context-aware Input Tool with eXtension"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
@@ -10,14 +11,14 @@ homepage="https://fcitx-im.org/"
distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
+hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
json-c-devel opencc-devel
libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
lib32disabled=yes
configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
-DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
- -DFORCE_ENCHANT=ON -DENABLE_TEST=ON"
+ -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)"
# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
case "$XBPS_TARGET_MACHINE" in
@@ -25,10 +26,12 @@ case "$XBPS_TARGET_MACHINE" in
esac
if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DENABLE_GIR=OFF"
- hostmakedepends+=" glib-devel fcitx"
+ hostmakedepends+=" fcitx"
fi
+build_options="gir"
+build_options_default="gir"
+
pre_configure() {
# include FcitxMacro.cmake without invoking fcitx4-config
vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \
@@ -46,17 +49,17 @@ pre_configure() {
fi
}
+pre_build() {
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils"
+}
+
libfcitx_package() {
short_desc+=" - shared libraries"
pkg_install() {
- for i in config core gclient utils; do
- vmove "usr/lib/libfcitx-${i}.so.*"
- done
+ vmove "usr/lib/*.so.*"
vmove "usr/lib/fcitx/fcitx-*.so"
- for i in comp-spell-dict fcitx-{po-parser,scanner}; do
- vmove usr/lib/fcitx/libexec/${i}
- done
- if [ -z "$CROSS_BUILD" ]; then
+ vmove usr/lib/fcitx/libexec
+ if [ "$build_option_gir" ]; then
vmove usr/lib/girepository-1.0
fi
vlicense COPYING.LIBS
@@ -67,17 +70,12 @@ fcitx-devel_package() {
depends="libfcitx-${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
- for i in config gclient utils; do
- vmove usr/include/fcitx-${i}
- vmove usr/lib/pkgconfig/fcitx-${i}.pc
- vmove usr/lib/libfcitx-${i}.so
- done
vmove usr/bin/fcitx4-config
- vmove usr/include/fcitx
- vmove usr/lib/pkgconfig/fcitx.pc
- vmove usr/lib/libfcitx-core.so
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
vmove usr/share/cmake
- if [ -z "$CROSS_BUILD" ]; then
+ if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] fcitx: enable gir on cross
2021-02-01 15:04 [PR PATCH] fcitx: enable gir on cross sgn
@ 2021-02-01 15:08 ` sgn
2021-02-02 1:22 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-02-01 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fcitx-gir-cross
https://github.com/void-linux/void-packages/pull/28387
fcitx: enable gir on cross
<!-- Mark items with [x] where applicable -->
#### 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/28387.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fcitx-gir-cross-28387.patch --]
[-- Type: text/x-diff, Size: 3578 bytes --]
From 11b785b1fa109dba15d3b582df0665f6a85c2d9a 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: Mon, 1 Feb 2021 21:55:56 +0700
Subject: [PATCH] fcitx: enable gir on cross
While we're at it, build with -O2
---
srcpkgs/fcitx/template | 43 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 8373cf9ff97..8163dee0ca5 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,8 +1,9 @@
# Template file for 'fcitx'
pkgname=fcitx
version=4.2.9.8
-revision=2
+revision=3
build_style=cmake
+build_helper=gir
short_desc="Flexible Context-aware Input Tool with eXtension"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
@@ -10,14 +11,15 @@ homepage="https://fcitx-im.org/"
distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
+hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
json-c-devel opencc-devel
libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
lib32disabled=yes
-configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
+configure_args="-DCMAKE_BUILD_TYPE=None
+ -DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
-DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
- -DFORCE_ENCHANT=ON -DENABLE_TEST=ON"
+ -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)"
# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
case "$XBPS_TARGET_MACHINE" in
@@ -25,10 +27,12 @@ case "$XBPS_TARGET_MACHINE" in
esac
if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DENABLE_GIR=OFF"
- hostmakedepends+=" glib-devel fcitx"
+ hostmakedepends+=" fcitx"
fi
+build_options="gir"
+build_options_default="gir"
+
pre_configure() {
# include FcitxMacro.cmake without invoking fcitx4-config
vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \
@@ -46,17 +50,17 @@ pre_configure() {
fi
}
+pre_build() {
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils"
+}
+
libfcitx_package() {
short_desc+=" - shared libraries"
pkg_install() {
- for i in config core gclient utils; do
- vmove "usr/lib/libfcitx-${i}.so.*"
- done
+ vmove "usr/lib/*.so.*"
vmove "usr/lib/fcitx/fcitx-*.so"
- for i in comp-spell-dict fcitx-{po-parser,scanner}; do
- vmove usr/lib/fcitx/libexec/${i}
- done
- if [ -z "$CROSS_BUILD" ]; then
+ vmove usr/lib/fcitx/libexec
+ if [ "$build_option_gir" ]; then
vmove usr/lib/girepository-1.0
fi
vlicense COPYING.LIBS
@@ -67,17 +71,12 @@ fcitx-devel_package() {
depends="libfcitx-${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
- for i in config gclient utils; do
- vmove usr/include/fcitx-${i}
- vmove usr/lib/pkgconfig/fcitx-${i}.pc
- vmove usr/lib/libfcitx-${i}.so
- done
vmove usr/bin/fcitx4-config
- vmove usr/include/fcitx
- vmove usr/lib/pkgconfig/fcitx.pc
- vmove usr/lib/libfcitx-core.so
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
vmove usr/share/cmake
- if [ -z "$CROSS_BUILD" ]; then
+ if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: fcitx: enable gir on cross
2021-02-01 15:04 [PR PATCH] fcitx: enable gir on cross sgn
2021-02-01 15:08 ` [PR PATCH] [Updated] " sgn
@ 2021-02-02 1:22 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-02-02 1:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
There's a merged pull request on the void-packages repository
fcitx: enable gir on cross
https://github.com/void-linux/void-packages/pull/28387
Description:
<!-- Mark items with [x] where applicable -->
#### 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
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-02 1:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 15:04 [PR PATCH] fcitx: enable gir on cross sgn
2021-02-01 15:08 ` [PR PATCH] [Updated] " sgn
2021-02-02 1:22 ` [PR PATCH] [Merged]: " sgn
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).