Bug 272979 - editors/elementary-code: update to 7.1.0
Summary: editors/elementary-code: update to 7.1.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Fernando Apesteguía
URL: https://github.com/elementary/code/re...
Keywords:
Depends on:
Blocks:
 
Reported: 2023-08-06 14:42 UTC by Olivier Duchateau
Modified: 2023-08-10 10:13 UTC (History)
2 users (show)

See Also:
miguel: maintainer-feedback+


Attachments
Patch to update editors/elementary-code (4.12 KB, patch)
2023-08-06 14:42 UTC, Olivier Duchateau
no flags Details | Diff
Patch to update editors/elementary-code (4.20 KB, patch)
2023-08-07 17:19 UTC, Olivier Duchateau
no flags Details | Diff
New patch with meson change (4.85 KB, patch)
2023-08-08 11:13 UTC, Fernando Apesteguía
fernape: maintainer-approval? (miguel)
Details | Diff
Screenshot of wingpanel (950.90 KB, image/png)
2023-08-08 14:54 UTC, Olivier Duchateau
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Olivier Duchateau 2023-08-06 14:42:49 UTC
Created attachment 243895 [details]
Patch to update editors/elementary-code

- Update to 7.1.0
- Adjust patch (src/Widgets/Terminal.vala) in order to catch error
- Adjust dependencies, Zeitgeist is not used anymore (since 2021, [1])

[1] https://github.com/elementary/code/commit/e22af5feb63edbc795931bdb9d72d1fee7cb7d3c
Comment 1 Miguel Gocobachi 2023-08-06 18:31:03 UTC
why the patch-data_io.elementary.code.desktop.in.in was removed?
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2023-08-07 11:02:59 UTC
We should have had a better look at this. It does not build. The last line in LIB_DEPENDS has a trailing \.

Please, run poudriere or at least some basic tests when submitting and approval changes.
Comment 3 Olivier Duchateau 2023-08-07 17:19:45 UTC
Created attachment 243941 [details]
Patch to update editors/elementary-code

Remove trailing slash in LIB_DEPENDS
Comment 4 Miguel Gocobachi 2023-08-07 17:31:50 UTC
Comment on attachment 243941 [details]
Patch to update editors/elementary-code

The patch for the desktop needs to remain as it was, please do not remove it
Comment 5 Olivier Duchateau 2023-08-07 17:33:03 UTC
(In reply to Miguel Gocobachi from comment #1)

Because patch fails, data/io.elementary.code.desktop.in.in has changed. It is rather cosmetic, port is functional without this change.
Comment 6 Miguel Gocobachi 2023-08-07 17:35:46 UTC
(In reply to Olivier Duchateau from comment #5)

The patch is to make sure it has the name "Elementary Code" rather than just "Code", so as long as that name is kept, I will approve the patch.
Comment 7 Miguel Gocobachi 2023-08-08 07:06:05 UTC
I've reviewed the new changes of the latest version of elementary-code, and I believe a new patch is needed to use the name "Elementary Code". This is to keep consistency with the other Elementary packages in FreeBSD ports and this port itself, and to give proper credit to Elementary OS and their packages.

The current name of the package, "Code", is not specific enough, and could be confused with other packages that have the same name. Using the name "Elementary Code" will make it clear that this package is a part of the Elementary OS ecosystem as it can be used with others WM in FreeBSD.

This line can be patched to set the name: https://github.com/elementary/code/blob/c2fb99006180f20efab10edc54dc068cc06ede04/data/meson.build#L37
Comment 8 Fernando Apesteguía freebsd_committer freebsd_triage 2023-08-08 11:13:03 UTC
Created attachment 243957 [details]
New patch with meson change

New file with meson patched.
I used "ElementaryCode" to avoid spaces since I don't know if that meson variable will be used elsewhere.

Let me know what you think.
Comment 9 Olivier Duchateau 2023-08-08 14:54:51 UTC
Created attachment 243970 [details]
Screenshot of wingpanel

Why add Elementary? I use the pantheon desktop from the elementary OS and in menu (see screenshot) this application is pretty self-explanatory.

Moreover spelling is wrong, "elementary" must be in lower case.
Comment 10 Fernando Apesteguía freebsd_committer freebsd_triage 2023-08-08 15:09:21 UTC
Humm...

From deskutils/elementary-calendar:

[Desktop Entry]
Type=Application
Name=Calendar
GenericName=Calendar

From graphics/elementary-photos:

 [Desktop Entry]
-Name=Photos
+Name=Elementary Photos


From math/elementary-calculator:
[Desktop Entry]
Name=Calculator
Comment=Solve simple equations

I think we lack some consistency here.
Comment 11 Miguel Gocobachi 2023-08-08 19:33:37 UTC
(In reply to Fernando Apesteguía from comment #10)

Yes, I started my elementary ports and using "Elementary <package name>", so at least the packages I made follows this. Olivier is porting the actual WM of Elementary OS for a while already and it makes sense not using the prefix "Elementary" when using it. But I do remember I added the prefix because I saw it somewhere else for other packages to identify and mark those packages from its origin project (but I cannot remember where I saw it in the ports as samples that I followed). 

The others packages were added later on, those that does not has "Elementary" as prefix. So, Fernando, what do you think we should do for this packages?
Comment 12 Miguel Gocobachi 2023-08-08 19:44:41 UTC
Olivier, off of topic but, is it Pantheon already ported to FreeBSD and available within the ports?
Comment 13 Fernando Apesteguía freebsd_committer freebsd_triage 2023-08-09 06:09:54 UTC
(In reply to Miguel Gocobachi from comment #11)

Since we have both cases, I think I would not patch the desktop files. The name of the package is good. Having something like "calendar", "calculator" in ports and packages would be confusing, so adding "elementary" there makes sense.

But from the point of view of a desktop file, I don't think we need to add the prefix.

If you agree, I can commit this update without the change in the meson file.
Comment 14 Miguel Gocobachi 2023-08-09 16:09:22 UTC
Comment on attachment 243941 [details]
Patch to update editors/elementary-code

after our agreement, I am approving this patch. Thank you, and for the near future of the other packages I have, we will be removing the patch of the desktop to keep consistency. thanks Both Olivier and Fernando.
Comment 15 Miguel Gocobachi 2023-08-09 16:10:08 UTC
(In reply to Fernando Apesteguía from comment #13)

Yes, let's use the Olivier's patch and remove the desktop. Thank you.
Comment 16 Olivier Duchateau 2023-08-09 17:43:06 UTC
(In reply to Miguel Gocobachi from comment #12)

It is my main desktop environment for over a year and a half. It is not yet in ports collection, notifications crash Gala, and user settings plugin is not yet complete.

You can read my first status report [1]. As I'm also working on GNOME, in my repository these ports are build against Mutter 43.x, and the new 4.1 stable API for WebKitGTK (they are not available in ports tree).

[1] https://www.freebsd.org/status/report-2022-10-2022-12/#_pantheon_desktop_on_freebsd
Comment 17 Miguel Gocobachi 2023-08-10 03:53:19 UTC
(In reply to Olivier Duchateau from comment #16)

That is pretty awesome work Oliver, I will love to try it.
Comment 18 Fernando Apesteguía freebsd_committer freebsd_triage 2023-08-10 10:13:10 UTC
Committed,

Thank you both for your work!
Comment 19 commit-hook freebsd_committer freebsd_triage 2023-08-10 10:13:34 UTC
A commit in branch main references this bug:

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 +++---
 .../patch-data_io.elementary.code.desktop.in.in (gone)      | 10 ----------
 .../elementary-code/files/patch-src_Widgets_Terminal.vala   |  5 +++--
 editors/elementary-code/pkg-plist                           |  1 +
 5 files changed, 12 insertions(+), 23 deletions(-)