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 11A81158042 for ; Mon, 21 Oct 2024 09:51:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6889E0948; Mon, 21 Oct 2024 09:51:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 CBC8FE0946 for ; Mon, 21 Oct 2024 09:51:40 +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 114F53430B5 for ; Mon, 21 Oct 2024 09:51:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55D11252F for ; Mon, 21 Oct 2024 09:51:36 +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: <1729404475.e8aef8e0d3a9fe581dde15457e2fec132c4ed9e8.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.6.3.ebuild X-VCS-Directories: app-office/obsidian/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: e8aef8e0d3a9fe581dde15457e2fec132c4ed9e8 X-VCS-Branch: master Date: Mon, 21 Oct 2024 09:51:36 +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: 3d9ea3b3-4e5d-4d5f-87ae-0bee9f1d8b65 X-Archives-Hash: c56aeeab5842e8f6c84456e0f9a0ccca commit: e8aef8e0d3a9fe581dde15457e2fec132c4ed9e8 Author: Artemis Everfree artemis sh> AuthorDate: Sun Oct 20 06:07:55 2024 +0000 Commit: David Roman gmail com> CommitDate: Sun Oct 20 06:07:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8aef8e0 app-office/obsidian: drop 1.6.3 Signed-off-by: Artemis Everfree artemis.sh> app-office/obsidian/Manifest | 6 +- app-office/obsidian/obsidian-1.6.3.ebuild | 178 ------------------------------ 2 files changed, 3 insertions(+), 181 deletions(-) diff --git a/app-office/obsidian/Manifest b/app-office/obsidian/Manifest index 67330c385..7b5ff9d00 100644 --- a/app-office/obsidian/Manifest +++ b/app-office/obsidian/Manifest @@ -1,6 +1,6 @@ -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 DIST obsidian-1.6.7-amd64.tar.gz 107961144 BLAKE2B c0b333eac80957e92d6abbd0d6330f04c195e41798bde1aba4be190fcac63c51c74aa685a1084274c1c5723c7fef3aec46fcdae5ebdea02ca7a8ad73ebe43ef7 SHA512 820e0fcd34e47c0cc840f406281fd808bb2b8ed70e78e639ba7f50c41b0643b59a161499d9f2b814b5e2abcc11cb52b3489276cb6852431e27e47643d192cd66 DIST obsidian-1.6.7-arm64.tar.gz 108057397 BLAKE2B e48a6f59d216d10daf90811b413e85c49b9dffc83a2d671222da2732bd5c05885cfc831268eaadf1e5a41348ebbd5ade79013d63c2b41b1fd7a9b0063db0673b SHA512 2dcf0ece4e8ade2b81d7c3889cf26eaf35fded7bacbb006050001d169a4f0f501bb6b8335caf038d3370f5ca48f851554cbf9dd713dbdd4283e0bbb91470e17b DIST obsidian-1.6.7.gh.deb 79172558 BLAKE2B 1665e1bc2b9e298a3c7560dec159736c9f270dfce532b63d135adb9f00f14e15e28e5460461f0bbeeddb7c3d036679fc5b04f02d6d85c29d067a6f64f2e83973 SHA512 bbf913f6806a1d23d2a6bbb9d5572569b019c79c877c3165ff94938f01282e7d98b6ba660821dca7e38874413207846b025707161c8901983458bdf4add05336 +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 diff --git a/app-office/obsidian/obsidian-1.6.3.ebuild b/app-office/obsidian/obsidian-1.6.3.ebuild deleted file mode 100644 index 168968ddb..000000000 --- a/app-office/obsidian/obsidian-1.6.3.ebuild +++ /dev/null @@ -1,178 +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 ) -" - -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" -}