Merge updates from master

This commit is contained in:
Repository mirror & CI
2023-04-20 04:46:49 +00:00
9 changed files with 22 additions and 8 deletions

View File

@@ -1 +1 @@
DIST NixNote2-x86_64.AppImage 55858368 BLAKE2B 2a0dba60b342d405ac1d3a392da5f9eb768b39c60f706b6fe0ac9ae7888ef5f33673edc34c4c8513b87d98178ab84165d4c6216081346b94ca6471c3626eed10 SHA512 9d2992afe7bcf5c466b08dbcc608554b1adca6f8063de38f6945ef5f15f3672b6f6462df81318b13bb3eb4c219eb2278a07b2cb3776d7c889f25be47591ea7c3
DIST NixNote2-x86_64.AppImage 54666432 BLAKE2B f4b47ccdae51446408e33f80c81e0336e98a6230ed3e688d585c8c0c34b9207520244152bd388cc12b83a9dafb5e55e6bbcac14278f4670be452377043dc0528 SHA512 0ee6916032767a5dcf3688359e6cfa8243a65f9a1faef34ec22d30aaf1ba5e8880812d9f4d8c6154ad9f08a325da562694fbb53e735e7f4c5a5b12fa29ecde6d

View File

@@ -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
)
"

View File

@@ -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}]
"

View File

@@ -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

View File

@@ -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}]

View File

@@ -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}]

View File

@@ -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