Merge updates from master

This commit is contained in:
Repository mirror & CI
2023-06-30 19:16:51 +00:00
16 changed files with 116 additions and 110 deletions

View File

@@ -1,2 +1 @@
DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f SHA512 904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b

View File

@@ -1,101 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic xdg
DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
HOMEPAGE="https://keepassxc.org/
https://github.com/keepassxreboot/keepassxc/"
if [[ "${PV}" != *9999 ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
else
#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
else
inherit git-r3
EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
fi
LICENSE="LGPL-2.1 GPL-2 GPL-3"
SLOT="0"
IUSE="X autotype browser doc keeshare +network test yubikey"
RESTRICT="!test? ( test )"
REQUIRED_USE="autotype? ( X )"
RDEPEND="
app-crypt/argon2:=
dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
media-gfx/qrencode:=
sys-libs/readline:0=
sys-libs/zlib:=
X? ( dev-qt/qtx11extras:5 )
autotype? (
x11-libs/libX11
x11-libs/libXtst
)
keeshare? ( sys-libs/zlib:=[minizip] )
yubikey? (
dev-libs/libusb:1
sys-apps/pcsc-lite
)
"
DEPEND="${RDEPEND}
dev-qt/qttest:5
"
BDEPEND="
dev-qt/linguist-tools:5
doc? ( dev-ruby/asciidoctor )
"
PATCHES=( "${FILESDIR}"/${P}-tests.patch )
src_prepare() {
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
printf '%s' "${PV}" > .version || die
fi
cmake_src_prepare
}
src_configure() {
# https://github.com/keepassxreboot/keepassxc/issues/5801
filter-lto
local mycmakeargs=(
# Gentoo users enable ccache via e.g. FEATURES=ccache or
# other means. We don't want the build system to enable it for us.
-DWITH_CCACHE=OFF
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_DOCS="$(usex doc)"
-DWITH_XC_BROWSER="$(usex browser)"
-DWITH_XC_FDOSECRETS=ON
-DWITH_XC_KEESHARE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"
-DWITH_XC_SSHAGENT=ON
-DWITH_XC_UPDATECHECK=OFF
-DWITH_XC_YUBIKEY="$(usex yubikey)"
-DWITH_XC_X11="$(usex X)"
)
if [[ "${PV}" == *_beta* ]] ; then
mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
fi
cmake_src_configure
}

View File

@@ -1,3 +1,3 @@
DIST typescript-5.0.4.tgz 7051452 BLAKE2B ed08425d8324a910f2d328fb02f27e08f75334fb190d1c4625452d076d615726d0e852da06f0f25146a4b02c6c99cd569bbcf7c50f5d6ff32c88a40101a59656 SHA512 716f53e56f71637edc73e8df127694bd7f757e8c6d1e4cdadcdc37c24a05e2c4a52a7d0c38d7647449dd8a0fea3c15973649a9961dcdcdac90cc2887338fe1ab
DIST typescript-5.1.3.tgz 7147721 BLAKE2B 5a18d18bcbe702c82a108624c189e6b03d72f74e16ccf6af2448c71c1decfcc7995b53524472e106c19ef01ec95df772ccfeed3e76fad1eb59f29bbe42668fb0 SHA512 5c7eb6ec4f6f91eaa1959150b8bf94b3201712789b4f491647615638d96be2c4e3bf1c89627c9e7e0ae4c8408bccce4d7a798acd1032dab47f3a560b0351e467
DIST typescript-5.1.5.tgz 7147776 BLAKE2B 6aa416a68b17b30de0203a33bf9cd14ee519f50e860bd745a92d7571b3565b1c98d9369037dc4fcd19a5c9080085d67aea91bebd53c08ff757e1f4ed6b6e5320 SHA512 14e1fe58dfc342352f37a5a05be738325df28b43c7f9affcabe90d21f45e86fd702e158e35e770f398aefaf437f56a78f48cd3244b19da5c8b5e9045ee6905d6
DIST typescript-5.1.6.tgz 7147748 BLAKE2B 3bde82e40dd4852dc85418bb0bee09dbeb70361adba9e9071a18e640c7a53e6a5517e7a4b2e068364197919d1233dda30041c675132e659bac3e3ac5008d39f0 SHA512 cda582a33459e832c4580585ad50f3d47e85557cd449f4f2e4550c5ac42553c626e493fd78ee31913211385090be141feb5cfa3bf1baba0c374a0027bef9be1c

View File

@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
RDEPEND="
>=dev-lang/ocaml-4.14.0
=dev-ml/sexplib0-0.1*:=
=dev-ml/sexplib0-0.16*:=
dev-ml/dune-configurator:=
"
DEPEND="${RDEPEND}"

View File

@@ -1,3 +1,4 @@
DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
DIST parsexp-0.14.1.tar.gz 48617 BLAKE2B d491b8c28eb0a269985df107152b6239513fb9d59dc723c9692dd436883331ce23fdd714bc467b4fcdaba81baa2adb2421110e92fb5bd3f526437856f4edaa02 SHA512 c9d6a00dbe49272fa32ba3684249d5085482fe2024795391aa3605b21962e9d426535a46d7139b487332b86e05f042226dd1a8166d2a3cb9dcee9b4b06b81ab8
DIST parsexp-0.15.0.tar.gz 56471 BLAKE2B afbaae6f1b94419768ab55cc2e00f605fda456e68308c5ea0b4b6b8eb61e9373b7852cfaaf37de18c4bb1427f3b945d411619827e572079c44b12f6def6a45ac SHA512 aad464435747228f7168e2700fc8d5d3a9f212196a5e9afa24dd26d6f596dd96b68ecc77eddf862990df93d74d9a935038f602b1bbeecb545651d61b70f47d3f
DIST parsexp-0.16.0.tar.gz 56904 BLAKE2B 3ead4215242a6f5edd8babbb64ef68dc0a9e230a26b77209f7864eae048b62f4970ce1b50cb6ac1e21df0ada8d49917ae6df0e6c10fce5fe5313c2b4d661517e SHA512 54a59c12ef9cafe69f5dab79d51a7115205f0becef97db1d0051cb50c3ff004a56e43e9607a3869e4928f8653df5a2b9e3366e4ac0d8d7483752fa5287352791

View File

@@ -0,0 +1,18 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit dune
DESCRIPTION="S-expression parsing library"
HOMEPAGE="https://github.com/janestreet/parsexp"
SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
RDEPEND="dev-ml/base:${SLOT}"
DEPEND="${RDEPEND}"

View File

@@ -3,3 +3,4 @@ DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d
DIST ppx_expect-0.14.2.tar.gz 45703 BLAKE2B cd1371f6e7e0519c1b30c6d471a1f4be6cbeffa0bf65de1472c9809265c35c307cd36ebb12548f60ab2acb6e9786556f29ae4752ee5cfbfa19fdc2dc14f16aa6 SHA512 bb00e15057ea403241781d2d6a385200496adc79680a01d031416192f8c93efd75a6998602a90d0aba7fcb2110e876b058126bb6397d5ba7fe5dd48c03202169
DIST ppx_expect-0.15.0.tar.gz 48825 BLAKE2B 9363497cc5a507d4f9c51be11a3fef254cbd2541c146a1248755763bed6f54a69738ed72ac590e270856b9c04a5949c9bbd59ba25bc8e7d1fc9d76574bcc70c3 SHA512 945ebd31a94debd4a65c3a8dd7e6481e7debe043c48a60bab4085f9d05cba5b8663bf0f5498cb4cd0e86a24182b21006506f20873e5242b31db5de5629113ade
DIST ppx_expect-0.15.1.tar.gz 48800 BLAKE2B de36b8eafb1393c6489f60d91a4eb0da15e0108db7b56536011cb4e0e7fd2168ab97d76256920d40bcf39283435b19b69afe17204a3ecca615ced9c3482e974a SHA512 483c320dcfa628a1140d727e63fe4c5e2b298d9c58ab9975f8b3b5fcfbb3348f04a901d8b4a8d8288b14959fddbf2578a8b48de7352e4ce90439e26a27026780
DIST ppx_expect-0.16.0.tar.gz 48460 BLAKE2B c4e9eecd689c1d0f79183020e634636ca340b16638fb0b76e5a7e89e08626d4cc88bd981533184ed7b81b8d34a0d302ff68920414472c084d5a969e45b6e791e SHA512 fdc8cb76afc9c9b436cbf8627b0c6543ae64fc51e92bf25db99ace10646aef3be3d1a3659dedb3e888494ab4e380e387b92557a584fa3e1eca79e19751a0b950

View File

@@ -0,0 +1,27 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit dune
DESCRIPTION="Cram like framework for OCaml"
HOMEPAGE="https://github.com/janestreet/ppx_expect"
SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
# https://bugs.gentoo.org/749291#c2
RESTRICT="test"
RDEPEND="
>=dev-ml/ppxlib-0.28.0:=
>=dev-ml/re-1.8.0:=
dev-ml/base:${SLOT}
dev-ml/ppx_here:${SLOT}
dev-ml/ppx_inline_test:${SLOT}
dev-ml/stdio:${SLOT}
"
DEPEND="${RDEPEND}"

View File

@@ -1,2 +1,3 @@
DIST ppx_let-0.14.0.tar.gz 10822 BLAKE2B c1dc155afb0bc52bb22d65c2c19536d41d53e4cf10d39b70ebadf1cf8cfb37ff1c25d9fcfb48f9421a0c55887acc2c6ce72d531593a61654146d3196fa83499d SHA512 79f2dcf2c76308b5993d1b9dad5c961b816dcc4ae43d856c51c196a67eb21b2f51135762e52d512afa9b45aca30002abbca76036ebcc117464a4823d1c40ed0c
DIST ppx_let-0.15.0.tar.gz 17400 BLAKE2B 3276944addb1dd01c1f461512452ee2bf32fee0cfc3b3772aa7da2a427786a100b36678539fc7fb2beb98ad0bac3b82071b8ebe5d4e5374c5b8bc57a239488ca SHA512 5a22117407c93755df5fe55feded9d7061a8bf953aecc83d2e04de648aff973b1c380b44a26fa68888e90e7486b91a1c665c033c01e2af456a7de3b0b63775d3
DIST ppx_let-0.16.0.tar.gz 15460 BLAKE2B 8cc4adb4fae276a11df36d91690ae9fa609ac923b971afe783102fc854f212dce58826d1e743e2e2a349c278ca103e80cbb203fa18dbea21adb7c6849b0c8132 SHA512 d81c98f4f87c2af2f8121ce42bd5de8910ff4d588eb1bc3a18a9594c070f261b7c7a173bb86a5fbcd67d09ad8ba436df9a210577ac05c6a98625a0bc553fb4ad

View File

@@ -0,0 +1,24 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit dune
DESCRIPTION="Monadic let-bindings"
HOMEPAGE="https://github.com/janestreet/ppx_let"
SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
DEPEND="
dev-ml/base:${SLOT}
dev-ml/findlib:=
>=dev-ml/ppxlib-0.28.0:=
>=dev-ml/ocaml-compiler-libs-0.11.0:=
dev-ml/ppx_here:=
"
RDEPEND="${DEPEND}"

View File

@@ -1,3 +1,4 @@
DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
DIST sexplib-0.15.0.tar.gz 55020 BLAKE2B 250d2d791abab87e18ad363dc2140d436cec90469156c2bd37d3de533dd219891bdc5e518d1a37eb8ee4e34f1ec5e924684f1408487d3080c5cfe4a0f32e2d69 SHA512 c31fed5e5bf48381a9b6a48085e7d8909471e38a8cc7586e3c520fe60c6df7a1eebcca1a0ca93cd4d1cc61c1c3c36211db05572273550f7218eb69dd97d27333
DIST sexplib-0.15.1.tar.gz 55000 BLAKE2B 8f93590ad1cf5fc8286a3a99711d977d36e875e531ec2149fcfebda5d95aa42f29bd0efb16073a71effd854265f15b303291c9d17f848a9fdd3dcc174baed912 SHA512 05a1cbca244286020af6c5ba1d92b32f5d7940dc409c61a8fc5ff114bec60167c8381ae997b53998ea3c0d5167ee77bf160873958512199b06efec1a2a191a7b
DIST sexplib-0.16.0.tar.gz 55015 BLAKE2B 3d4157cfc0e5906a351c0a04380582895544f95c9ad88e576764967c46614c0553b606064eab75a8561c59a9fcb353ae695f743e0eda1a61a4c66a57b24f51e3 SHA512 f924d92ddf11f12be51073a3dfca45486d90b05533f29804518ee86b93386b8ff8d7e692c71d77b11347b78e9f6f6dcf7d79b71540efe54b013fa09b3bab414a

View File

@@ -0,0 +1,23 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit dune
DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
HOMEPAGE="https://github.com/janestreet/sexplib"
SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="+ocamlopt"
RDEPEND="
=dev-ml/sexplib0-0.16*:=
dev-ml/base:${SLOT}
dev-ml/num:=
dev-ml/parsexp:${SLOT}
"
DEPEND="${RDEPEND}"

View File

@@ -1,3 +1,3 @@
DIST system-monitoring-center-2.12.0.tar.gz 538699 BLAKE2B a7e610897fb814b8caa48d28c9b2595d95cfb25522977b908e286df51160d71d5df9e03d7c5ec29ed4f162f503c346769f5247e739840edd0e91ef8c1b098951 SHA512 e7216fc5765835380e6b9c2432c99f00a57e3ffe10638752360b3ec2ccf2edbf0a5e294560ade341329bc27bdacaadc77d32c0aff84261733d9f46428f1b1686
DIST system-monitoring-center-2.14.0.tar.gz 550257 BLAKE2B 3ea3b392c08bcbdba960f03b00a65dab94e1911b53f17fe38ccbd9a7c59f38094a928184a0db488fcd7c60d80ff31a7e59e2bfdf0efda43035cfd59b0f3e38e1 SHA512 4453709b1ef937ba8582ab76b25573f9e4975f4f905284c273dc3490ff2348800fb1c6ed3bca96db4952fc9c3b7fae2fd278ed945fe5c14f8dcfcec410eca415
DIST system-monitoring-center-2.16.0.tar.gz 539510 BLAKE2B c54aee5b0adc9dc4ff698ca4f7a569510c77994513ff6ec7643bdce14ea9c9604eecf9d08b41f01cf81bdeb87a368ccdc4ab0245078b7cc038c118b6cbf26fa1 SHA512 0d18071dae2285f74ea43f6f9bafe8ee5845d411991fd2e9bb674bd0a1d5b50f8634d6d2f68190289dda396735ff3e6545cf6c8449367fc84a177099a6c00a42
DIST system-monitoring-center-2.16.1.tar.gz 539174 BLAKE2B eca36d31a5f42632611e2dec78afe94d109522e6028331587760037cdf05e334369a7491ba703262c1fd1d45817da1041a5214e1ec779d55bdf0c19c4995bfd6 SHA512 e30e3abf00d6d3612b6406d6f4439bc0f0d384dddd4ddc2059193cb06f3968bfe64d93b46c38edff4fd290a9b39b3f6d3f595ee3f3c04b125db3e41525a01205

View File

@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hakandundar34coding/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="

View File

@@ -1,7 +1,14 @@
This patch removes the dependency on libevdev from remoting/host.
commit e3612e8dcb1a43bc358248845aa4f16f4a2792c7
Author: Stephan Hartmann <stha09@googlemail.com>
Date: Fri Jun 30 19:15:09 2023 +0200
According to sultan it's not (currently(?)) used so we can avoid that dependency.
remoting: remove unused dependency on libevdev
There is only one include, but nothing of libevdev is used. Instead
linux/input.h (defines BTN_*).
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index 9e8dfee8b7d9e..5f46876222fd5 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -241,10 +241,6 @@ if (is_linux) {
@@ -15,7 +22,7 @@ According to sultan it's not (currently(?)) used so we can avoid that dependency
}
# This must be a static library instead of a source set because
@@ -572,7 +572,6 @@ static_library("common") {
@@ -576,7 +572,6 @@ static_library("common") {
"x11_display_util.cc",
"x11_display_util.h",
]
@@ -23,10 +30,15 @@ According to sultan it's not (currently(?)) used so we can avoid that dependency
libs += [ "//third_party/libei/lib64/libei.a" ]
public_deps += [
"//third_party/wayland:wayland_client",
diff --git a/remoting/host/linux/remote_desktop_portal_injector.cc b/remoting/host/linux/remote_desktop_portal_injector.cc
index f6de2b406a97f..bb40aa00328d4 100644
--- a/remoting/host/linux/remote_desktop_portal_injector.cc
+++ b/remoting/host/linux/remote_desktop_portal_injector.cc
@@ -9,7 +9,6 @@
@@ -7,9 +7,9 @@
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include <glib-object.h>
+#include <linux/input.h>
#include <poll.h>
-#include <libevdev/libevdev-uinput.h>