From nobody Thu May 19 15:49:47 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F24231B3F8F1; Thu, 19 May 2022 15:49:51 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L3vSH6b9xz4qvZ; Thu, 19 May 2022 15:49:51 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652975391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=TSyD76Jf3LaTZ8OKj4GcYfqGRwhEnkGRjoZKj9Dp0Us=; b=KUxO8JN2h3JMvMsYZ5QrAJwtMwVn2gPCeD9764hyfEjy4yCmOMoiY2XI7rjyaJc/vXTtmX E+W0WdkbfRBiHYuAVsEcgCkVTFLbCKTuQ6NMsiD/bf7CIHLqCDigcR9m+J6ShgBET9439O MH2j6EGr3Y1UeXu6BAzoQNtqgt0VyD0JVFlUigMcW6YXyDOURVufCVaq+WwxjQhzW3R3H0 R/vHRYSihLtLIwnFXp4P0KR4gywS36jkCvvE9chEowjpaLD6+nWL68bV29Ool+uKzL4ndZ v9oHNaWNg7tPnjuT/QYzaam/WUtOnAjUXoHeB9Q37LLff9Uy2FyoCQRq/uIfXg== Received: by freefall.freebsd.org (Postfix, from userid 1354) id CE1C71E117; Thu, 19 May 2022 15:49:51 +0000 (UTC) From: Jan Beich To: Baptiste Daroussin Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 03ff10027e28 - main - audio/libcanberra: split a gtk2 from non graphic port References: <202205191234.24JCY7TN006074@gitrepo.freebsd.org> Date: Thu, 19 May 2022 17:49:47 +0200 In-Reply-To: <202205191234.24JCY7TN006074@gitrepo.freebsd.org> (Baptiste Daroussin's message of "Thu, 19 May 2022 12:34:07 GMT") Message-ID: List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652975391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=TSyD76Jf3LaTZ8OKj4GcYfqGRwhEnkGRjoZKj9Dp0Us=; b=pN5UiHRhv+nT36ZBrDq6tOusz0/FPFjCh62RN9goo3YvuHh/xj/37wAGsZ0Ou/gYq9JxQZ NO3ayfFxg53qVKnSvot/DDJrlhxfrrAPijcP2fp//2Rnox0btCu3ENSZUngbieWkIinnNG 4GFFRBtWIRyRFIh7XJlCjx1h6+UjwJqcKn1KF5fS8vE5WFWK5KPTK1SmdkcDdcg/E8roMj BtJPrKC697BFRCMbGD3o67cEozFY3XwgBK+4E6Mz0bKGYXu8swVvti1b1AK4vcsBLMHUWI nU6iCNkeOPEkZU/QEZc13nHJKqTeB2Ay4epe+stdNQPJ0UpHyYYre/OggQ5O5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652975391; a=rsa-sha256; cv=none; b=Hf7EqH6YFdTNynHIWOfv8UiAtZL+DL5I09q3e0kS0/2XyPmSTydCU8oaSJUdgQgS9qPqoy PBan+hGCDN7oaWwJtruDNoIqGhKE0cm3/Wn/shXr9u9C/erCdfUwfKpBDxNuFGMROsXicE Pk/UWB+dFKKwGng5AZrrBdA29o8gnL5mFEo6zUQ5jT07zakCJ9Kk0Ma7xSZpX0FpTFeOaQ Zw5SwAksfYnAQhPPq4OsKXDLF/XFSFmBL4kZntyRmCFjIsFFrs/qni8GBCBc2phBjxwA+7 lFVfD0NaGf2s46eGmwDvXnirKxNN0TnDjsRqzrDBzvdToqUGgAZUAhaYw4IeBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Baptiste Daroussin writes: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=03ff10027e28f1047a3057b5c3615a9a4d324276 > > commit 03ff10027e28f1047a3057b5c3615a9a4d324276 > Author: Baptiste Daroussin > AuthorDate: 2022-05-19 12:30:01 +0000 > Commit: Baptiste Daroussin > 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 ^~~~~~~~~~~~~~~~