From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CC4C15802C for ; Thu, 19 Dec 2024 11:41:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6891EE07EF; Thu, 19 Dec 2024 11:41:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5DEBFE07EF for ; Thu, 19 Dec 2024 11:41:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 575CE335D72 for ; Thu, 19 Dec 2024 11:41:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A49DE1AB5 for ; Thu, 19 Dec 2024 11:41:18 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1734608403.9a0f1f1fdbf2b06e57cf15856fb364c51a2583c9.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-office/obsidian/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-office/obsidian/Manifest app-office/obsidian/obsidian-1.7.7.ebuild X-VCS-Directories: app-office/obsidian/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 9a0f1f1fdbf2b06e57cf15856fb364c51a2583c9 X-VCS-Branch: dev Date: Thu, 19 Dec 2024 11:41:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 45feb077-1434-4ef6-ae91-28ea1c12b6e3 X-Archives-Hash: 18f56d15b53ab2704e4a2ed373557cff commit: 9a0f1f1fdbf2b06e57cf15856fb364c51a2583c9 Author: Luke Schwager blucobalt dev> AuthorDate: Mon Dec 16 01:18:00 2024 +0000 Commit: David Roman gmail com> CommitDate: Thu Dec 19 11:40:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9a0f1f1f app-office/obsidian: add 1.7.7 Signed-off-by: Luke Schwager blucobalt.dev> Closes: https://github.com/gentoo/guru/pull/268 Signed-off-by: David Roman gmail.com> app-office/obsidian/Manifest | 3 + app-office/obsidian/obsidian-1.7.7.ebuild | 180 ++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/app-office/obsidian/Manifest b/app-office/obsidian/Manifest index 7b5ff9d00..8b4309cd6 100644 --- a/app-office/obsidian/Manifest +++ b/app-office/obsidian/Manifest @@ -4,3 +4,6 @@ DIST obsidian-1.6.7.gh.deb 79172558 BLAKE2B 1665e1bc2b9e298a3c7560dec159736c9f27 DIST obsidian-1.7.4-amd64.tar.gz 109408630 BLAKE2B d3175d0596bd9a53a73d642b5fd197ddc2265654d4901c626f5469721492820e98e3e7bc67898cd731b2521c1c8530499371ed77cbcfe1ea997eb85c07a5a559 SHA512 6c95b4d40abc7f9b69d8804d1d21279b6f0e61e60c4e0e2600876bee97810307bcd3aa9294ec65bffe3875caa3fb99ffcc3155bb03d401ce372e436c595ce59c DIST obsidian-1.7.4-arm64.tar.gz 109412252 BLAKE2B 217a555d131c406b9675768f563603503ede652fe24837b4cb17b68d949b94e20734a4ecd9d0cfcdd7b28c14d3cb29fcab8597a197d313748f1e7a0da31e1f37 SHA512 7c896521bfea5fb4a82758a98e7b13702a4e8891ac8ea6bcec12150e20a911a96f01aaa0aba7c79ee186cacface22b8bad94ea6c439b627f3397a8255b88dc0c DIST obsidian-1.7.4.gh.deb 79977146 BLAKE2B fef2803d620dc1c1219e8186c1f8b977c6e1bb642d4d8fd4fccc220dd794c2cfca3f3653430c5e3914ab9478fba00b2b786c0e0c451ea54e9e7b6313038d0366 SHA512 b10934513354ba565115851eb84ec5235ad738c146a088d02e70abd242486b4efc908de2e01850914e1464fe0f70ca0bd159325ea5efaab1d14d2b5f4c6c68ac +DIST obsidian-1.7.7-amd64.tar.gz 111265129 BLAKE2B 30144107eac3f4c9af04dd384b1db4dae50a130e7794259d85fd2bf62de60f1edb9bae4dd58ef9cf4969650fef25ebd9ef5e5ab2b20cfa7670600168b21ece88 SHA512 4b66fff65277f11cdba14599e7260fcbf2eb8de616b5a9da4f52d23698f5d657150277709756f95815c1e535ff0df38677eb5b3c8069915df3aa6218471867dc +DIST obsidian-1.7.7-arm64.tar.gz 111284715 BLAKE2B e0d1e6800b79f8f15b046e1bb5319807d62d56e5e7de00d629b40f2a54142502fa2fe5d0150b147079487bd7cbbde4b9fd1e53b433b1f1ca86db7fbe80b723da SHA512 ba66d45030107135b4af837b9fd527c1630af33b402269e5d057ff6f692092504f3adc8cf3210bdabab463a1c93384fd03a69b6d7108edb9590cb4c26e869696 +DIST obsidian-1.7.7.gh.deb 81043738 BLAKE2B f1a940a1e887ff5a2c86fd5b2e21ecac02a867fd7c1bc96403bb932b2b63be86acbca1bb3cdc0cc3f308b6e04a28be39c7fe1730735a28840cf11723086b9354 SHA512 cd8f95840b8ee2a804cffd516c57502f2af37dc8a3b18578f0b1fee296f686a95d08e81e339ae0b3ca73f00fc8a3631e4ff1057729ed0032ff99380310ad17e8 diff --git a/app-office/obsidian/obsidian-1.7.7.ebuild b/app-office/obsidian/obsidian-1.7.7.ebuild new file mode 100644 index 000000000..d591e2e37 --- /dev/null +++ b/app-office/obsidian/obsidian-1.7.7.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2024 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 ) +" + +DIR="/opt/${PN^}" + +# deb gets extracted to WORKDIR. actual program gets extracted to its own dir +# which depends on CPU arch. +S="${WORKDIR}" + +LICENSE="Obsidian-EULA" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="appindicator wayland" +RESTRICT="mirror strip bindist" + +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 ) +" + +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 + if use wayland; then + domenu usr/share/applications/obsidian-wayland.desktop + fi + + 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" +} From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A3B215802D for ; Fri, 20 Dec 2024 00:36:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D630DE08BB; Fri, 20 Dec 2024 00:36:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF89EE08BB for ; Fri, 20 Dec 2024 00:36:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 073EB33FDEE for ; Fri, 20 Dec 2024 00:36:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCD6E1F9A for ; Fri, 20 Dec 2024 00:36:27 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1734608403.9a0f1f1fdbf2b06e57cf15856fb364c51a2583c9.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-office/obsidian/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-office/obsidian/Manifest app-office/obsidian/obsidian-1.7.7.ebuild X-VCS-Directories: app-office/obsidian/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 9a0f1f1fdbf2b06e57cf15856fb364c51a2583c9 X-VCS-Branch: master Date: Fri, 20 Dec 2024 00:36:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0bb44aeb-39a1-4898-a676-d63850a60d96 X-Archives-Hash: 6647c00773a2cdb628c346a15c7201cd Message-ID: <20241220003627.PmOYvQrisjHxuILQA6FVTz9pzuzWPvZOkYmBDyMIvdA@z> commit: 9a0f1f1fdbf2b06e57cf15856fb364c51a2583c9 Author: Luke Schwager blucobalt dev> AuthorDate: Mon Dec 16 01:18:00 2024 +0000 Commit: David Roman gmail com> CommitDate: Thu Dec 19 11:40:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9a0f1f1f app-office/obsidian: add 1.7.7 Signed-off-by: Luke Schwager blucobalt.dev> Closes: https://github.com/gentoo/guru/pull/268 Signed-off-by: David Roman gmail.com> app-office/obsidian/Manifest | 3 + app-office/obsidian/obsidian-1.7.7.ebuild | 180 ++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/app-office/obsidian/Manifest b/app-office/obsidian/Manifest index 7b5ff9d00..8b4309cd6 100644 --- a/app-office/obsidian/Manifest +++ b/app-office/obsidian/Manifest @@ -4,3 +4,6 @@ DIST obsidian-1.6.7.gh.deb 79172558 BLAKE2B 1665e1bc2b9e298a3c7560dec159736c9f27 DIST obsidian-1.7.4-amd64.tar.gz 109408630 BLAKE2B d3175d0596bd9a53a73d642b5fd197ddc2265654d4901c626f5469721492820e98e3e7bc67898cd731b2521c1c8530499371ed77cbcfe1ea997eb85c07a5a559 SHA512 6c95b4d40abc7f9b69d8804d1d21279b6f0e61e60c4e0e2600876bee97810307bcd3aa9294ec65bffe3875caa3fb99ffcc3155bb03d401ce372e436c595ce59c DIST obsidian-1.7.4-arm64.tar.gz 109412252 BLAKE2B 217a555d131c406b9675768f563603503ede652fe24837b4cb17b68d949b94e20734a4ecd9d0cfcdd7b28c14d3cb29fcab8597a197d313748f1e7a0da31e1f37 SHA512 7c896521bfea5fb4a82758a98e7b13702a4e8891ac8ea6bcec12150e20a911a96f01aaa0aba7c79ee186cacface22b8bad94ea6c439b627f3397a8255b88dc0c DIST obsidian-1.7.4.gh.deb 79977146 BLAKE2B fef2803d620dc1c1219e8186c1f8b977c6e1bb642d4d8fd4fccc220dd794c2cfca3f3653430c5e3914ab9478fba00b2b786c0e0c451ea54e9e7b6313038d0366 SHA512 b10934513354ba565115851eb84ec5235ad738c146a088d02e70abd242486b4efc908de2e01850914e1464fe0f70ca0bd159325ea5efaab1d14d2b5f4c6c68ac +DIST obsidian-1.7.7-amd64.tar.gz 111265129 BLAKE2B 30144107eac3f4c9af04dd384b1db4dae50a130e7794259d85fd2bf62de60f1edb9bae4dd58ef9cf4969650fef25ebd9ef5e5ab2b20cfa7670600168b21ece88 SHA512 4b66fff65277f11cdba14599e7260fcbf2eb8de616b5a9da4f52d23698f5d657150277709756f95815c1e535ff0df38677eb5b3c8069915df3aa6218471867dc +DIST obsidian-1.7.7-arm64.tar.gz 111284715 BLAKE2B e0d1e6800b79f8f15b046e1bb5319807d62d56e5e7de00d629b40f2a54142502fa2fe5d0150b147079487bd7cbbde4b9fd1e53b433b1f1ca86db7fbe80b723da SHA512 ba66d45030107135b4af837b9fd527c1630af33b402269e5d057ff6f692092504f3adc8cf3210bdabab463a1c93384fd03a69b6d7108edb9590cb4c26e869696 +DIST obsidian-1.7.7.gh.deb 81043738 BLAKE2B f1a940a1e887ff5a2c86fd5b2e21ecac02a867fd7c1bc96403bb932b2b63be86acbca1bb3cdc0cc3f308b6e04a28be39c7fe1730735a28840cf11723086b9354 SHA512 cd8f95840b8ee2a804cffd516c57502f2af37dc8a3b18578f0b1fee296f686a95d08e81e339ae0b3ca73f00fc8a3631e4ff1057729ed0032ff99380310ad17e8 diff --git a/app-office/obsidian/obsidian-1.7.7.ebuild b/app-office/obsidian/obsidian-1.7.7.ebuild new file mode 100644 index 000000000..d591e2e37 --- /dev/null +++ b/app-office/obsidian/obsidian-1.7.7.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2024 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 ) +" + +DIR="/opt/${PN^}" + +# deb gets extracted to WORKDIR. actual program gets extracted to its own dir +# which depends on CPU arch. +S="${WORKDIR}" + +LICENSE="Obsidian-EULA" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="appindicator wayland" +RESTRICT="mirror strip bindist" + +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 ) +" + +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 + if use wayland; then + domenu usr/share/applications/obsidian-wayland.desktop + fi + + 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" +}