Bug 269704 (at-spi2-core-2.46.0) - [exp-run] accessibility/at-spi2-core: update to 2.46.0
Summary: [exp-run] accessibility/at-spi2-core: update to 2.46.0
Status: Closed FIXED
Alias: at-spi2-core-2.46.0
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tobias C. Berner
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-02-20 05:40 UTC by Tobias C. Berner
Modified: 2023-03-04 09:30 UTC (History)
2 users (show)

See Also:
antoine: exp-run+


Attachments
v1 (477.92 KB, patch)
2023-02-20 05:41 UTC, Tobias C. Berner
no flags Details | Diff
v2 (30.66 KB, patch)
2023-02-24 09:37 UTC, Tobias C. Berner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tobias C. Berner freebsd_committer freebsd_triage 2023-02-20 05:40:57 UTC
Moin moin 

desktop@ would like to ask for an exp-run to update accessibility/at-spi2-core to 2.46.0. The ports accessibility/atk and accessibility/at-spi2-atk are removed and integrated into this one.

The patch is attached, and can also be found here:
https://people.freebsd.org/~tcberner/patches/0001-accessibility-at-spi2-core-update-to-2.46.0.patch


mfg Tobias
Comment 1 Tobias C. Berner freebsd_committer freebsd_triage 2023-02-20 05:41:22 UTC
Created attachment 240272 [details]
v1
Comment 2 Antoine Brodin freebsd_committer freebsd_triage 2023-02-24 09:19:04 UTC
Can you provide the patch without the bumps to avoid conflicts?
Comment 3 Tobias C. Berner freebsd_committer freebsd_triage 2023-02-24 09:37:01 UTC
Created attachment 240369 [details]
v2

Patch without the bumps.
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-03-01 06:33:21 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2944fc896ef287d7a18d6e30ad2823cb36c6cc61

commit 2944fc896ef287d7a18d6e30ad2823cb36c6cc61
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-03-01 06:30:06 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-03-01 06:32:27 +0000

    accessibility/linux-c7-at-spi2-core: decouple from accessibility/at-spi2-core

    PR:             269704

 accessibility/linux-c7-at-spi2-core/Makefile        | 2 --
 accessibility/linux-c7-at-spi2-core/pkg-descr (new) | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-03-01 06:33:22 UTC
A commit in branch main references this bug:

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

commit f1b71e53ad37e56be52a8c8ccdc3adc009846108
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-03-01 06:29:07 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-03-01 06:31:31 +0000

    accessibility/linux-c7-at-spi2-atk: decouple from accesibility/at-spi2-atk

    PR:             269704

 accessibility/linux-c7-at-spi2-atk/Makefile        | 2 --
 accessibility/linux-c7-at-spi2-atk/pkg-descr (new) | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-03-01 06:33:23 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=202091e3a8001f79b2c30d370992e317a084c1ca

commit 202091e3a8001f79b2c30d370992e317a084c1ca
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-03-01 06:26:29 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-03-01 06:31:13 +0000

    accessibility/linux-c7-atk: decouple from accessibility/atk

    PR:             269704

 accessibility/linux-c7-atk/Makefile        | 1 -
 accessibility/linux-c7-atk/pkg-descr (new) | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
Comment 8 Tobias C. Berner freebsd_committer freebsd_triage 2023-03-01 06:49:33 UTC
(In reply to Antoine Brodin from comment #4)
@antoine, this is fixed in the tree now, by decoupling the linux variants from the normal ports.
Comment 9 Antoine Brodin freebsd_committer freebsd_triage 2023-03-01 07:47:51 UTC
Then this is fine
Comment 10 Tobias C. Berner freebsd_committer freebsd_triage 2023-03-02 05:28:53 UTC
Committed. Thanks for the exp-run.
Comment 11 Philippe Michel 2023-03-04 06:16:27 UTC
There is apparently a problem at installation:

# make install
===>  Installing for at-spi2-core-2.46.0
===>  Checking if at-spi2-core is already installed
===>   Registering installation for at-spi2-core-2.46.0
Installing at-spi2-core-2.46.0...
pkg-static: at-spi2-core-2.46.0 conflicts with at-spi2-atk-2.38.0 (installs files into the same place).  Problematic file: /usr/local/include/at-spi2-atk/2.0/atk-bridge.h
*** Error code 1

Stop.
make: stopped in /usr/ports/accessibility/at-spi2-core

The conflict appeared with this version. As far as I can see 2.44.1 was fine.
Comment 12 Tobias C. Berner freebsd_committer freebsd_triage 2023-03-04 06:20:30 UTC
(In reply to Philippe Michel from comment #11)

Moin moin 

at-spi2-atk is no longer a thing. 

mfg Tobias
Comment 13 Philippe Michel 2023-03-04 08:41:27 UTC
The update process is not nearly seamless then.

After your last comment this looked reasonable:
- find direct consumers of at-spi2-atk with pkg info
(only gtk3 in my case)
- delete it with --force
- rebuild at least the ports found at step 1

but then:
pkg-static: at-spi2-core-2.46.0 conflicts with atk-2.38.0

So do it with with atk as well.
Comment 14 commit-hook freebsd_committer freebsd_triage 2023-03-04 09:30:03 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=35dc178954c3c2f2f963cfdf22bfb4431e954465

commit 35dc178954c3c2f2f963cfdf22bfb4431e954465
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-03-04 09:28:37 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-03-04 09:28:37 +0000

    UPDATING: add a note about accessiblity/atk and accessibility/at-spi2-atk

    PR:             269704

 UPDATING | 14 ++++++++++++++
 1 file changed, 14 insertions(+)