Re: git: 03ff10027e28 - main - audio/libcanberra: split a gtk2 from non graphic port

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 19 May 2022 15:49:47 UTC
Baptiste Daroussin <bapt@FreeBSD.org> writes:

> The branch main has been updated by bapt:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=03ff10027e28f1047a3057b5c3615a9a4d324276
>
> commit 03ff10027e28f1047a3057b5c3615a9a4d324276
> Author:     Baptiste Daroussin <bapt@FreeBSD.org>
> AuthorDate: 2022-05-19 12:30:01 +0000
> Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
> CommitDate: 2022-05-19 12:34:03 +0000
>
>     audio/libcanberra: split a gtk2 from non graphic port
>     
>     there was already a slave port for gtk3, now make a slaveport for gtk2 as
>     well.
>     
>     While here fix the option definition which was wrongly done making libcanberra
>     have no options at all while libcanberra-gtk3 had and the opposite was expected
>     
>     Use options helpers to simplify the port.
>     Drop the gtkdoc by default
>     bump revision and track no package for the 2 only port requiring the gtk2 library
>     Reduce the slave port to its bare minimal requirement
>     
>     This change has been made in a slaveport instead of a flavor, because flavors depending
>     on its own origin is not supported. this is a candidate for subpackages in the futur.
>     
>     note that this changes also removes gtk2 from the dependency path of many gtk3 only
>      application
> ---
>  audio/Makefile                        |  1 +
>  audio/libcanberra-gtk2/Makefile       |  7 ++++
>  audio/libcanberra-gtk3/Makefile       | 25 +-------------
>  audio/libcanberra-gtk3/pkg-plist      |  6 ----
>  audio/libcanberra/Makefile            | 52 ++++++++++++++--------------
>  audio/libcanberra/pkg-plist           | 64 ++++++++++++++++-------------------
>  games/gnubg/Makefile                  |  4 +--
>  mail/claws-mail-notification/Makefile |  4 +--
>  8 files changed, 67 insertions(+), 96 deletions(-)
[...]
> -include/canberra-gtk.h
> +%%GTK2%%include/canberra-gtk.h

Can you fix sysutils/gnome-settings-daemon as well?

$ poudriere testport -j 130amd64 sysutils/gnome-settings-daemon
[...]
../plugins/power/gpm-common.c:32:10: fatal error: 'canberra-gtk.h' file not found
#include <canberra-gtk.h>
         ^~~~~~~~~~~~~~~~