Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Nov 2023 11:03:26 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b9ff91ba281c - main - textproc/obsidian: Update to 1.4.16
Message-ID:  <202311061103.3A6B3QN0089824@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b9ff91ba281c0b46ba553bc95633903faaf0bfc3

commit b9ff91ba281c0b46ba553bc95633903faaf0bfc3
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2023-09-22 18:30:21 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2023-11-06 11:02:22 +0000

    textproc/obsidian: Update to 1.4.16
    
    Sponsored by:   Serenity Cybersecurity, LLC
---
 textproc/obsidian/Makefile | 67 +++-------------------------------------------
 textproc/obsidian/distinfo |  6 ++---
 2 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/textproc/obsidian/Makefile b/textproc/obsidian/Makefile
index d2400c6d1d3e..9b183b447dcf 100644
--- a/textproc/obsidian/Makefile
+++ b/textproc/obsidian/Makefile
@@ -7,8 +7,7 @@
 # make USE_PACKAGE_DEPENDS_ONLY=yes install clean
 
 PORTNAME=	obsidian
-PORTVERSION=	1.3.5
-PORTREVISION=	1
+PORTVERSION=	1.4.16
 CATEGORIES=	textproc
 # Icon is taken from the Nix build recipe
 # https://github.com/NixOS/nixpkgs/blob/de5448dab588ad41aef40f8c7c0c230981656698/pkgs/applications/misc/obsidian/default.nix#L31-L34
@@ -27,74 +26,16 @@ LICENSE_NAME=	End User License Agreement
 LICENSE_TEXT=	See https://obsidian.md/terms
 LICENSE_PERMS=
 
-DEPRECATED=	Depends on upstream EOLed electron24
-EXPIRATION_DATE=	2023-12-04
-
-BUILD_DEPENDS=	electron${ELECTRON_VERSION}:devel/electron${ELECTRON_VERSION}
-RUN_DEPENDS=	electron${ELECTRON_VERSION}:devel/electron${ELECTRON_VERSION}
-
-# All deps below are there only to please stage-qa
-
-LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
-		libatspi.so:accessibility/at-spi2-core \
-		libsnappy.so:archivers/snappy \
-		libopus.so:audio/opus \
-		libdbus-1.so:devel/dbus \
-		libicuuc.so:devel/icu \
-		libevent.so:devel/libevent \
-		libnspr4.so:devel/nspr \
-		libFLAC.so:audio/flac \
-		libpci.so:devel/libpci \
-		libdrm.so:graphics/libdrm \
-		libpng.so:graphics/png \
-		libwayland-client.so:graphics/wayland \
-		libwebp.so:graphics/webp \
-		libopenh264.so:multimedia/openh264 \
-		libharfbuzz.so:print/harfbuzz \
-		libexpat.so:textproc/expat2 \
-		libnss3.so:security/nss \
-		libxkbcommon.so:x11/libxkbcommon \
-		libxshmfence.so:x11/libxshmfence \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libcups.so:print/cups \
-		libasound.so:audio/alsa-lib
-
-USES=		desktop-file-utils gettext-runtime gl gnome iconv jpeg xorg
-
-USE_GL=		gbm gl glesv2
-USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt
-USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
-		xrender xscrnsaver xtst
+USES=		electronfix:25
 
+ELECTRONFIX_MAIN_EXECUTABLE=	obsidian
 SUB_FILES=	obsidian
 NO_BUILD=	yes
-STRIP=
-
-ELECTRON_VERSION=	24
-ELECTRON_FILES=		chromedriver \
-			libEGL.so \
-			libGLESv2.so \
-			libffmpeg.so \
-			libvk_swiftshader.so \
-			libvulkan.so \
-			resources.pak \
-			snapshot_blob.bin \
-			v8_context_snapshot.bin
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/obsidian ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/obsidian ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${PATCHDIR}/obsidian.desktop ${STAGEDIR}${DESKTOPDIR}/obsidian.desktop
 	${INSTALL_DATA} ${DISTDIR}/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png ${STAGEDIR}${PREFIX}/share/pixmaps/obsidian.png
 
-post-install:
-	${RM} ${STAGEDIR}${DATADIR}/chrome-sandbox
-	${RM} ${STAGEDIR}${DATADIR}/libvulkan.so.1
-.for f in ${ELECTRON_FILES}
-	${RM} ${STAGEDIR}${DATADIR}/${f}
-	${LN} -s ${LOCALBASE}/share/electron${ELECTRON_VERSION}/${f} ${STAGEDIR}${DATADIR}/${f}
-.endfor
-# We have to copy the electron binary instead of symlinking
-	${CP} ${LOCALBASE}/share/electron${ELECTRON_VERSION}/electron ${STAGEDIR}${DATADIR}/obsidian
-
 .include <bsd.port.mk>
diff --git a/textproc/obsidian/distinfo b/textproc/obsidian/distinfo
index 52ece4a4003b..60fd89294c20 100644
--- a/textproc/obsidian/distinfo
+++ b/textproc/obsidian/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1686930797
-SHA256 (obsidian-1.3.5.tar.gz) = 8e19bace215a267bf8a6b3d27ce9c9fc46c84537fdae7bf30095719d5aa6584e
-SIZE (obsidian-1.3.5.tar.gz) = 98938181
+TIMESTAMP = 1698692509
+SHA256 (obsidian-1.4.16.tar.gz) = 3c128b1acdcc6726ab48c8969e3a98eddf5b42b2aedae2c0bcb52e7e91cbc5cc
+SIZE (obsidian-1.4.16.tar.gz) = 99705807
 SHA256 (bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png) = 4227a64156df4043395183dc7b9b23b809df79292d44c208e9649adcf7b2d4a3
 SIZE (bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png) = 11970



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311061103.3A6B3QN0089824>