From nobody Mon Nov 6 11:03:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SP7kR0tNZz50KQh; Mon, 6 Nov 2023 11:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SP7kR0SGRz4Yx6; Mon, 6 Nov 2023 11:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699268607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+hGQ0mHWxlnzqugWXFgJP9a4QCNJihV0GITtb+I3jWw=; b=mgqE3DA0JTIsDsV6THbucxJAOW7XBmiicPX6qIjjigHEbgsLPBak73XsS04viQZUD7tyV1 AhfUneRMsun40ZZZAkVPhs1LE9EU0b1QdRol6PuL5xIz9XQcKyoqolE+5KH+OY4cl4Fnig TWb1pFy/Tvwafm3dyWDWGqSF1INKajkCh4VgirquEYOtluh+fpC0PbhnCfCPP63IQlPfzt qxJZNoOW52f8HYegiOldYnJqR4FZBlFMooSa0fMHsyQ3DnX14Bu7fp7cAKPoZ08SocWqHA 6CdyE/YNg9yiw8z1w0CGV5uquDDgdqbBl5L3sq5HJID4x9bvF5LjF7GVqyfypw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699268607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+hGQ0mHWxlnzqugWXFgJP9a4QCNJihV0GITtb+I3jWw=; b=e1+TP8qD7ZdoT9mODGRWlEfTU0IZUryf8G3xz/WW7Lb869RLSQhwA5clmhdnCuXojPRQiw C29mB+xefOTCsR7sPiM2gfqn5ocWctvjyAqDdrDKzaJNIZPwD3wY6Qh0/ftjYUW9V/w2wb FaZGr6rLcMPi+srww889TkVUl3t6aOkQxPAmObaYVdA8wBtm8XYYY+3hgCYWhbYKN5B1/k GGIJS5WPEfToFF01+SQPHnP32at8uk8H5o5wlxD5YwaiI+ZTamUN7xY/Y7BwkvkucAt+SR aNO9t4kZZ7d1EGTDvPt4ZRGa5NV7UeN4Oh/SgCfi7Yy6lyT1PQUz1iGcJYRa9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699268607; a=rsa-sha256; cv=none; b=Iy3mXc33i9gveDz8Eob7ICKexIZ93h3myWyarT94mmx0aRcK0BJn9XmAnY/+MklPhw9HeY 8FJIA8n9qs0ov3UJz+dhCYlCbBzVQHXNXq5adPBAI46uzwbcqwOe2qjWs6oHyXbWC+9jFz TYqvqeuymDTDN8ArJUwAFWc7Qseg3CCnfDIXaC2agO1twsULrLXppc1lNW4v+GFZSxWdSO AUs2JhkrQJSi/DQyNarLtI/1i9lhgF4bICHTQC/UKaVE5bTTqGDtk0g1U6d+efLd3wFZXU HJ0Z3mgpyuFqchOZwVDruPH9j9sdn2i6ljtRKipSGme85Aa3UDqNX7ZoPzuupw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SP7kQ6gJ9z14Yw; Mon, 6 Nov 2023 11:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6B3QU2089827; Mon, 6 Nov 2023 11:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6B3QN0089824; Mon, 6 Nov 2023 11:03:26 GMT (envelope-from git) Date: Mon, 6 Nov 2023 11:03:26 GMT Message-Id: <202311061103.3A6B3QN0089824@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: b9ff91ba281c - main - textproc/obsidian: Update to 1.4.16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9ff91ba281c0b46ba553bc95633903faaf0bfc3 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9ff91ba281c0b46ba553bc95633903faaf0bfc3 commit b9ff91ba281c0b46ba553bc95633903faaf0bfc3 Author: Gleb Popov AuthorDate: 2023-09-22 18:30:21 +0000 Commit: Gleb Popov 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 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