From nobody Sun Jun 05 11:21:47 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 506D11BEB3E5; Sun, 5 Jun 2022 11:21:48 +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 4LGDj817jcz3QtL; Sun, 5 Jun 2022 11:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654428108; 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=gV4RPcS4Ik7NtIiNTR1EgoQ8QPt8M0B3I8TpG0hTiQE=; b=ctTm2dQhfu9WAOYotMPRKUlPSP0Trgb46ku26iBHtq/b2Te7HVV5nEyCnpmXsAWjJ+ldmY 6AVfPggeIyQYPXV6e+pbw3KyOg0aK5NFgNSQmow3jO1UlCp/pt4ta3xn6iGS1IDZ+VUOIr TTBWfPfNBzsS1NAXDzykxhLaQ4fd2hmfI6CS29lSLOviaa6Sl3QYAT7kThKtbOyrO4Ze+R BfABuIB4qQW6a+4HeGt9Eo98eS+TGryNwPQh8hU3hYOE7b84TXLdL/U5UAM1M+1V2LAp2P 4/P7/G7JwMyYHVIvG0BWcQX6ZCcRQ29pMi48cN86wDd9t7dPdCyCJYSO68lMjw== 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 1D19F10AEB; Sun, 5 Jun 2022 11:21:47 +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 255BLl3T083045; Sun, 5 Jun 2022 11:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 255BLljp083044; Sun, 5 Jun 2022 11:21:47 GMT (envelope-from git) Date: Sun, 5 Jun 2022 11:21:47 GMT Message-Id: <202206051121.255BLljp083044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: f19a91214e0d - main - editors/elementary-code: update to 6.2.0 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f19a91214e0d7881bb0b8b5f6467ff42a76c28a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654428108; 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=gV4RPcS4Ik7NtIiNTR1EgoQ8QPt8M0B3I8TpG0hTiQE=; b=pS6edIpcdNlWLnJ5G2tEH3h+fg95E1EXpxRktJRUlfM3Wal1BxX53YTdXE80mui0kvC1LI EpHYUqDIc+H7wjv6lUU5eFU2KCvjv/N1Ikcy48DOPFWOLtYkhXxo+AyWFDMH8VtXrvDQG1 w4xILq8SYfz+/1ag1bU8BAJQambTpw44oSE7P/V4I+B3baFF1P1GpnOPYLS+Zxp0zwpIxs SyyqPg/xnkhlEA/ACnxagBeStvyvDVBayc/A9lLhnh6tShRMguqULYr0etTO+Plk1PpQv5 T2yYWN0LaniDaLYHrIItsVmlIuWNAhA0XjjCqVoqkkZUMO+sCx+Pvwmjp35FZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654428108; a=rsa-sha256; cv=none; b=DBV35QS/pSxNyExiuwxtLm2/Nj+r+VzESP8DiVSbT1gs3JAaGHBzCuX2xtv9/bo29cD93x KT0SlYhSHbcLraWz23Vha6AcZwThf1oMPf2OC10HB3RGZlFYD/ZdNnw0Stx/c9Gx/R4Nyg Gpn5K/jEMGQTRDwCH07SW2oMOyBErdHyPRPkOqhiJwrSZgp2oBUrGBuVunsoEYDOvssXnb VGHfFyfMilygiBb9QHSZd5WwxF1SMuO+v5HN3wcq9nJUowFBB58icQg02oDr3/ljdc9J6G DEzSubyEt7NXtmGgMKhOeoE1VSlGHDiKrIo2/a1FAeZ45D7OL+4k//COT+48aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=f19a91214e0d7881bb0b8b5f6467ff42a76c28a8 commit f19a91214e0d7881bb0b8b5f6467ff42a76c28a8 Author: Miguel Gocobachi AuthorDate: 2022-06-02 16:19:55 +0000 Commit: Fernando Apesteguía CommitDate: 2022-06-05 11:19:22 +0000 editors/elementary-code: update to 6.2.0 PR: 264358 Reported by: miguel@gocobachi.dev --- editors/elementary-code/Makefile | 10 +++------- editors/elementary-code/distinfo | 8 +++----- .../files/patch-plugins_editorconfig_meson.build | 9 ++++++--- .../files/patch-plugins_terminal_terminal.vala | 21 +++++++++++++++++++++ 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/editors/elementary-code/Makefile b/editors/elementary-code/Makefile index 02a26c051f00..27b8b2c397e7 100644 --- a/editors/elementary-code/Makefile +++ b/editors/elementary-code/Makefile @@ -1,11 +1,7 @@ PORTNAME= elementary-code -DISTVERSION= 6.0.0 -PORTREVISION= 4 +DISTVERSION= 6.2.0 CATEGORIES= editors -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= a2607cce3a6b.patch:-p1 # https://github.com/elementary/code/pull/1165 - MAINTAINER= miguel@gocobachi.dev COMMENT= Code editor designed for elementary OS @@ -13,8 +9,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= valac:lang/vala -RUN_DEPENDS= droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ - pkcheck:sysutils/polkit LIB_DEPENDS= libatk-1.0.so:accessibility/atk \ libeditorconfig.so:editors/editorconfig-core-c \ libfontconfig.so:x11-fonts/fontconfig \ @@ -29,6 +23,8 @@ LIB_DEPENDS= libatk-1.0.so:accessibility/atk \ libvala-0.48.so:lang/vala \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libzeitgeist-2.0.so:sysutils/zeitgeist +RUN_DEPENDS= droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ + pkcheck:sysutils/polkit USES= compiler:c++11-lang desktop-file-utils gettext gnome meson \ ninja pkgconfig python:3.6+,build xorg diff --git a/editors/elementary-code/distinfo b/editors/elementary-code/distinfo index 9f1d8950003b..35db590b7c97 100644 --- a/editors/elementary-code/distinfo +++ b/editors/elementary-code/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1628896888 -SHA256 (elementary-code-6.0.0_GH0.tar.gz) = c58b33db512e1c031f6870eb62b035dea764dbdd7c54b8e19c434af8ccd3a384 -SIZE (elementary-code-6.0.0_GH0.tar.gz) = 1303421 -SHA256 (a2607cce3a6b.patch) = d16ec6023bbc26a5fd919d2233e52caa983af667533c44592ba0120bd6122119 -SIZE (a2607cce3a6b.patch) = 661 +TIMESTAMP = 1653761499 +SHA256 (elementary-code-6.2.0_GH0.tar.gz) = 9ec273182b053fb424cc78ddd8da869d13261d35f22cd2198f2899b654d13d4f +SIZE (elementary-code-6.2.0_GH0.tar.gz) = 1427323 diff --git a/editors/elementary-code/files/patch-plugins_editorconfig_meson.build b/editors/elementary-code/files/patch-plugins_editorconfig_meson.build index 1310f0da1d04..80a08578e7c2 100644 --- a/editors/elementary-code/files/patch-plugins_editorconfig_meson.build +++ b/editors/elementary-code/files/patch-plugins_editorconfig_meson.build @@ -1,12 +1,15 @@ ---- plugins/editorconfig/meson.build.orig 2020-06-28 09:00:29 UTC +--- plugins/editorconfig/meson.build.orig 2022-05-31 04:56:45 UTC +++ plugins/editorconfig/meson.build -@@ -7,7 +7,8 @@ module_files = [ +@@ -7,7 +7,11 @@ module_files = [ module_deps = [ codecore_dep, - meson.get_compiler('c').find_library('editorconfig') + meson.get_compiler('c') -+ .find_library('editorconfig', dirs: ['/usr/local/lib']) ++ .find_library('editorconfig', dirs: [ ++ '/usr/local/lib' ++ ] ++ ) ] shared_module( diff --git a/editors/elementary-code/files/patch-plugins_terminal_terminal.vala b/editors/elementary-code/files/patch-plugins_terminal_terminal.vala new file mode 100644 index 000000000000..8443bc31aca0 --- /dev/null +++ b/editors/elementary-code/files/patch-plugins_terminal_terminal.vala @@ -0,0 +1,21 @@ +--- plugins/terminal/terminal.vala.orig 2022-04-04 16:20:49 UTC ++++ plugins/terminal/terminal.vala +@@ -200,13 +200,16 @@ public class Scratch.Plugins.Terminal : Peas.Extension + + public string get_shell_location () { + int pid = (!) (this.child_pid); ++ string cwd = ""; + + try { +- return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid)); ++ //return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid)); ++ GLib.Process.spawn_command_line_sync ("pwd", out cwd); + } catch (GLib.FileError error) { + warning ("An error occurred while fetching the current dir of shell"); +- return ""; + } ++ ++ return cwd; + } + + void on_hook_notebook () {