From 6d095bcfa6b8bff6822cb7cee94037dad019be39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Mar 2021 20:05:16 +0700 Subject: [PATCH 1/4] New package: xcb-imdkit-1.0.2 --- common/shlibs | 1 + srcpkgs/xcb-imdkit-devel | 1 + srcpkgs/xcb-imdkit/template | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 120000 srcpkgs/xcb-imdkit-devel create mode 100644 srcpkgs/xcb-imdkit/template diff --git a/common/shlibs b/common/shlibs index 4b82c3ced654..664df6856561 100644 --- a/common/shlibs +++ b/common/shlibs @@ -257,6 +257,7 @@ libxcb-xkb.so.1 libxcb-1.10_1 libxcb-xinput.so.0 libxcb-1.10_1 libxcb-dri3.so.0 libxcb-1.10_1 libxcb-present.so.0 libxcb-1.10_1 +libxcb-imdkit.so.1 xcb-imdkit-1.0.2_1 libXdmcp.so.6 libXdmcp-1.0.2_1 libpolkit-gobject-1.so.0 polkit-0.99_1 libpolkit-agent-1.so.0 polkit-0.99_1 diff --git a/srcpkgs/xcb-imdkit-devel b/srcpkgs/xcb-imdkit-devel new file mode 120000 index 000000000000..0044a6a371b3 --- /dev/null +++ b/srcpkgs/xcb-imdkit-devel @@ -0,0 +1 @@ +xcb-imdkit \ No newline at end of file diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template new file mode 100644 index 000000000000..3f1a99e9d3ce --- /dev/null +++ b/srcpkgs/xcb-imdkit/template @@ -0,0 +1,29 @@ +# Template file for 'xcb-imdkit' +pkgname=xcb-imdkit +version=1.0.2 +revision=1 +build_style=cmake +hostmakedepends="pkg-config extra-cmake-modules" +makedepends="xcb-util-keysyms-devel xcb-util-devel uthash" +short_desc="Implementation of xim protocol in xcb" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-only" +homepage="https://github.com/fcitx/xcb-imdkit" +distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz" +checksum=801f9da5adc286fb42e43931ed5a2cf67dfe067c40da8d0fa599a29c6d93c799 + +post_install() { + sed -i '/prefix=/!s,/usr,${exec_prefix},' \ + "${DESTDIR}/usr/lib/pkgconfig"/*.pc +} + +xcb-imdkit-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 04b224760534f4a3bc02046649f852f41e7caa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Mar 2021 22:12:45 +0700 Subject: [PATCH 2/4] New package: fcitx5-5.0.5 --- common/shlibs | 3 ++ srcpkgs/fcitx5/template | 62 +++++++++++++++++++++++++++++++++++++++++ srcpkgs/libfcitx5 | 1 + srcpkgs/libfcitx5-devel | 1 + 4 files changed, 67 insertions(+) create mode 100644 srcpkgs/fcitx5/template create mode 120000 srcpkgs/libfcitx5 create mode 120000 srcpkgs/libfcitx5-devel diff --git a/common/shlibs b/common/shlibs index 664df6856561..c1a2eb8acba6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2122,6 +2122,9 @@ libfcitx-config.so.4 libfcitx-4.2.8_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 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template new file mode 100644 index 000000000000..063a2f6cfc54 --- /dev/null +++ b/srcpkgs/fcitx5/template @@ -0,0 +1,62 @@ +# Template file for 'fcitx5' +pkgname=fcitx5 +version=5.0.5 +revision=1 +build_style=cmake +build_helper=qemu +configure_args=" + -DCMAKE_INSTALL_LIBDATADIR=/usr/lib${XBPS_TARGET_WORDSIZE} + -DUSE_SYSTEMD=OFF -DUSE_FLATPAK_ICON=ON" +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules xkeyboard-config wayland-devel" +makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel + dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel + xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel + wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel" +short_desc="Flexible Context-aware Input Tool with eXtension - v5" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +_en_dict_ver=20121020 +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz + https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" +checksum="c1d74d4681f56e72a90b6c36e3d10f2efe66f7e745ea44b11cd3925216a128b4 + c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" + +skip_extraction=en_dict-${_en_dict_ver}.tar.gz + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libexecinfo-devel" +fi + +post_extract() { + local _distdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} + cp ${_distdir}/en_dict-${_en_dict_ver}.tar.gz src/modules/spell/dict +} + +post_install() { + sed -i '/prefix=/!s,/usr,${exec_prefix},' \ + "${DESTDIR}/usr/lib/pkgconfig"/*.pc + sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \ + "${DESTDIR}/usr/lib/cmake"/*/*.cmake + find ${DESTDIR}/usr/share/icons -name 'fcitx.png' -delete + rm -f ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/fcitx.svg +} + +libfcitx5_package() { + short_desc+=" - libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +libfcitx5-devel_package() { + depends="libfcitx5>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libfcitx5 b/srcpkgs/libfcitx5 new file mode 120000 index 000000000000..99ac64afc615 --- /dev/null +++ b/srcpkgs/libfcitx5 @@ -0,0 +1 @@ +fcitx5 \ No newline at end of file diff --git a/srcpkgs/libfcitx5-devel b/srcpkgs/libfcitx5-devel new file mode 120000 index 000000000000..99ac64afc615 --- /dev/null +++ b/srcpkgs/libfcitx5-devel @@ -0,0 +1 @@ +fcitx5 \ No newline at end of file From 0d408fc4553a43b9f66d8d4c80751f9a59eeb697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 00:21:37 +0700 Subject: [PATCH 3/4] New package: fcitx5-gtk-5.0.4 --- common/shlibs | 1 + srcpkgs/fcitx5-gtk+3 | 1 + srcpkgs/fcitx5-gtk-devel | 1 + srcpkgs/fcitx5-gtk/template | 65 +++++++++++++++++++++++++++++++++++++ srcpkgs/fcitx5-gtk4 | 1 + 5 files changed, 69 insertions(+) create mode 120000 srcpkgs/fcitx5-gtk+3 create mode 120000 srcpkgs/fcitx5-gtk-devel create mode 100644 srcpkgs/fcitx5-gtk/template create mode 120000 srcpkgs/fcitx5-gtk4 diff --git a/common/shlibs b/common/shlibs index c1a2eb8acba6..51a23ad3870e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2125,6 +2125,7 @@ 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 +libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 diff --git a/srcpkgs/fcitx5-gtk+3 b/srcpkgs/fcitx5-gtk+3 new file mode 120000 index 000000000000..de83ca580801 --- /dev/null +++ b/srcpkgs/fcitx5-gtk+3 @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file diff --git a/srcpkgs/fcitx5-gtk-devel b/srcpkgs/fcitx5-gtk-devel new file mode 120000 index 000000000000..de83ca580801 --- /dev/null +++ b/srcpkgs/fcitx5-gtk-devel @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template new file mode 100644 index 000000000000..ca4c8ba96380 --- /dev/null +++ b/srcpkgs/fcitx5-gtk/template @@ -0,0 +1,65 @@ +# Template file for 'fcitx5-gtk' +pkgname=fcitx5-gtk +version=5.0.4 +revision=1 +#archs="i686 x86_64" +#wrksrc= +#create_wrksrc=yes +build_style=cmake +build_helper=gir +configure_args="-DENABLE_GTK2_IM_MODULE=OFF $(vopt_bool gir ENABLE_GIR)" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen + extra-cmake-modules glib-devel" +makedepends="libfcitx5-devel libglib-devel gtk+3-devel gtk4-devel fmt-devel" +depends="fcitx5" +short_desc="Flexible Context-aware Input Tool with eXtension v5 - GTK" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://fcitx-im.org/wiki/Fcitx" +distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" +checksum=9a491f6c77e796a3d47fbae052b0d8778b3728dc10326fc90d819109bbcdaccc + +build_options="gir" +build_options_default="gir" + +post_configure() { + find build -name cmake_install.cmake -exec \ + sed -i -e 's,"//\+usr,"/usr,' {} + +} + +post_install() { + sed -i '/prefix=/!s,/usr,${exec_prefix},' \ + "${DESTDIR}/usr/lib/pkgconfig"/*.pc +} + +fcitx5-gtk+3_package() { + short_desc+="+3 IM Modules" + pkg_install() { + vmove usr/lib/gtk-3.0 + } +} + +fcitx5-gtk4_package() { + short_desc+="4 IM Modules" + pkg_install() { + vmove usr/lib/gtk-4.0 + } +} + +fcitx5-gtk-devel_package() { + short_desc+=" - development files" + depends="fcitx5-gtk>=${version}_${revision} libglib-devel" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} diff --git a/srcpkgs/fcitx5-gtk4 b/srcpkgs/fcitx5-gtk4 new file mode 120000 index 000000000000..de83ca580801 --- /dev/null +++ b/srcpkgs/fcitx5-gtk4 @@ -0,0 +1 @@ +fcitx5-gtk \ No newline at end of file From 9315df83f56dd6da80a7a21059bc6ac19db55eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Mar 2021 01:00:18 +0700 Subject: [PATCH 4/4] New package: fcitx5-qt5-5.0.3 --- common/shlibs | 2 ++ srcpkgs/fcitx5-qt5-devel | 1 + srcpkgs/fcitx5-qt5/patches/fix-cross.patch | 13 +++++++++ srcpkgs/fcitx5-qt5/template | 34 ++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 120000 srcpkgs/fcitx5-qt5-devel create mode 100644 srcpkgs/fcitx5-qt5/patches/fix-cross.patch create mode 100644 srcpkgs/fcitx5-qt5/template diff --git a/common/shlibs b/common/shlibs index 51a23ad3870e..6f584d5d81ee 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2126,6 +2126,8 @@ libFcitx5Utils.so.2 libfcitx5-5.0.5_1 libFcitx5Core.so.7 libfcitx5-5.0.5_1 libFcitx5Config.so.6 libfcitx5-5.0.5_1 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1 +libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1 +libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1 diff --git a/srcpkgs/fcitx5-qt5-devel b/srcpkgs/fcitx5-qt5-devel new file mode 120000 index 000000000000..b06bf33725d5 --- /dev/null +++ b/srcpkgs/fcitx5-qt5-devel @@ -0,0 +1 @@ +fcitx5-qt5 \ No newline at end of file diff --git a/srcpkgs/fcitx5-qt5/patches/fix-cross.patch b/srcpkgs/fcitx5-qt5/patches/fix-cross.patch new file mode 100644 index 000000000000..841c6534f81c --- /dev/null +++ b/srcpkgs/fcitx5-qt5/patches/fix-cross.patch @@ -0,0 +1,13 @@ +Index: fcitx5-qt-5.0.3/CMakeLists.txt +=================================================================== +--- fcitx5-qt-5.0.3.orig/CMakeLists.txt ++++ fcitx5-qt-5.0.3/CMakeLists.txt +@@ -56,7 +56,7 @@ if (BUILD_ONLY_PLUGIN) + # Dup a little bit option here. + include(CompilerSettings) + else() +-include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake") ++include("$ENV{XBPS_CROSS_BASE}${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake") + endif() + + set(Fcitx5Qt6_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5Qt6) diff --git a/srcpkgs/fcitx5-qt5/template b/srcpkgs/fcitx5-qt5/template new file mode 100644 index 000000000000..9edb1bcc3884 --- /dev/null +++ b/srcpkgs/fcitx5-qt5/template @@ -0,0 +1,34 @@ +# Template file for 'fcitx5-qt5' +pkgname=fcitx5-qt5 +version=5.0.3 +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" +depends="fcitx5" +short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt5" +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.xz" +checksum=169e13341fc4c88e5201cda4eff656fa89dcc5d973b68c1c8d57b21d1f9439e3 +patch_args=-Np1 + +post_install() { + sed -e 's//2012-2021 CSSlayer /' \ + LICENSES/BSD-3-Clause.txt >LICENSE + vlicense LICENSE +} + +fcitx5-qt5-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +}