git: 7b585155e546 - main - editors/elementary-code: update to 7.1.0

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Thu, 10 Aug 2023 10:12:55 UTC
The branch main has been updated by fernape:

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

commit 7b585155e54644b18726dc70e380e8b8e26afdb4
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2023-08-07 06:35:31 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-08-10 10:11:23 +0000

    editors/elementary-code: update to 7.1.0
    
    ChangeLog: https://github.com/elementary/code/releases/tag/7.1.0
    
     * Ensure active project at startup (include non-git folders)
     * Handle saving to unwritable location better to avoid data loss
     * Flatpak: Use 7.1 Sdk, Update Dependencies
     * Make symbol outline aware of follow-system-style setting
     * Show running branch if not master
     * appdata: Minor wording fixes in release notes
     * Fix styling when no documents
     * Ensure Replace button (and other search widget) states are mutually consistent
     * Switch to GHCR containers
     * Delay asking for save location if cannot determine write access
     * Additional Search options in menu
     * Implement option to show files with unknown characters as new document
     * Do not change document search results unexpectedly on focus in
     * Add ctrl + pageUp and pageDown for switching tabs
     * Persist search settings
     * Set search entry icon and styleclass according to results
     * Add release metainfo and update screenshot addresses for 7.1.0
     * Ask save location with dialog
     * Metainfo: set brand color to Latte 500
     * Ensure folder items in sidebar always expandable
     * Fix creating duplicates of unwritable files
     * Update metainfo for pull 1252
     * Fix typo in metainfo
     * Install man page with meson
     * Reduce terminal noise
     * Remove plugin set option
     * FormatBar: Show column number not buffer offset
     * Handle only relevant settings key changes
     * Use dialog for external changes
     * Sync tab settings
     * Fix searchterm reverts
     * Ensure correct sidebar item is focused, or none, when tab removed
     * Fix logic for clearing search entry
     * Fix spurious external change warnings
     * Meson: modernize
    
    PR:             272979
    Reported by:    duchateau.olivier@gmail.com
    Approved by:    miguel@gocobachi.dev (maintainer)
---
 editors/elementary-code/Makefile                            | 13 +++++--------
 editors/elementary-code/distinfo                            |  6 +++---
 .../files/patch-data_io.elementary.code.desktop.in.in       | 10 ----------
 .../elementary-code/files/patch-src_Widgets_Terminal.vala   |  5 +++--
 editors/elementary-code/pkg-plist                           |  1 +
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/editors/elementary-code/Makefile b/editors/elementary-code/Makefile
index 5b49bf0133f1..9629b1174e35 100644
--- a/editors/elementary-code/Makefile
+++ b/editors/elementary-code/Makefile
@@ -1,17 +1,15 @@
 PORTNAME=	elementary-code
-DISTVERSION=	7.0.0
-PORTREVISION=	1
+DISTVERSION=	7.1.0
 CATEGORIES=	editors
 
 MAINTAINER=	miguel@gocobachi.dev
 COMMENT=	Code editor designed for elementary OS
-WWW=		https://github.com/elementary/code/
+WWW=		https://github.com/elementary/code
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libatk-1.0.so:accessibility/at-spi2-core \
-		libeditorconfig.so:editors/editorconfig-core-c \
+LIB_DEPENDS=	libeditorconfig.so:editors/editorconfig-core-c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgee-0.8.so:devel/libgee \
 		libgit2-glib-1.0.so:devel/libgit2-glib \
@@ -21,8 +19,7 @@ LIB_DEPENDS=	libatk-1.0.so:accessibility/at-spi2-core \
 		libpeas-1.0.so:devel/libpeas \
 		libpeas-gtk-1.0.so:devel/libpeas \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
-		libzeitgeist-2.0.so:sysutils/zeitgeist
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 RUN_DEPENDS=	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
 		pkcheck:sysutils/polkit
 
@@ -31,7 +28,7 @@ USES=		compiler:c++11-lang desktop-file-utils gettext gnome meson \
 USE_GITHUB=	yes
 GH_ACCOUNT=	elementary
 GH_PROJECT=	code
-USE_GNOME=	cairo glib20 gtk30 gtksourceview4 pango vte3
+USE_GNOME=	atk cairo glib20 gtk30 gtksourceview4 pango vte3
 GLIB_SCHEMAS=	io.elementary.code.gschema.xml \
 		io.elementary.code.plugins.spell.gschema.xml
 USE_LDCONFIG=	yes
diff --git a/editors/elementary-code/distinfo b/editors/elementary-code/distinfo
index 2c8ceda5da26..7eaf53a11683 100644
--- a/editors/elementary-code/distinfo
+++ b/editors/elementary-code/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674590479
-SHA256 (elementary-code-7.0.0_GH0.tar.gz) = 5bf167102fd735ee74fb72b7fbc06dc67a6e6383f603be0ee97321213a4a7ce0
-SIZE (elementary-code-7.0.0_GH0.tar.gz) = 1696976
+TIMESTAMP = 1691330176
+SHA256 (elementary-code-7.1.0_GH0.tar.gz) = 08ec4f778fd1d4acc2a4e0ee79a1680200d8ef68a262e46e1d80aadc0b4a3388
+SIZE (elementary-code-7.1.0_GH0.tar.gz) = 1800657
diff --git a/editors/elementary-code/files/patch-data_io.elementary.code.desktop.in.in b/editors/elementary-code/files/patch-data_io.elementary.code.desktop.in.in
deleted file mode 100644
index 7e651ee50dc8..000000000000
--- a/editors/elementary-code/files/patch-data_io.elementary.code.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- data/io.elementary.code.desktop.in.in.orig	2020-06-28 08:36:49 UTC
-+++ data/io.elementary.code.desktop.in.in
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
--Name=Code
-+Name=Elementary Code
- Comment=Edit code files
- GenericName=Code Editor
- Exec=@EXEC_NAME@ %U
diff --git a/editors/elementary-code/files/patch-src_Widgets_Terminal.vala b/editors/elementary-code/files/patch-src_Widgets_Terminal.vala
index 20ddab2d0fab..7125d4fc5634 100644
--- a/editors/elementary-code/files/patch-src_Widgets_Terminal.vala
+++ b/editors/elementary-code/files/patch-src_Widgets_Terminal.vala
@@ -1,4 +1,4 @@
---- src/Widgets/Terminal.vala.orig	2023-01-24 16:59:41 UTC
+--- src/Widgets/Terminal.vala.orig	2023-08-01 20:46:55 UTC
 +++ src/Widgets/Terminal.vala
 @@ -87,13 +87,14 @@ public class Code.Terminal : Gtk.Box {
      }
@@ -8,8 +8,9 @@
 +        string cwd = "";
          try {
 -            return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
+-        } catch (GLib.FileError error) {
 +            GLib.Process.spawn_command_line_sync ("pwd", out cwd);
-         } catch (GLib.FileError error) {
++        } catch (GLib.SpawnError error) {
              warning ("An error occurred while fetching the current dir of shell: %s", error.message);
 -            return "";
          }
diff --git a/editors/elementary-code/pkg-plist b/editors/elementary-code/pkg-plist
index fa9b76097748..246068dfe5a3 100644
--- a/editors/elementary-code/pkg-plist
+++ b/editors/elementary-code/pkg-plist
@@ -24,6 +24,7 @@ lib/libcodecore.so
 lib/libcodecore.so.0
 lib/libcodecore.so.0.0
 libdata/pkgconfig/codecore.pc
+man/man1/io.elementary.code.1.gz
 share/applications/io.elementary.code.desktop
 share/gtksourceview-4/styles/elementary-dark.xml
 share/gtksourceview-4/styles/elementary-light.xml