From nobody Fri Jul 29 13:21:12 2022 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 4LvSp04b9Rz4X8m2; Fri, 29 Jul 2022 13:21:12 +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 4LvSp02vGTz46dr; Fri, 29 Jul 2022 13:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659100872; 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=aJKnt/lEdsrM3vls4XX6bFDyNHR2LLy0uU+1tVvgxpA=; b=GqFDfaVRT42DNXnBJtGZRWDKQMiGiImus7mUdOx/5TfowQLffMSwzdfeEFWHwJkNmGHXeh FWDjv9cCJVcutK33T/kAJ6xZZEYVDCh+7LO60YWUbE3fqnxizJ2W0HnJMBOz+8Axx2MVdl mTv/QWxTIjtZBRAL0Hk0/dOSo5Yv1jDMqNpYWeGtH8+BqQzoDGn+ty4Bl2k5bTScKgRx5b ced41IT8/jgbNZyohoB3jN4kb0ywqQgHSAniwBYidpQJiV5VTM0M9YuQ1LUavs1uGxvztH SwzMTbB9KGozNM0C6pyVvxOOCUEYvseWZ0SGhMRrkiRwwqvOsv3R3yW532iMUA== 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 4LvSp01zgdzcgG; Fri, 29 Jul 2022 13:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26TDLCbx086689; Fri, 29 Jul 2022 13:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TDLCeG086688; Fri, 29 Jul 2022 13:21:12 GMT (envelope-from git) Date: Fri, 29 Jul 2022 13:21:12 GMT Message-Id: <202207291321.26TDLCeG086688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 77f485048c3c - main - science/linux-zotero: Commit zotero.desktop patches & fix Exec 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77f485048c3c7c6a0807ae71619932b23fae51d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659100872; 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=aJKnt/lEdsrM3vls4XX6bFDyNHR2LLy0uU+1tVvgxpA=; b=j7KxSTf1pTEyF0yx9pQVPmk8LSY2WY8wP4PqQNfd8tLCPgs7suvet0g+J9slXBelBt2GXb HEBcjVn0Dg47KgISlB96qiHGfIDjM65fmwWT5ddiDtTOsZPS3xNl5StXnXXMYSTUWNkcSJ qjijGpKpnFNw/lCMie22pHkQV9ioBcwJLlW3Q8lw9n75URX0kPs57diLlEN3RuPZNUf5iP 2DLLjPVjtXG3X/le7+pPHOYcuLqNxnYdhPqfA2I+Choj5ig1uPQYWvil/gTvJF4ytweiXj XN0488v3Ch6C2JgB408c1H0rzy/fhDlqsxaD/j9MuSrehsXfWqUJMcwfE67g2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659100872; a=rsa-sha256; cv=none; b=aC+V4kHjNp44srlwC90PSX4f6azfthQiwjZwkqb6K1FnB1K7wtHPRplBqrQa5+aoKbnDFB Qf+bODtqcVD1ioZklIMz+5Ihhlj8dPlYjEUuKF8vDRcC/HqzQLwY6p6i+feSVpHAoX4gwZ S6wXseOe60IPkidDSeM4pHQakLtB5EQA0vwOxOLCvanX/JmzLhFmUI9O05M+HzdAWFLxJG kbZls5urZF63wbFB1wom+fBi8ZytCIUlTNl//kg66ZrJNI1eUOHDlgJAnptSojHZlzSPd7 R4BbZnA+F/2aXmGB9HOEsAIUkImJTKnbSWBfLa5gxjb9+BP6J/kmNTidI8tFrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=77f485048c3c7c6a0807ae71619932b23fae51d7 commit 77f485048c3c7c6a0807ae71619932b23fae51d7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-29 13:19:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-29 13:21:06 +0000 science/linux-zotero: Commit zotero.desktop patches & fix Exec I forgot to commit the patch for the icon support. While here, fix the Exec line. --- science/linux-zotero/Makefile | 5 +++-- science/linux-zotero/files/patch-zotero.desktop | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/science/linux-zotero/Makefile b/science/linux-zotero/Makefile index 98a01ea33525..8cf918746899 100644 --- a/science/linux-zotero/Makefile +++ b/science/linux-zotero/Makefile @@ -1,6 +1,6 @@ PORTNAME= zotero DISTVERSION= 6.0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science deskutils linux MASTER_SITES= https://download.zotero.org/client/release/${DISTVERSION}/ \ https://raw.githubusercontent.com/zotero/zotero-standalone-build/${DISTVERSION}/:LICENSE @@ -38,11 +38,12 @@ post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/COPYING ${WRKDIR} do-configure: + ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${PORTNAME}.desktop (cd ${WRKSRC} && ${BRANDELF} -t Linux ${_BINARIES}) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name '*.orig'") + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name '*.orig' ! -name '*.bak'") (cd ${WRKSRC} && ${CHMOD} +x ${_BINARIES}) # Only strip zotero-bin. Other ${_BINARIES} break strip(1). (cd ${STAGEDIR}${DATADIR} && ${STRIP_CMD} zotero-bin) diff --git a/science/linux-zotero/files/patch-zotero.desktop b/science/linux-zotero/files/patch-zotero.desktop new file mode 100644 index 000000000000..6dee7e42009a --- /dev/null +++ b/science/linux-zotero/files/patch-zotero.desktop @@ -0,0 +1,12 @@ +--- zotero.desktop.orig 2022-07-19 02:55:23 UTC ++++ zotero.desktop +@@ -1,7 +1,7 @@ Name=Zotero + [Desktop Entry] + Name=Zotero +-Exec=bash -c "$(dirname $(realpath $(echo %k | sed -e 's/^file:\/\///')))/zotero -url %U" +-Icon=zotero.ico ++Exec=%%PREFIX%%/bin/zotero -url %U ++Icon=zotero.png + Type=Application + Terminal=false + Categories=Office;