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: Wed, 20 Mar 2024 03:22:54 +0000 (UTC) [thread overview]
Message-ID: <1710904948.4dbf91ee99fd40ff16e9a542ff39b561f9a457a8.artemis@gentoo> (raw)
commit: 4dbf91ee99fd40ff16e9a542ff39b561f9a457a8
Author: Artemis Everfree <artemis <AT> artemis <DOT> sh>
AuthorDate: Wed Mar 20 03:22:04 2024 +0000
Commit: Artemis Everfree <artemis <AT> artemis <DOT> sh>
CommitDate: Wed Mar 20 03:22:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4dbf91ee
app-office/obsidian: drop 1.4.16-r2, 1.5.3-r1
Signed-off-by: Artemis Everfree <artemis <AT> artemis.sh>
app-office/obsidian/Manifest | 6 -
app-office/obsidian/obsidian-1.4.16-r2.ebuild | 180 --------------------------
app-office/obsidian/obsidian-1.5.3-r1.ebuild | 180 --------------------------
3 files changed, 366 deletions(-)
diff --git a/app-office/obsidian/Manifest b/app-office/obsidian/Manifest
index f1e1611b2f..161b987306 100644
--- a/app-office/obsidian/Manifest
+++ b/app-office/obsidian/Manifest
@@ -1,12 +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.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.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.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
diff --git a/app-office/obsidian/obsidian-1.4.16-r2.ebuild b/app-office/obsidian/obsidian-1.4.16-r2.ebuild
deleted file mode 100644
index daf1bfd3df..0000000000
--- a/app-office/obsidian/obsidian-1.4.16-r2.ebuild
+++ /dev/null
@@ -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"
-}
diff --git a/app-office/obsidian/obsidian-1.5.3-r1.ebuild b/app-office/obsidian/obsidian-1.5.3-r1.ebuild
deleted file mode 100644
index daf1bfd3df..0000000000
--- a/app-office/obsidian/obsidian-1.5.3-r1.ebuild
+++ /dev/null
@@ -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"
-}
next reply other threads:[~2024-03-20 3:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 3:22 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-06-16 3:12 Artemis Everfree
2024-04-22 5:39 Artemis Everfree
2024-04-22 5:39 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=1710904948.4dbf91ee99fd40ff16e9a542ff39b561f9a457a8.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