gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2026-09-23 21:45:48 +00:00
parent b78e15a908 7cd6218c76
commit 07258bb2c7
16 changed files with 8 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-crypt/qca/qca-2.3.12.ebuild
View File

@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~riscv ~x86"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
RESTRICT="!test? ( test )"

2
dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.22.0.ebuild
View File

@@ -10,7 +10,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ppc64 ~riscv x86"
fi
LICENSE="LGPL-2.1"

3
gui-apps/input-leap/Manifest
View File

@@ -1,3 +0,0 @@
DIST input-leap-3.0.2-no-x11.patch 167137 BLAKE2B 850d4e842233a960136251ff83cbfa58cddd73f15da84d6f024ebcb08b0b7bcafc8cd3d402e5b2297f68b4ab75ff47e241e1c8d32f900babec496c7a39906bed SHA512 d80fd984d26f1cd141a2635b35740a320c389dd60b651a6d4c8ef4db04778cb7c090ddd5aee2d8061cc69fe4d58b36262008bcce5cab05ce84162af699e086c7
DIST input-leap-3.0.2.tar.gz 1764599 BLAKE2B 0924a1869b1820710b426e68a45e1e538c15a656677d0d2459697035ff1780c12f07da05ecb3890595833ac4ad6e07c66cc68164fa8d70f259b1599d0b287c1e SHA512 caadf17b64765c0732e94e6a38e17e560d050a2fa0252f26ec382f3f80af936aa9d0aa8172e29724b04223fd3b378b68b7afe7db41c336431b839331815774d9
DIST input-leap-3.0.3.tar.gz 1764202 BLAKE2B fbafa19481025660fba282580054fd0b9dc4d87553fcf495acfa15b0283e4f60fa15a904ba3ef516a8325aa3e99118aaf95343e741df5b57da30b958612f7965 SHA512 bcfad3938c2a6082ca3d2e083147002f0b870e81026580cc7f655ea9c43b707552e188a0fb93669466d037569e89983b35e16a272cb313e40039f2abac98f444

59
gui-apps/input-leap/files/input-leap-3.0.2-gui-crash.patch
View File

@@ -1,59 +0,0 @@
From 0bae409d577e1efddacec5be7b0c97329eff854f Mon Sep 17 00:00:00 2001
From: Jordan <jakj3m@gmail.com>
Date: Sat, 9 Nov 2024 00:55:32 +0100
Subject: [PATCH] fix: server config dialog show event. Fixes issue 2067 on
github. Was initially suggested by sithlord48.
---
.../arch_bug_when_configuring_server.bugfix | 1 +
src/gui/src/ServerConfigDialog.cpp | 13 -------------
src/gui/src/ServerConfigDialog.h | 1 -
3 files changed, 1 insertion(+), 14 deletions(-)
create mode 100644 doc/newsfragments/arch_bug_when_configuring_server.bugfix
diff --git a/doc/newsfragments/arch_bug_when_configuring_server.bugfix b/doc/newsfragments/arch_bug_when_configuring_server.bugfix
new file mode 100644
index 00000000..65060e11
--- /dev/null
+++ b/doc/newsfragments/arch_bug_when_configuring_server.bugfix
@@ -0,0 +1 @@
+Fixed a segmentation fault that would occur when configuring servers on certain platforms. This solution was proposed by sithlord48 and they used it to fix the issue for deskflow.
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index ec81702d..5783e435 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -74,19 +74,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget* parent, ServerConfig& config, co
model().screen(serverConfig().numColumns() / 2, serverConfig().numRows() / 2) = Screen(defaultScreenName);
}
-void ServerConfigDialog::showEvent(QShowEvent* event)
-{
- (void) event;
-
- QDialog::show();
-
- if (!m_Message.isEmpty())
- {
- // TODO: ideally this message box should pop up after the dialog is shown
- QMessageBox::information(this, tr("Configure server"), m_Message);
- }
-}
-
void ServerConfigDialog::accept()
{
serverConfig().haveHeartbeat(ui_->m_pCheckBoxHeartbeat->isChecked());
diff --git a/src/gui/src/ServerConfigDialog.h b/src/gui/src/ServerConfigDialog.h
index 6b306f6e..aacf2ef5 100644
--- a/src/gui/src/ServerConfigDialog.h
+++ b/src/gui/src/ServerConfigDialog.h
@@ -39,7 +39,6 @@ class ServerConfigDialog : public QDialog
public slots:
void accept() override;
- void showEvent(QShowEvent* event) override;
void message(const QString& message) { m_Message = message; }
protected slots:
--
2.49.0

40
gui-apps/input-leap/files/input-leap-3.0.2-qt-6.9.patch
View File

@@ -1,40 +0,0 @@
https://bugs.gentoo.org/958396
https://github.com/input-leap/input-leap/issues/2221
https://github.com/input-leap/input-leap/pull/2232
From d5c08a2ac8398f5ee6a1b2032e791d5980c47d60 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Wed, 23 Apr 2025 13:35:11 +0100
Subject: [PATCH] fix(gui): Adjust KeySequence.cpp for Qt > 6.9 change
Based off these comments on #2231.
- https://github.com/input-leap/input-leap/pull/2231#issuecomment-2823052026
- https://github.com/input-leap/input-leap/pull/2231#issuecomment-2824062717
And this patch: https://gist.github.com/sid-code/9131300ee943af1ce5958ee40e527b93
Closes: #2231.
Closes: #2221.
---
src/gui/src/KeySequence.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/gui/src/KeySequence.cpp b/src/gui/src/KeySequence.cpp
index 06a8efcd5..8e1012345 100644
--- a/src/gui/src/KeySequence.cpp
+++ b/src/gui/src/KeySequence.cpp
@@ -237,8 +237,11 @@ QString KeySequence::keyToString(int key)
// representable in ucs2?
if (key < 0x10000)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+ return QString("\\u%1").arg((uint16_t) QChar(key).toLower().unicode(), 4, 16, QChar('0'));
+#else
return QString("\\u%1").arg(QChar(key).toLower().unicode(), 4, 16, QChar('0'));
-
+#endif
// give up, InputLeap probably won't handle this
return "";
}

94
gui-apps/input-leap/input-leap-3.0.2-r1.ebuild
View File

@@ -1,94 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VIRTUALX_REQUIRED="manual"
inherit cmake virtualx xdg
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/input-leap/input-leap.git"
inherit git-r3
else
SRC_URI="https://github.com/input-leap/input-leap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~chewi/distfiles/${P}-no-x11.patch"
KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Share a mouse and keyboard between computers (fork of Barrier)"
HOMEPAGE="https://github.com/input-leap/input-leap"
LICENSE="GPL-2"
SLOT="0"
IUSE="gui test +wayland +X"
REQUIRED_USE="|| ( wayland X )"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/openssl:0=
gui? (
dev-qt/qtbase:6[gui,network,widgets]
net-dns/avahi[mdnsresponder-compat]
)
wayland? (
dev-libs/glib:2
dev-libs/libei
dev-libs/libportal:=
x11-libs/libxkbcommon
)
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXtst
)
"
DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )
"
BDEPEND="
virtual/pkgconfig
gui? ( dev-qt/qttools:6[linguist] )
test? ( X? ( ${VIRTUALX_DEPEND} ) )
"
PATCHES=(
"${FILESDIR}"/${P}-gui-crash.patch
"${DISTDIR}"/${P}-no-x11.patch
"${FILESDIR}"/${P}-qt-6.9.patch
)
DOCS=(
ChangeLog
README.md
doc/${PN}.conf.example{,-advanced,-basic}
)
src_configure() {
local REV="${EGIT_VERSION:-00000000}"
local mycmakeargs=(
-DINPUTLEAP_BUILD_GUI=$(usex gui)
-DINPUTLEAP_BUILD_LIBEI=$(usex wayland)
-DINPUTLEAP_BUILD_TESTS=$(usex test)
-DINPUTLEAP_BUILD_X11=$(usex X)
-DINPUTLEAP_REVISION="${REV:0:8}"
-DINPUTLEAP_USE_EXTERNAL_GTEST=ON
)
cmake_src_configure
}
src_test() {
"${BUILD_DIR}"/bin/unittests || die
if use X; then
virtx "${BUILD_DIR}"/bin/integtests
else
"${BUILD_DIR}"/bin/integtests || die
fi
}

87
gui-apps/input-leap/input-leap-3.0.3.ebuild
View File

@@ -1,87 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VIRTUALX_REQUIRED="manual"
inherit cmake virtualx xdg
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/input-leap/input-leap.git"
inherit git-r3
else
SRC_URI="https://github.com/input-leap/input-leap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Share a mouse and keyboard between computers (fork of Barrier)"
HOMEPAGE="https://github.com/input-leap/input-leap"
LICENSE="GPL-2"
SLOT="0"
IUSE="gui test +wayland +X"
REQUIRED_USE="|| ( wayland X )"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/openssl:0=
gui? (
dev-qt/qtbase:6[gui,network,widgets]
net-dns/avahi[mdnsresponder-compat]
)
wayland? (
dev-libs/glib:2
dev-libs/libei
dev-libs/libportal:=
x11-libs/libxkbcommon
)
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXtst
)
"
DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )
"
BDEPEND="
virtual/pkgconfig
gui? ( dev-qt/qttools:6[linguist] )
test? ( X? ( ${VIRTUALX_DEPEND} ) )
"
DOCS=(
ChangeLog
README.md
doc/${PN}.conf.example{,-advanced,-basic}
)
src_configure() {
local REV="${EGIT_VERSION:-00000000}"
local mycmakeargs=(
-DINPUTLEAP_BUILD_GUI=$(usex gui)
-DINPUTLEAP_BUILD_LIBEI=$(usex wayland)
-DINPUTLEAP_BUILD_TESTS=$(usex test)
-DINPUTLEAP_BUILD_X11=$(usex X)
-DINPUTLEAP_REVISION="${REV:0:8}"
-DINPUTLEAP_USE_EXTERNAL_GTEST=ON
)
cmake_src_configure
}
src_test() {
"${BUILD_DIR}"/bin/unittests || die
if use X; then
virtx "${BUILD_DIR}"/bin/integtests
else
"${BUILD_DIR}"/bin/integtests || die
fi
}

87
gui-apps/input-leap/input-leap-9999.ebuild
View File

@@ -1,87 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VIRTUALX_REQUIRED="manual"
inherit cmake virtualx xdg
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/input-leap/input-leap.git"
inherit git-r3
else
SRC_URI="https://github.com/input-leap/input-leap/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Share a mouse and keyboard between computers (fork of Barrier)"
HOMEPAGE="https://github.com/input-leap/input-leap"
LICENSE="GPL-2"
SLOT="0"
IUSE="gui test +wayland +X"
REQUIRED_USE="|| ( wayland X )"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/openssl:0=
gui? (
dev-qt/qtbase:6[gui,network,widgets]
net-dns/avahi[mdnsresponder-compat]
)
wayland? (
dev-libs/glib:2
dev-libs/libei
dev-libs/libportal:=
x11-libs/libxkbcommon
)
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXtst
)
"
DEPEND="
${RDEPEND}
x11-base/xorg-proto
test? ( dev-cpp/gtest )
"
BDEPEND="
virtual/pkgconfig
gui? ( dev-qt/qttools:6[linguist] )
test? ( X? ( ${VIRTUALX_DEPEND} ) )
"
DOCS=(
ChangeLog
README.md
doc/${PN}.conf.example{,-advanced,-basic}
)
src_configure() {
local REV="${EGIT_VERSION:-00000000}"
local mycmakeargs=(
-DINPUTLEAP_BUILD_GUI=$(usex gui)
-DINPUTLEAP_BUILD_LIBEI=$(usex wayland)
-DINPUTLEAP_BUILD_TESTS=$(usex test)
-DINPUTLEAP_BUILD_X11=$(usex X)
-DINPUTLEAP_REVISION="${REV:0:8}"
-DINPUTLEAP_USE_EXTERNAL_GTEST=ON
)
cmake_src_configure
}
src_test() {
"${BUILD_DIR}"/bin/unittests || die
if use X; then
virtx "${BUILD_DIR}"/bin/integtests
else
"${BUILD_DIR}"/bin/integtests || die
fi
}

11
gui-apps/input-leap/metadata.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chewi@gentoo.org</email>
<name>James Le Cuirot</name>
</maintainer>
<upstream>
<remote-id type="github">input-leap/input-leap</remote-id>
</upstream>
</pkgmetadata>

2
kde-plasma/kde-cli-tools-common/kde-cli-tools-common-6.7.5.ebuild
View File

@@ -9,6 +9,6 @@ inherit ecm-common plasma.kde.org
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~x86"
RDEPEND="!<${CATEGORY}/${KDE_ORG_NAME}-6.1.4-r2:*"

2
kde-plasma/keditfiletype/keditfiletype-6.7.5.ebuild
View File

@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
LICENSE="GPL-2" # TODO: CHECK
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~x86"
IUSE=""
# requires running Plasma environment

2
kde-plasma/kwayland/kwayland-6.7.5.ebuild
View File

@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
LICENSE="LGPL-2.1"
SLOT="6"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
IUSE=""
# All failing, I guess we need a virtual wayland server

2
kde-plasma/libplasma/libplasma-6.7.5.ebuild
View File

@@ -13,7 +13,7 @@ DESCRIPTION="Plasma library and runtime components based upon KF6 and Qt6"
LICENSE="LGPL-2+"
SLOT="6/7"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~x86"
IUSE="activities gles2-only"
RESTRICT="test"

2
kde-plasma/plasma-activities/plasma-activities-6.7.5.ebuild
View File

@@ -13,7 +13,7 @@ DESCRIPTION="Core components for KDE's Activities System"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="6/7"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~x86"
IUSE=""
RDEPEND="

2
kde-plasma/polkit-kde-agent/polkit-kde-agent-6.7.5.ebuild
View File

@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
KEYWORDS="~amd64 ~arm64 ppc64 ~riscv ~x86"
IUSE=""
DEPEND="

7
profiles/package.mask
View File

@@ -162,13 +162,6 @@ acct-group/croc
acct-user/croc
net-misc/croc
# James Le Cuirot <chewi@gentoo.org> (2026-08-16)
# This fork of Barrier sadly didn't get very far. Upstream have now archived the
# repository. Use gui-apps/deskflow, which is now the FOSS upstream of the
# original Synergy project that all these other projects are descended from.
# Removal on 2026-09-16. Bug #980972.
gui-apps/input-leap
# Brett A C Sheffield <bacs@librecast.net> (2026-08-09)
# Unmaintained by upstream for 16 years. Two unpatched security bugs
# (Bug #906111 and Bug #916866) and many more unpatched issues upstream.