Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-03-20 11:18:13 +00:00
7 changed files with 11 additions and 198 deletions

View File

@@ -1,9 +1,6 @@
DIST obsidian-1.4.16-amd64.tar.gz 99705807 BLAKE2B dd3297f3e81d096f0f480dbbda6b57f3a286643c3724232c65b64ff1cf2b26aa7df9290837da5e056095bf121b87a0d6cd6195de78ff4894a5f0d1b3c7c652da SHA512 ee51369c2067cc99b8c3351fc91f05e9b9edbc35f84d5c1bdcdab6c144fe95e8b4443d0223562fae595c53c23fc30abb4bf65f2f36e5b85d190009c49452ce0c
DIST obsidian-1.4.16-arm64.tar.gz 100139135 BLAKE2B 2f49e5e6d3424c8c6bd617279da75c808744742ce5c27785b3856150023d0e514d09d9a315284b851d904886cac6499d00c8df98ab0a9eb72acc52bf5aa9b38a SHA512 140b3c26df79c95ed23d82b3b6859114f0ff74f9b92715e915b8b6b2733cb18d0233053ce4497ca0703a6cdb3df2d2f22110ca873720fb66e4e7e248efcd89dc
DIST obsidian-1.4.16.gh.deb 73362498 BLAKE2B 15a2631dc22f8833fe79166ed09f5da9013a89ba9f28acd8bb819a75b3ed2393162fab070ea810257224b6d0ef30e439b831c63d198c1a941587f8254a461b33 SHA512 3b691188a05e20e0d1792a6b135076d3dabe33106e541ae4614703fdea44bcb64fc52bbd62808325c381f28348e37cbde0e3d072e4e1b077fb2b9728c43edb05
DIST obsidian-1.5.3-amd64.tar.gz 99822395 BLAKE2B 03743ac61135f8139ce6e0e0a30335415e0af1f6402a62679ec69c832a7c2305ee998c64f584125eab99a82295e8cd16cef237f9f97370ec180069dafd3bc58e SHA512 8da9329175d7cc7947186ab839621d6043cc4a9eac11335c7f234267c1e5804c21d2241121868664ca70435d124a7c242bc46ed40585b9bdd1c55009672f3390
DIST obsidian-1.5.3-arm64.tar.gz 100258718 BLAKE2B c99c78e48db61bf89e0c6a27cc454ab1a1ceca95b71a82ab3b8933c5413dd87ec7dd5bd847ab95353978d80f4da39a955c4114ed94aa18d621a5a6083321857f SHA512 d429904af6bd46a06250cf3ace5fb9ff2ddf0d8b4765eb94a3a4ae4183fe6af79d0b76edf5fa496441d266df842a3c332a7e975b1ef6761cf4b98ad0b63942de
DIST obsidian-1.5.3.gh.deb 73415050 BLAKE2B 10a0ea6eabfd4d00bb33e2cc9a6b5f28df3ca7cea2a33cf27895b74805dd25e0eb3ac342b7d80dcb741e18a9f263ca5fc200433006c8bc4253f12ce78d235e7c SHA512 1d60cd8c1c0f1eff3f8937a4a3117b13fadbc0311a4c490510262e4335927bd4826e895cbefdaf2e1172f45a39608cf102dc1c950c384a3015c387ebe2fb26cf
DIST obsidian-1.5.11-amd64.tar.gz 107180896 BLAKE2B f4508b0123ccfd64acd113490ed591205e4b204ea837e1c320a9e4c9c5a30e68d27df19dfe213ac12bbc57219a00680adecab4a31a6a36853632d95e95b3f62c SHA512 bf1e9b52afa0c48347d532bc47b9625fa6c03ac884c899882e73e3464b257d8dfd89e32a5551d89b054e906c2e5078f2152af16ad16a746437e330ffe48dab7a
DIST obsidian-1.5.11-arm64.tar.gz 106911612 BLAKE2B 438119f8eea0cd14578704eab899f9493b2ecb6b5e0abe48e97914215bc74259d32dff82c96f4b40553d0b2905c34f94d041b1cab934fe30b7bc0d3027552327 SHA512 9336bfe16c076dd83514bcd86137616d260bb0a2bd430504beb83ca5a92fc24af09bdd00a2b89bffb831099504947dd94efc8d972fa4c1da451e742745f89bb6
DIST obsidian-1.5.11.gh.deb 78667536 BLAKE2B 7daa4827fc45573ea07f6bd93f9f9523a7c32286b06478ceb9999332b83d54edc9dcbc989d81e24d2a4f8d2393a87efe607c9eef5c392f8a9d408eb763bc29d6 SHA512 ac7b1edb3c377130ef6086cad419db5f602014160c7fe857b7552a1e84415c0e4a4c022c63fadf9c69ef9420fd516ff04f4c4db3003ef0650e6be9b751d1dfc4
DIST obsidian-1.5.8-amd64.tar.gz 107058177 BLAKE2B 508e8241a40392efcceaed00fe5221afa9f9311b74d8704c92a45765eee2c3e5482676bf634fc537dd49ff3a77e8a2c7909416c1769bf1b8fa61801cbc9b22bb SHA512 1569c6b238fddbbd0be03e0d1935aa7d4d19ea580aceb3fef5165144c6accd39e82eefbc7c801e8bdf64313dbcca3607ca3df6dee01663a9a01f7a1ab57ca82d
DIST obsidian-1.5.8-arm64.tar.gz 106789020 BLAKE2B 024327f2d55dbd7779672e4a51583d3997be0903c785ff990742afe1b7e5fd536c9ff2637168d7c9a3815cc67c77215c1b772db4a96cfb270af147bda620b5ff SHA512 ebdd067e058728409d24f0710da374e8a904ae4a66f1eb20b09f8ba1d9768176e19c1c22e08384f866510c294dc7f05715e2e10da32606b18979f3ceeb510c44
DIST obsidian-1.5.8.gh.deb 78625030 BLAKE2B e4bb164b484072b3ea1c70242e60e89022101475191fc5ae3933c7596b78e5bed9ed840abec394653616777222b8e66e5b504789fe888dbed581518ce83ca94c SHA512 f5308bd94a80d70e1eb74862f54dc8ce5a0818544c2fd329f3fd7818d6748ecdbeac710ac4438d677e742c955161a7a5513afbe99303e54ba20ee65da3c62bd0

View File

@@ -1,180 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CHROMIUM_VERSION="102"
CHROMIUM_LANGS="
af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
sw ta te th tr uk ur vi zh-CN zh-TW
"
inherit chromium-2 desktop linux-info unpacker xdg
DESCRIPTION="A second brain, for you, forever."
HOMEPAGE="https://obsidian.md/"
# For some reason, the main binary tarballs don't include the .desktop file or
# icon. The .deb does. One would hope then, that we could just download the .deb
# for each arch, but they only generate a .deb for amd64. Maybe we can get them
# to fix this, but in the meantime, we download the .deb purely to get the
# .desktop file and app icon out of it.
SRC_URI="
https://github.com/obsidianmd/obsidian-releases/releases/download/v${PV}/${P/-/_}_amd64.deb -> ${P}.gh.deb
amd64? ( https://github.com/obsidianmd/obsidian-releases/releases/download/v${PV}/${P}.tar.gz -> ${P}-amd64.tar.gz )
arm64? ( https://github.com/obsidianmd/obsidian-releases/releases/download/v${PV}/${P}-arm64.tar.gz )
"
RESTRICT="mirror strip bindist"
LICENSE="Obsidian-EULA"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
IUSE="appindicator"
RDEPEND="
>=app-accessibility/at-spi2-core-2.46.0:2
app-crypt/libsecret[crypt]
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
media-libs/fontconfig
media-libs/mesa[gbm(+)]
net-print/cups
sys-apps/dbus
sys-apps/util-linux
sys-libs/glibc
x11-libs/cairo
x11-libs/libdrm
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/libXScrnSaver
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libxcb
x11-libs/libxkbcommon
x11-libs/libxshmfence
x11-libs/pango
appindicator? ( dev-libs/libayatana-appindicator )
"
DIR="/opt/${PN^}"
# deb gets extracted to WORKDIR. actual program gets extracted to its own dir
# which depends on CPU arch.
S="${WORKDIR}"
QA_PREBUILT="*"
CONFIG_CHECK="~USER_NS"
set_obsidian_src_dir() {
if use amd64; then
S_OBSIDIAN="${WORKDIR}/${P}"
elif use arm64; then
S_OBSIDIAN="${WORKDIR}/${P}-arm64"
else
die "Obsidian only supports amd64 and arm64"
fi
}
src_configure() {
default
chromium_suid_sandbox_check_kernel_config
}
src_prepare() {
default
# cleanup languages
set_obsidian_src_dir
pushd "${S_OBSIDIAN}/locales/" >/dev/null || die "location change for language cleanup failed"
chromium_remove_language_paks
popd >/dev/null || die "location reset for language cleanup failed"
# Create separate .desktop file for launching Obsidian with native wayland
# support.
#
# Obsidian is an Electron app, and Electron can be instructed to run in
# native-wayland mode by turning on the Ozone platform. However, doing this
# causes Obsidian to crash on some users' systems, while it works fine for
# others. (see https://bugs.gentoo.org/915899)
#
# It appears VSCode may have encountered a similar issue, because VSCode
# installs two separate .desktop files, one for launching with wayland
# support and one for launching without. We will do the same here.
# Create a copy of upstream's .desktop
cp usr/share/applications/obsidian.desktop \
usr/share/applications/obsidian-wayland.desktop \
|| die "failed to create obsidian-wayland.desktop file"
# Edit the Exec & Name
sed -i \
'
# Add Electron ozone enable flags to obsidian execution
/Exec/s/obsidian /obsidian --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations /
# Give this .desktop file a new name/desc of "Obsidian Wayland"
/^Name/s/$/ Wayland/
# comment field
/^Comment/s/$/ with Wayland support enabled/
' \
'usr/share/applications/obsidian-wayland.desktop' ||
die "sed failed for obsidian-wayland.desktop file"
}
src_install() {
insinto "${DIR}"
exeinto "${DIR}"
set_obsidian_src_dir
pushd "${S_OBSIDIAN}" >/dev/null || die "location change for main install failed"
doexe obsidian chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1
doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin \
v8_context_snapshot.bin vk_swiftshader_icd.json
insopts -m0755
doins -r locales resources
# Chrome-sandbox requires the setuid bit to be specifically set.
# see https://github.com/electron/electron/issues/17972
fowners root "${DIR}/chrome-sandbox"
fperms 4711 "${DIR}/chrome-sandbox"
[[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler
popd >/dev/null || die "location reset for main install failed"
dosym "${DIR}/obsidian" "/usr/bin/obsidian"
if use appindicator; then
dosym ../../usr/lib64/libayatana-appindicator3.so "${DIR}/libappindicator3.so"
fi
domenu usr/share/applications/obsidian.desktop
domenu usr/share/applications/obsidian-wayland.desktop
for size in 16 32 48 64 128 256 512; do
doicon --size ${size} usr/share/icons/hicolor/${size}x${size}/apps/${PN}.png
done
}
pkg_postinst() {
xdg_pkg_postinst
ewarn "Some users have reported that running Obsidian with native Wayland"
ewarn "support causes the software to crash. Others have it working"
ewarn "without issue. See https://bugs.gentoo.org/915899"
ewarn ""
ewarn "This package now provides application entries for both Obsidian and"
ewarn "Obsidian Wayland. If Obsidian Wayland breaks for you under Wayland,"
ewarn "try the other Obsidian entry to launch with XWayland"
}

View File

@@ -62,6 +62,7 @@ DIST dialoguer-47a9d4df729db7ffc1492bd0845be786e6f20153.gh.tar.gz 27026 BLAKE2B
DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
DIST displaydoc-0.2.4.crate 23200 BLAKE2B 91b0ae7018109d407095060b6bbd6aed1cc21120bc30348e8b16b5121f7c35ab72b65e80bf97dbea6cb4ee6b4d5215e8e5c4374f92a569697bc9c862348620cd SHA512 a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592
DIST dotenvy-0.15.7.crate 20293 BLAKE2B 89a205ca637c31678fdc7249212a6a71a10bea47607279087f719a4929ca30e27f5cf74d4560390ddbb825a58bebc8851a82c3c6ed525922a74206a85bbde6f2 SHA512 208eba7f7d012b71dbdd19d27fad4fa1d2982507d3362167fab72ce819f44972ac0dab6a10f3842f3f8b44d979cf8517240fa4249ee066f4806ef4e38e343bfc
DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
@@ -183,7 +184,7 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78
DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
DIST rustls-0.21.10.crate 284920 BLAKE2B eb4628b6e0384fa7cbb5468c75c11512eb111a8a7dc7c655c6ac6beac72fc3025b1a590324ec3275ba66b632dab14dd78da4d62c1c66b2c2502099ad153900f5 SHA512 3bfcd137e6d4d86c716e8afe75450a39ca055d44557fd1a8d4b6ad4d7c58e2d5fb86ba92c3825a667c9daf5bd7a89a779ffcf8c23d6cd0af05ad47ad437da139
DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
DIST rye-0.29.0.tar.gz 1459467 BLAKE2B 56f562c086c317767abcfbef9fc31eb2036dfee52167a041edbf36c6035a9f5c03d824b6986541785f8b6950e61e282f8e2417fc0982ec4eeb06c941f378d4a9 SHA512 f056c2f52aebf342a3788c1b991077d881305f0b3131e0453c84fc8186e4e726592c80b585618693046fbb9d33ca8d8a1ecbc05cca2662b90d742fdbfc61ae9a
DIST rye-0.30.0.tar.gz 1462536 BLAKE2B e78e70bfefe56576ce845ec695b900ca879f43e1fe0409f69bdb5bd6da9b39c0553b426644a68c7513904ab1330bd90b4953df7649e5b0cd3896da7d31782ae4 SHA512 1cc791d4a2b8a9bf3e63bf6e8d8a5af44a318491cc62822781f43db9ecdbf68ad53688570f85f6cad13aad6c9e24ca9225cab4e540f9252e921552cccdfdce1e
DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c

View File

@@ -69,6 +69,7 @@ CRATES="
digest@0.10.7
digest@0.9.0
displaydoc@0.2.4
dotenvy@0.15.7
either@1.9.0
encode_unicode@0.3.6
encoding_rs@0.8.33
@@ -334,6 +335,7 @@ src_test() {
--skip test_is_inside_git_work_tree
# The following tests require network access.
--skip test_add
--skip test_dotenv
--skip test_config
--skip test_init
--skip test_lint_and_format

View File

@@ -1 +1 @@
DIST sway-launcher-desktop-1.5.4.tar.gz 38905 BLAKE2B 3bcc1902f5cbc36a8fcdef290fd498046d4e74683aea1d2ee2a5e93470e0e0da7ce52c2aca8d417e067affba70a03183c4cb3b2d54a09be666b4ba1c722fa81b SHA512 8ff9b7b3bfe84d8b5d3ba0f27bf5a24159329fd4e0f9bb18de070b66e9339ac999afb4651cae3900f60e486e34a9dbac70081b93d46176133aa503d05f4efd9e
DIST sway-launcher-desktop-1.7.0.tar.gz 40468 BLAKE2B d70ecebcc3661760ae9c51886f89ef9d60dd8bba3c9420649df1a27d0ce79255ed5339e34f695e5cafeb889e2b4c6019ca4483d597e3df9b8dea1fc3a7d51b86 SHA512 900657f1ef2073b1e291ef9affb361b1eb010f2599bfa9c5f1b027dbd7d76abba2d5470ed415431eb6f413f45f09b390e77243189ce7c2c335902b6bfeca19be

View File

@@ -1,4 +1,4 @@
# Copyright 2021 Gentoo Authors
# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,15 +11,8 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="app-shells/fzf"
RDEPEND="${DEPEND}"
src_prepare() {
default
mv "${PN}.sh" "${PN}" || die
}
RDEPEND="app-shells/fzf"
src_install() {
exeinto "/usr/bin"
doexe "${PN}"
newbin ${PN}.sh ${PN}
}