From 2a3c08f4647671d17f534a5dbd8bd45e11c90ea2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Nov 2024 02:06:03 +0000 Subject: gentoo auto-resync : 29:11:2024 - 02:06:03 --- app-i18n/fcitx-configtool/Manifest | 5 +- .../fcitx-configtool-5.1.6-r2.ebuild | 66 ------------ .../fcitx-configtool-5.1.6-r3.ebuild | 71 +++++++++++++ .../fcitx-configtool-5.1.7-r1.ebuild | 71 +++++++++++++ .../fcitx-configtool/fcitx-configtool-5.1.7.ebuild | 66 ------------ ...configtool-make-x11-dependencies-optional.patch | 112 +++++++++++++++++++++ 6 files changed, 257 insertions(+), 134 deletions(-) delete mode 100644 app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r2.ebuild create mode 100644 app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r3.ebuild create mode 100644 app-i18n/fcitx-configtool/fcitx-configtool-5.1.7-r1.ebuild delete mode 100644 app-i18n/fcitx-configtool/fcitx-configtool-5.1.7.ebuild create mode 100644 app-i18n/fcitx-configtool/files/fcitx-configtool-make-x11-dependencies-optional.patch (limited to 'app-i18n/fcitx-configtool') diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest index c96ea81ef9f7..b965f6fe9c57 100644 --- a/app-i18n/fcitx-configtool/Manifest +++ b/app-i18n/fcitx-configtool/Manifest @@ -1,8 +1,9 @@ +AUX fcitx-configtool-make-x11-dependencies-optional.patch 3758 BLAKE2B eced5cd163047e7c037ca6b2e24ea0f3c64e62b7b02df6f3ed9e5316e8235b4dc55aee123811753f7976be8b24879f3d1c7aedd9d876708c54a90f907c4409d9 SHA512 8cb36e7a50fed06e2245ec213dee7e351c853f243b6f93eca52039a660e19d42b6df4e4dfea41f95991ac82899b8c8e702fc9e269b74cfaf3edf58083ff7b398 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f DIST fcitx-configtool-5.1.6.tar.zst 149667 BLAKE2B 2536258eb92c04623b2f1aa77c99cf91919cd4f1d23c0bdf7f87ab8528b2b1305ed6771ee93b25d67ace24dfc5b14413d96d13f5487fe58efe93b36c452ff67a SHA512 1cedd3b5eae3c069774da3456799e26ab36cf8b8a6515cf008fe6e9822bfa7d0992ed69c4ef9671484082778cd5560ee6255446be3ebbf00f305143b20531aeb DIST fcitx-configtool-5.1.7.tar.zst 149763 BLAKE2B 74fcdf6edccc239c768a308cf590369439dd398bf1a6667f5ca1277991bf504fbcd4c00af51c3e21747a005bc9226315d2e5a441ab183b0f060bfa964d3c520f SHA512 5e6c98478d85ea912d30d213acb232c5abd31b30626d41b7697719bd18c5c5947a3f401cf2d75153fbe3720328f1d8eb76b1a807f02dedd5fcaf44a2bc2b0126 EBUILD fcitx-configtool-0.4.10.ebuild 851 BLAKE2B 97d7acbf9f2984de63df3c6e603fb7d5c4bb8d5828d70d3840b8bc8fb8381388112978c2967f404f485ddc441daaa14b8ea972cad92068dba17cc6758063f7b0 SHA512 e7de180936ec303bfc23e02b77f0d367e94c30253b55dae9bd47ea2a0eb60df7da2360eb25b0c5b6930d08239109629e75179d502e930140b46385bc1a262c7a EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659 -EBUILD fcitx-configtool-5.1.6-r2.ebuild 1519 BLAKE2B 13ebdaee653a9b44bf641d9a1415edfef194ee17fe5f780c4d8554cb82e5a3a753b0237752c1bd0cab70f6ecacfed33c855bd2a49ddd64b9be54547726fe2968 SHA512 fdb7b7428bf4ab0e02bcf4ec8aefe8aeb0cbb6d64c150b443cfe6911c9e48d19d2a7450b4b92911352e8e0ea01b76dbeab3c0991a76101c2c09781c9e98fe495 -EBUILD fcitx-configtool-5.1.7.ebuild 1520 BLAKE2B 1cafb6b31e49301b6751cc9800760fe11c04c4ab081549442a64c858f85b7fc88df41c7da17b28740a5ce8bf7f808662066331f4b63112a83cbd16fcde9e4939 SHA512 8d1670ac5be58f7d4b16d51cec81bd9bc9cfc56ce788a441e8836d0210a442bcda7d7ee15c615e97da917815038bed157401999363479694c0af86ae054aeb9a +EBUILD fcitx-configtool-5.1.6-r3.ebuild 1628 BLAKE2B 923b8a187320632805f7cb45aed60427ad7393fc77cac8437d833d12a3318d86d807a0bbd8048aad8cf080a2804d6b8427d0d59a8439157508cdbb9ea3f0767f SHA512 eadf27ce063ef9f54bb81a7e8d64db0b271b20b5456a970c291790444d6b25a3f8f3da9b4df56f305e30fbbc90f5c13726f211f86b3816389d5e62b720109718 +EBUILD fcitx-configtool-5.1.7-r1.ebuild 1629 BLAKE2B 36a232e63f940d2ebc3721eeacb1289868514c79ebf571b4a5eb6b8d745668576c674eddc3a0a92aa0965706e0a0096bcdf69cc7b7ae297be38aaaa09dd7f067 SHA512 1b7e4f3a771d9ef1523073f4c3ccbcf73d9ec59b0c27013d1ebfcad8e51934b2371d0ad4cc29e06aa500a84b10b1c93de42087bfd7c520dcf1d294e4686e6946 MISC metadata.xml 803 BLAKE2B 41ac8883bc7a637de21f4af61b9e2bc133e14977c7a1f275e67794a420726466108a2f4288f03e6bef4e63b89091e803838587b483f64007258df62ac67e95cb SHA512 7ed03bf3a463f1239062015a122bf41c9444efa4fa3730d986e5479dcfebed376cab1bd1280bff0b5d1fb51a759da5f81b792e8b3d6e6a13896aef85459ffd7b diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r2.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r2.ebuild deleted file mode 100644 index ce5113443197..000000000000 --- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="fcitx5-configtool" - -inherit cmake unpacker - -DESCRIPTION="Configuration module for Fcitx" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool" -SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64" -IUSE="kcm +config-qt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-i18n/fcitx-5.1.6:5 - >=app-i18n/fcitx-qt-5.1.4:5[qt6(+),-onlyplugin] - app-text/iso-codes - dev-qt/qtbase:6[concurrent,dbus,gui,widgets] - dev-qt/qtsvg:6 - kde-frameworks/kwidgetsaddons:6 - sys-devel/gettext - virtual/libintl - x11-libs/libX11 - x11-libs/libxkbfile - x11-misc/xkeyboard-config - config-qt? ( kde-frameworks/kitemviews:6 ) - kcm? ( - dev-qt/qtdeclarative:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/kdeclarative:6 - kde-frameworks/ki18n:6 - kde-frameworks/kiconthemes:6 - kde-frameworks/kirigami:6 - kde-frameworks/kpackage:6 - kde-frameworks/ksvg:6 - kde-frameworks/kcmutils:6 - kde-plasma/libplasma:6 - x11-libs/libxkbcommon - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - $(unpacker_src_uri_depends) - kde-frameworks/extra-cmake-modules:0 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DKDE_INSTALL_USE_QT_SYS_PATHS=yes - -DENABLE_KCM=$(usex kcm) - -DENABLE_CONFIG_QT=$(usex config-qt) - -DENABLE_TEST=$(usex test) - -DUSE_QT6=ON - ) - - cmake_src_configure -} diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r3.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r3.ebuild new file mode 100644 index 000000000000..8c7ba7f35343 --- /dev/null +++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r3.ebuild @@ -0,0 +1,71 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-configtool" + +inherit cmake unpacker + +DESCRIPTION="Configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="amd64" +IUSE="kcm +config-qt test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/fcitx-qt-5.1.4:5[qt6(+),-onlyplugin] + app-text/iso-codes + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qtsvg:6 + kde-frameworks/kwidgetsaddons:6 + sys-devel/gettext + virtual/libintl + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + ) + config-qt? ( kde-frameworks/kitemviews:6 ) + kcm? ( + dev-qt/qtdeclarative:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/kdeclarative:6 + kde-frameworks/ki18n:6 + kde-frameworks/kiconthemes:6 + kde-frameworks/kirigami:6 + kde-frameworks/kpackage:6 + kde-frameworks/ksvg:6 + kde-frameworks/kcmutils:6 + kde-plasma/libplasma:6 + x11-libs/libxkbcommon + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(unpacker_src_uri_depends) + kde-frameworks/extra-cmake-modules:0 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-make-x11-dependencies-optional.patch ) + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + -DENABLE_KCM=$(usex kcm) + -DENABLE_CONFIG_QT=$(usex config-qt) + -DENABLE_X11=$(usex X) + -DENABLE_TEST=$(usex test) + -DUSE_QT6=ON + ) + + cmake_src_configure +} diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.7-r1.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.7-r1.ebuild new file mode 100644 index 000000000000..b6a11e2f109d --- /dev/null +++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.7-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-configtool" + +inherit cmake unpacker + +DESCRIPTION="Configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64" +IUSE="kcm +config-qt test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/fcitx-qt-5.1.4:5[qt6(+),-onlyplugin] + app-text/iso-codes + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qtsvg:6 + kde-frameworks/kwidgetsaddons:6 + sys-devel/gettext + virtual/libintl + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + ) + config-qt? ( kde-frameworks/kitemviews:6 ) + kcm? ( + dev-qt/qtdeclarative:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/kdeclarative:6 + kde-frameworks/ki18n:6 + kde-frameworks/kiconthemes:6 + kde-frameworks/kirigami:6 + kde-frameworks/kpackage:6 + kde-frameworks/ksvg:6 + kde-frameworks/kcmutils:6 + kde-plasma/libplasma:6 + x11-libs/libxkbcommon + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(unpacker_src_uri_depends) + kde-frameworks/extra-cmake-modules:0 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-make-x11-dependencies-optional.patch ) + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + -DENABLE_KCM=$(usex kcm) + -DENABLE_CONFIG_QT=$(usex config-qt) + -DENABLE_X11=$(usex X) + -DENABLE_TEST=$(usex test) + -DUSE_QT6=ON + ) + + cmake_src_configure +} diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.7.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.7.ebuild deleted file mode 100644 index 2e4cdd69bfab..000000000000 --- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="fcitx5-configtool" - -inherit cmake unpacker - -DESCRIPTION="Configuration module for Fcitx" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool" -SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="kcm +config-qt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-i18n/fcitx-5.1.6:5 - >=app-i18n/fcitx-qt-5.1.4:5[qt6(+),-onlyplugin] - app-text/iso-codes - dev-qt/qtbase:6[concurrent,dbus,gui,widgets] - dev-qt/qtsvg:6 - kde-frameworks/kwidgetsaddons:6 - sys-devel/gettext - virtual/libintl - x11-libs/libX11 - x11-libs/libxkbfile - x11-misc/xkeyboard-config - config-qt? ( kde-frameworks/kitemviews:6 ) - kcm? ( - dev-qt/qtdeclarative:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/kdeclarative:6 - kde-frameworks/ki18n:6 - kde-frameworks/kiconthemes:6 - kde-frameworks/kirigami:6 - kde-frameworks/kpackage:6 - kde-frameworks/ksvg:6 - kde-frameworks/kcmutils:6 - kde-plasma/libplasma:6 - x11-libs/libxkbcommon - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - $(unpacker_src_uri_depends) - kde-frameworks/extra-cmake-modules:0 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DKDE_INSTALL_USE_QT_SYS_PATHS=yes - -DENABLE_KCM=$(usex kcm) - -DENABLE_CONFIG_QT=$(usex config-qt) - -DENABLE_TEST=$(usex test) - -DUSE_QT6=ON - ) - - cmake_src_configure -} diff --git a/app-i18n/fcitx-configtool/files/fcitx-configtool-make-x11-dependencies-optional.patch b/app-i18n/fcitx-configtool/files/fcitx-configtool-make-x11-dependencies-optional.patch new file mode 100644 index 000000000000..53fd3da8b34c --- /dev/null +++ b/app-i18n/fcitx-configtool/files/fcitx-configtool-make-x11-dependencies-optional.patch @@ -0,0 +1,112 @@ +https://github.com/fcitx/fcitx5-configtool/pull/79 + +Add configure option "ENABLE_X11". When turned off, most parts of +fcitx5-configtool except kbd-layout-viewer5 could be built without X11 +dependencies. This includes no behavior change. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,9 +40,13 @@ include(GenerateExportHeader) + option(ENABLE_KCM "Enable KDE Config Module" On) + option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On) + option(ENABLE_TEST "Enable test" Off) ++option(ENABLE_X11 "Enable X11 integration" On) + add_definitions(-DTRANSLATION_DOMAIN=\"kcm_fcitx5\") + add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-configtool\") + add_definitions(-DQT_NO_KEYWORDS) ++if (ENABLE_X11) ++add_definitions(-DENABLE_X11) ++endif () + + if (ENABLE_CONFIG_QT) + find_package(KF${QT_MAJOR_VERSION}ItemViews REQUIRED) +@@ -95,15 +99,19 @@ include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cma + + find_package(PkgConfig REQUIRED) + find_package(Gettext REQUIRED) ++if (ENABLE_X11) + find_package(X11 REQUIRED) + find_package(XKeyboardConfig REQUIRED) + pkg_check_modules(XkbFile "xkbfile" REQUIRED IMPORTED_TARGET) ++endif () + + configure_file(config.h.in config.h) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + add_subdirectory(po) + add_subdirectory(src) ++if (ENABLE_X11) + add_subdirectory(layout) ++endif () + + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) +--- a/src/lib/configwidgetslib/CMakeLists.txt ++++ b/src/lib/configwidgetslib/CMakeLists.txt +@@ -28,5 +28,7 @@ target_link_libraries(configwidgetslib + Fcitx5::Utils + Fcitx5Qt${QT_MAJOR_VERSION}::DBusAddons + Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons +- configlib +- layoutlib) ++ configlib) ++if (ENABLE_X11) ++target_link_libraries(configwidgetslib layoutlib) ++endif () +--- a/src/lib/configwidgetslib/layoutselector.cpp ++++ b/src/lib/configwidgetslib/layoutselector.cpp +@@ -6,7 +6,9 @@ + + #include "layoutselector.h" + #include "dbusprovider.h" ++#ifdef ENABLE_X11 + #include "keyboardlayoutwidget.h" ++#endif // ENABLE_X11 + #include "layoutmodel.h" + #include "ui_layoutselector.h" + #include +@@ -45,6 +47,7 @@ LayoutSelector::LayoutSelector(DBusProvider *dbus, QWidget *parent) + connect(ui_->variantComboBox, + qOverload(&QComboBox::currentIndexChanged), this, + &LayoutSelector::variantComboBoxChanged); ++#ifdef ENABLE_X11 + if (qApp->platformName() == "xcb") { + keyboardLayoutWidget_ = new KeyboardLayoutWidget(this); + keyboardLayoutWidget_->setMinimumSize(QSize(400, 200)); +@@ -52,6 +55,7 @@ LayoutSelector::LayoutSelector(DBusProvider *dbus, QWidget *parent) + QSizePolicy::Expanding); + ui_->verticalLayout->addWidget(keyboardLayoutWidget_); + } ++#endif // ENABLE_X11 + } + + LayoutSelector::~LayoutSelector() {} +@@ -128,6 +132,7 @@ void LayoutSelector::layoutComboBoxChanged() { + ui_->variantComboBox->setCurrentIndex(0); + } + ++#ifdef ENABLE_X11 + void LayoutSelector::variantComboBoxChanged() { + if (!keyboardLayoutWidget_) { + return; +@@ -142,6 +147,9 @@ void LayoutSelector::variantComboBoxChanged() { + keyboardLayoutWidget_->setVisible(true); + } + } ++#else ++void LayoutSelector::variantComboBoxChanged() { return; } ++#endif // ENABLE_X11 + + } // namespace kcm + } // namespace fcitx +--- a/src/lib/configwidgetslib/layoutselector.h ++++ b/src/lib/configwidgetslib/layoutselector.h +@@ -53,7 +53,9 @@ private Q_SLOTS: + std::unique_ptr ui_; + DBusProvider *dbus_; + LayoutProvider *layoutProvider_; ++#ifdef ENABLE_X11 + KeyboardLayoutWidget *keyboardLayoutWidget_ = nullptr; ++#endif + Iso639 iso639_; + + QString preSelectLayout_; -- cgit v1.2.3