public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Artemis Everfree" <artemis@artemis.sh>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-office/obsidian/
Date: Sun, 16 Jun 2024 03:12:56 +0000 (UTC)	[thread overview]
Message-ID: <1718507534.b81ec6ad4a0fa73b4ae22adbcb0a19896deda805.artemis@gentoo> (raw)

commit:     b81ec6ad4a0fa73b4ae22adbcb0a19896deda805
Author:     Artemis Everfree <artemis <AT> artemis <DOT> sh>
AuthorDate: Sun Jun 16 03:12:14 2024 +0000
Commit:     Artemis Everfree <artemis <AT> artemis <DOT> sh>
CommitDate: Sun Jun 16 03:12:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b81ec6ad

app-office/obsidian: add 1.6.3

Signed-off-by: Artemis Everfree <artemis <AT> artemis.sh>

 app-office/obsidian/Manifest              |   3 +
 app-office/obsidian/obsidian-1.6.3.ebuild | 178 ++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)

diff --git a/app-office/obsidian/Manifest b/app-office/obsidian/Manifest
index 28702d8ef..41fd79a37 100644
--- a/app-office/obsidian/Manifest
+++ b/app-office/obsidian/Manifest
@@ -4,3 +4,6 @@ DIST obsidian-1.5.11.gh.deb 78667536 BLAKE2B 7daa4827fc45573ea07f6bd93f9f9523a7c
 DIST obsidian-1.5.12-amd64.tar.gz 107180662 BLAKE2B 52dd5a7f818629ba57cadec4a0c6b4f75d99c19ceaf1537b4f6b7dc0f9901c52b78318587b1f2a273ad6345475026e45c805d8978e7c0558a2487b9b2bf33376 SHA512 643409760fd99c6863679ca93b740a5f9a3d331144a82889c0a2f85bd53af4dcc0d5960840f8b7fa06216796fb5fc10522a769c27d8218bb32fb79370524b324
 DIST obsidian-1.5.12-arm64.tar.gz 106911948 BLAKE2B 484128a6d790e5d7cf7c02df3ba192ea8a571b760b1b0e1719aa652237b586ceb281ca73e268cce200365a79fc711fb5b67966601be69e5b370fcebf59531de5 SHA512 b0bea43efd0be464a33847d23f8c3e5f204a9e76621cc17f37d852e9ebc5f6cddd82ac1ac65d6c847d4d1453dc9615a89bb7cf16739e08444ae2c502240a571b
 DIST obsidian-1.5.12.gh.deb 78651254 BLAKE2B 22b3596a9bb098b4a15a79ed39a302526dd8f2294b85227a06a95ceaf2e597d2ab5e1d689dd6f3e497ed2acc2e0689bf79949b1337e4b34998bdb3f1b93b96ca SHA512 f0cdb88d54c0ae3ab8dc62dab7df21b6617ce4973d81798d344cac5608689cc0a2618345dcdec1c08750194d2d02118c81b2edf8a308547bbbde56dbf6100528
+DIST obsidian-1.6.3-amd64.tar.gz 107181697 BLAKE2B 28585263ebe3cda2bfebaec6a6a36855286d5e2c0b10538e207168ee945d810b84085190e1d4e76cb666982c5b83f7dadf0f533cfd3ff3c0c6e98329a6e06e1a SHA512 fa57ad6bbd1b8c04eba329a663a448786e31bf16c26a481f0ee078e40261e3f9d8dab09fb167940b28e067e6ab80a6120452a0ff08dba5382812d1eac6154161
+DIST obsidian-1.6.3-arm64.tar.gz 106921857 BLAKE2B c87abea6309a7bc8b87e7de44fd14a75747772797c3fa1133ee883f30839ca77c97b5e3eedb3bd4f72c692f2ec33b309847723232417c07bfe381650b5feabe0 SHA512 797c351aa7f4e09bb24b609c788f8856273aa4f21297a04cdc558772f188f43a8add146150e68d547ef6fc1033b9919b6ac6f760bc5cddad4a3d52d5c1d02307
+DIST obsidian-1.6.3.gh.deb 78238076 BLAKE2B 27164e545c36d9f7897aa3a81e1abcb233ea35ec9f9c0a797eafe83ad3fece6b73e82236bccd5deb23d496622609897e9f1c0e2dc2d38f75a75f3bddd0dc7eca SHA512 96219a0a4935f4b44ad969a58374c52cd642c202119291e0956adba9eec6f4b7887b9d46244c93bf0fff2609d66e3e1c09ed445e6657079d48b0dfe4f83572b3

diff --git a/app-office/obsidian/obsidian-1.6.3.ebuild b/app-office/obsidian/obsidian-1.6.3.ebuild
new file mode 100644
index 000000000..168968ddb
--- /dev/null
+++ b/app-office/obsidian/obsidian-1.6.3.ebuild
@@ -0,0 +1,178 @@
+# 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 )
+"
+
+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"
+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
+	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"
+}


             reply	other threads:[~2024-06-16  3:13 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-16  3:12 Artemis Everfree [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-20  6:09 [gentoo-commits] repo/proj/guru:dev commit in: app-office/obsidian/ Artemis Everfree
2024-10-20  6:09 Artemis Everfree
2024-07-20  0:13 Artemis Everfree
2024-07-20  0:13 Artemis Everfree
2024-07-20  0:13 Artemis Everfree
2024-04-22  5:39 Artemis Everfree
2024-04-22  5:39 Artemis Everfree
2024-03-20  3:22 Artemis Everfree
2024-03-20  3:22 Artemis Everfree
2024-02-29  7:08 Artemis Everfree
2024-02-29  7:08 Artemis Everfree
2024-01-04 12:21 Artemis Everfree
2024-01-03  6:33 Artemis Everfree
2024-01-03  6:33 Artemis Everfree
2024-01-03  6:33 Artemis Everfree
2023-10-17  2:38 Artemis Everfree
2023-09-28 15:54 [gentoo-commits] repo/proj/guru:master " David Roman
2023-09-28 15:54 ` [gentoo-commits] repo/proj/guru:dev " David Roman
2023-09-27  5:33 Artemis Everfree
2023-09-25  5:44 Artemis Everfree
2023-09-25  5:44 Artemis Everfree
2023-07-13  9:37 David Roman
2023-05-27 17:08 Rahul Sandhu
2023-05-18  1:51 Lucio Sauer
2023-05-18  1:46 Lucio Sauer
2023-04-16  9:13 Rahul Sandhu
2023-04-16  9:12 Rahul Sandhu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1718507534.b81ec6ad4a0fa73b4ae22adbcb0a19896deda805.artemis@gentoo \
    --to=artemis@artemis.sh \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox