Bug 267469 - devel/gitui: Unbroken 32bit arch/Disable vendored-openssl
Summary: devel/gitui: Unbroken 32bit arch/Disable vendored-openssl
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: Nuno Teixeira
URL: https://www.freshports.org/devel/gitui/
Keywords:
Depends on:
Blocks:
 
Reported: 2022-10-31 15:08 UTC by Nuno Teixeira
Modified: 2023-11-02 10:09 UTC (History)
1 user (show)

See Also:
yuri: maintainer-feedback+
eduardo: merge-quarterly+

Attachments
gitui-0.21.0_3 diff (12.58 KB, patch)
2022-10-31 15:08 UTC, Nuno Teixeira 		no flags Details | Diff
Refresh patch to current version (14.97 KB, patch)
2023-11-01 21:42 UTC, Nuno Teixeira 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Nuno Teixeira freebsd_committer freebsd_triage 2022-10-31 15:08:10 UTC 
Created attachment 237759 [details]
gitui-0.21.0_3 diff

1. Move CARGO-CRATES list to Makefile.crates

2. Apply sys-info-0.9.1 fix crate (mixing constant and variable width types)
   https://github.com/FillZpp/sys-info-rs/issues/80
   https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267290
   Unbreak 32 bit archs

3. Disable vendored-openssl

 - Use patch to remove dependency on vendored-openssl:
   ---
   asyncgit/Cargo.toml
   -openssl-sys = { version = '0.9', features = ["vendored"] }
   +openssl-sys = { version = '0.9', features = [] }
   ---
 - Add ssl to USES
 - Add a comment about removing openssl-src* from CARGO-CRATES each update

   Used same approach on editors/lapce, but looking for a better way to do this
   if possible
Comment 1 Nuno Teixeira freebsd_committer freebsd_triage 2023-11-01 13:41:12 UTC 
Found a better example of removing vendored openssl-src form .lock and .toml:
https://git.alpinelinux.org/aports/tree/testing/lapce/libgit2.patch

Will apply it in editors/lapce 0.3.0 version update.
Comment 2 Yuri Victorovich freebsd_committer freebsd_triage 2023-11-01 17:05:02 UTC 
Hi Nuno,

Thanks for the patch.
Approved, please commit it.


Yuri
Comment 3 Nuno Teixeira freebsd_committer freebsd_triage 2023-11-01 21:42:49 UTC 
Created attachment 246053 [details]
Refresh patch to current version

Tomorrow I will have full build logs.

- Quick tests from today show me that it links to openssl3 on 140RC3 and openssl1 on 13.2 (ldd).

- Build OK on 12.4-RELEASE i386
- Building in progress on 13.2-STABLE armv7 (rpi4)
- Can't test on powerpc

- Need to do a run test on my pc (15-CURRENT amd64)
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-11-02 09:59:19 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=35260b97a5e8551b2e15e66a7f0c3360ef710343

commit 35260b97a5e8551b2e15e66a7f0c3360ef710343
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2023-11-02 09:50:49 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-11-02 09:57:41 +0000

    devel/gitui: Unbreak 32bit archs/Disable vendored-openssl

    - Unbreak 32 bit archs:
      Apply sys-info-0.9.1 fix crate (mixing constant and variable width types)
    - Disable vendored-openssl
    - Move crates list to Makefile.crates

    PR:             267469
    MFH:            2023Q4

 devel/gitui/Makefile                              | 236 +---------------------
 devel/gitui/Makefile.crates (new)                 | 217 ++++++++++++++++++++
 devel/gitui/distinfo                              |   4 +-
 devel/gitui/files/patch-Cargo.lock (new)          |  28 +++
 devel/gitui/files/patch-asyncgit_Cargo.toml (new) |  13 ++
 5 files changed, 270 insertions(+), 228 deletions(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-11-02 10:08:22 UTC 
A commit in branch 2023Q4 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=97969f510de1296e1eef149301dca67a3505c80e

commit 97969f510de1296e1eef149301dca67a3505c80e
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2023-11-02 09:50:49 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-11-02 10:00:42 +0000

    devel/gitui: Unbreak 32bit archs/Disable vendored-openssl

    - Unbreak 32 bit archs:
      Apply sys-info-0.9.1 fix crate (mixing constant and variable width types)
    - Disable vendored-openssl
    - Move crates list to Makefile.crates

    PR:             267469
    MFH:            2023Q4
    (cherry picked from commit 35260b97a5e8551b2e15e66a7f0c3360ef710343)

 devel/gitui/Makefile                              | 235 +---------------------
 devel/gitui/Makefile.crates (new)                 | 217 ++++++++++++++++++++
 devel/gitui/distinfo                              |   4 +-
 devel/gitui/files/patch-Cargo.lock (new)          |  28 +++
 devel/gitui/files/patch-asyncgit_Cargo.toml (new) |  13 ++
 5 files changed, 270 insertions(+), 227 deletions(-)
Comment 6 Nuno Teixeira freebsd_committer freebsd_triage 2023-11-02 10:09:03 UTC 
Committed, thanks!