From 8edc8fdcadacac8312dc2ddf1619f9aba6750229 Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Wed, 19 Apr 2023 23:54:45 +0400 Subject: [PATCH 1/6] app-office/nixnote-bin: bump to 2.1.9 Signed-off-by: Vitaly Zdanevich --- app-office/nixnote-bin/Manifest | 2 +- .../{nixnote-bin-2.1.8.ebuild => nixnote-bin-2.1.9.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app-office/nixnote-bin/{nixnote-bin-2.1.8.ebuild => nixnote-bin-2.1.9.ebuild} (100%) diff --git a/app-office/nixnote-bin/Manifest b/app-office/nixnote-bin/Manifest index e312592221..dc8b8ee247 100644 --- a/app-office/nixnote-bin/Manifest +++ b/app-office/nixnote-bin/Manifest @@ -1 +1 @@ -DIST NixNote2-x86_64.AppImage 55858368 BLAKE2B 2a0dba60b342d405ac1d3a392da5f9eb768b39c60f706b6fe0ac9ae7888ef5f33673edc34c4c8513b87d98178ab84165d4c6216081346b94ca6471c3626eed10 SHA512 9d2992afe7bcf5c466b08dbcc608554b1adca6f8063de38f6945ef5f15f3672b6f6462df81318b13bb3eb4c219eb2278a07b2cb3776d7c889f25be47591ea7c3 +DIST NixNote2-x86_64.AppImage 54666432 BLAKE2B f4b47ccdae51446408e33f80c81e0336e98a6230ed3e688d585c8c0c34b9207520244152bd388cc12b83a9dafb5e55e6bbcac14278f4670be452377043dc0528 SHA512 0ee6916032767a5dcf3688359e6cfa8243a65f9a1faef34ec22d30aaf1ba5e8880812d9f4d8c6154ad9f08a325da562694fbb53e735e7f4c5a5b12fa29ecde6d diff --git a/app-office/nixnote-bin/nixnote-bin-2.1.8.ebuild b/app-office/nixnote-bin/nixnote-bin-2.1.9.ebuild similarity index 100% rename from app-office/nixnote-bin/nixnote-bin-2.1.8.ebuild rename to app-office/nixnote-bin/nixnote-bin-2.1.9.ebuild From be1dad42ac40708fd9daa842b2156a0a7b59bd8e Mon Sep 17 00:00:00 2001 From: Michael Egger Date: Thu, 20 Apr 2023 00:29:21 +0200 Subject: [PATCH 2/6] net-p2p/trezord-go: add 2.0.33, drop 2.0.32-r1 Signed-off-by: Michael Egger --- net-p2p/trezord-go/Manifest | 2 +- .../{trezord-go-2.0.32-r1.ebuild => trezord-go-2.0.33.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net-p2p/trezord-go/{trezord-go-2.0.32-r1.ebuild => trezord-go-2.0.33.ebuild} (100%) diff --git a/net-p2p/trezord-go/Manifest b/net-p2p/trezord-go/Manifest index d9eb84eb0b..2f15d9f3fa 100644 --- a/net-p2p/trezord-go/Manifest +++ b/net-p2p/trezord-go/Manifest @@ -18,4 +18,4 @@ DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod 40 BLAKE2B 33144c2d7 DIST gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip 17854 BLAKE2B 5580929fb891fd24550919ed250bbf70129f991a250669895a8b22d40ec40e691646dee8c243b39ce5f36accdfd749d46276b0358daf0512371f09f516819949 SHA512 26024daf1aec9a7b1e760b6fe789dd66d3f8300a9b413098c044d3f7c47d050dbad9809f9c807a1c8eb45d9d12d1821a45c8c8f0b14a96cfdf9752e271bb4de4 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42 -DIST trezord-go-2.0.32.tar.gz 645142 BLAKE2B 54f287b85f1be2e82ddbf931752d3434bc5c4c89d097eb5fc885989c03989f16838b988bd5df003b74d464cb92475a1add7a4eb947ed4df52dfff845bc20006a SHA512 370cd5978d35ab0dbca5870590145b780208b49d87590fc2c778fce11be44d226f8dfec3b5ec11b2ad1a59ca722740e46bd7e88e108bce880fa7b582d20f5aa8 +DIST trezord-go-2.0.33.tar.gz 645382 BLAKE2B 86e267923a1e7e056d4de98a31e370928d4300b6ccb84f756ca3414468d11c0c70ea57649382b15696215f39d4544d9e03475fd2f1c2000c12f53e40b55c6010 SHA512 c4e12f519b42c6c2856b2a6a678e8c572676658e399de38afa41e3e319cb3e4760a01e7a2c3b34504c44324b85a7e63fab973d9cb5409c80861a138e7ecef49f diff --git a/net-p2p/trezord-go/trezord-go-2.0.32-r1.ebuild b/net-p2p/trezord-go/trezord-go-2.0.33.ebuild similarity index 100% rename from net-p2p/trezord-go/trezord-go-2.0.32-r1.ebuild rename to net-p2p/trezord-go/trezord-go-2.0.33.ebuild From 5f66b372931a2a254477711cb5bf0eb7087e22c7 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Wed, 19 Apr 2023 19:19:23 -0400 Subject: [PATCH 3/6] dev-python/sphinxcontrib-zopeext: importlib_metadata -> importlib-metadata Signed-off-by: Julien Roy --- .../sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2.ebuild b/dev-python/sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2.ebuild index 1828bf93eb..5780bb9fba 100644 --- a/dev-python/sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2.ebuild +++ b/dev-python/sphinxcontrib-zopeext/sphinxcontrib-zopeext-0.4.2.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-python/importlib_metadata[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] " From e9e051cd7b6a4e18de16e975106ebb9c2a5d699c Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Wed, 19 Apr 2023 19:20:32 -0400 Subject: [PATCH 4/6] net-misc/maestral: importlib_metadata -> importlib-metadata Signed-off-by: Julien Roy --- net-misc/maestral/maestral-1.7.1.ebuild | 4 ++-- net-misc/maestral/maestral-1.7.2_rc0.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/maestral/maestral-1.7.1.ebuild b/net-misc/maestral/maestral-1.7.1.ebuild index 33e31a844f..93c2ae0344 100644 --- a/net-misc/maestral/maestral-1.7.1.ebuild +++ b/net-misc/maestral/maestral-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ RDEPEND=" >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] =dev-python/dropbox-11*[${PYTHON_USEDEP}] >=dev-python/fasteners-0.15[${PYTHON_USEDEP}] - dev-python/importlib_metadata[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] diff --git a/net-misc/maestral/maestral-1.7.2_rc0.ebuild b/net-misc/maestral/maestral-1.7.2_rc0.ebuild index 33e31a844f..93c2ae0344 100644 --- a/net-misc/maestral/maestral-1.7.2_rc0.ebuild +++ b/net-misc/maestral/maestral-1.7.2_rc0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ RDEPEND=" >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}] =dev-python/dropbox-11*[${PYTHON_USEDEP}] >=dev-python/fasteners-0.15[${PYTHON_USEDEP}] - dev-python/importlib_metadata[${PYTHON_USEDEP}] + dev-python/importlib-metadata[${PYTHON_USEDEP}] >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}] >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] From be17f9a6e5a93ec7bf73eaa8364b46beef999a09 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Wed, 19 Apr 2023 19:21:04 -0400 Subject: [PATCH 5/6] dev-python/fake-useragent: importlib_resources -> importlib-resources Signed-off-by: Julien Roy --- dev-python/fake-useragent/fake-useragent-1.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/fake-useragent/fake-useragent-1.1.2.ebuild b/dev-python/fake-useragent/fake-useragent-1.1.2.ebuild index 8cb00b81d5..5da9302018 100644 --- a/dev-python/fake-useragent/fake-useragent-1.1.2.ebuild +++ b/dev-python/fake-useragent/fake-useragent-1.1.2.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~amd64" RDEPEND=" $(python_gen_cond_dep \ - 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_9 + 'dev-python/importlib-resources[${PYTHON_USEDEP}]' python3_9 ) " From 2a3d6df251e5c4b0495f0812d41dd3a591c5892f Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 20 Apr 2023 12:26:25 +0800 Subject: [PATCH 6/6] media-gfx/zw3d: fix wayland crash issue Signed-off-by: Huang Rui --- media-gfx/zw3d/zw3d-2023.0.3.1.ebuild | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild index ff1cdd0c6d..0c655df975 100644 --- a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild +++ b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild @@ -131,6 +131,20 @@ sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$* ln -s /opt/apps/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die + # Fix zw3d startup file +cat >> insert.txt <<- EOF || die +unset WAYLAND_DISPLAY +export XDG_SESSION_TYPE=x11 +export QT_QPA_PLATFORM=xcb +export QT_AUTO_SCREEN_SCALE_FACTOR=1 +export QT_STYLE_OVERRIDE=fusion +export IBUS_USE_PORTAL=1 + EOF + + sed -i \ + -e '/export LD_LIBRARY_PATH/r insert.txt' \ + "${S}"/opt/apps/${MY_PGK_NAME}/files/zw3drun.sh || die + # Use system libraries # rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die # rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die