From nobody Thu May 19 16:20:57 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 491901B452C4; Thu, 19 May 2022 16:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L3w8B1bl0z4tbw; Thu, 19 May 2022 16:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652977258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7S6GvN1iKdsr1st20/coppN8xSby7U47bpVOwajJho=; b=BbK1oKUIrJs0g5K7y7ausqmpPQPLeSXdiwHulrw7aeuWOBfwlyuoRG8j49l6+VOAeScTaP TqTlFNO6bWbUMd8v9271WwtuEYzoPKP+WrzxdeaauAfLIk6O92oPDI16XkqZEvFZr5mzZ+ SCXwyTnEg4j+dPMSJWYu9zKjxmlivSYmTJayLSNlP0cdgv/5w0buuCr+e0unJHt1xhkk6A LNP9zMcP16gGePn8hudzMMhLVUhP/wQUvkT/ysz9OHyMny0cXp+d91yXcfa/XONeDf+Umt CF+nRVjHpgnDWhSrIzBO1MeZDEKZXKxm0PtOhGYlkrgPHC91vH/vBYa0jpanfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 169BB20573; Thu, 19 May 2022 16:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24JGKvk0016492; Thu, 19 May 2022 16:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JGKvbw016491; Thu, 19 May 2022 16:20:57 GMT (envelope-from git) Date: Thu, 19 May 2022 16:20:57 GMT Message-Id: <202205191620.24JGKvbw016491@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 1ac2359a88f6 - main - audio/libcanberra: include the gtk header in both gtk2 and gtk3 cases 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; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ac2359a88f69ac1dba2e9eef8ab0402fd244850 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652977258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7S6GvN1iKdsr1st20/coppN8xSby7U47bpVOwajJho=; b=pB4JPDsQI9zrLWvQny946Jss+QFETm/eQpgh0592tC/ZAs7N17/pRUTr+uzA3EpaKCq++g E3ud7Pt+UwoERTlg3a1DfJTcvhON/EDWgmBC6vZzhZWNfFTt2PcNQiiThINFs0LuiNNrEh r1DdK+3Aq1XgL4lLlOI/v55B3yYgVDXhn0uyQEmTf1EPVd2rl3KMHlTQI+QqViCvqg4n2B wqAwX7yCoEHPpNCPMhqoUHtsGPGDCtzi4DRKY1lEHilZBrDWnvb4hMsH4QBSwgePiFCJJm xBglyf2sf5DYKgA4+WilDwxkyuSZ0C8/WhuEZsUg3uvJvO/qlC4xz42bsklf6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652977258; a=rsa-sha256; cv=none; b=nmKfvKF3gbqyqO8duLfHboP1/ZxClNn94gSvAeUFVH87DFcyQkOXVZd6rSKrkAqVz6zWzl ZLmODuJndbPZX1nFLX4Raz3FIxplbjBIneoUGJqzCemh/3w8r6LoFUPc97kmmVuYW9pztu LpBmpoQAA27EPNMLmfI+gqrh4dw5+j/DuKR0FNmUvspj49PrMsAtxt5V8iPgg3fDMQxtj4 HwGfgz8h5s6Xr/KqFpTMr9kcDaNoU5V2blccX17GXguSLXwLEU9rn2pTl9D52xlVd3eOK3 2U3+fOtp2F4/S8yjAkN5Ucky4grVNTP9W0A9I+HC41sYnKZ07DZqn8Tgyup35g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ac2359a88f69ac1dba2e9eef8ab0402fd244850 commit 1ac2359a88f69ac1dba2e9eef8ab0402fd244850 Author: Baptiste Daroussin AuthorDate: 2022-05-19 16:12:41 +0000 Commit: Baptiste Daroussin CommitDate: 2022-05-19 16:20:28 +0000 audio/libcanberra: include the gtk header in both gtk2 and gtk3 cases Avoid collision by puting them in a different path which is anyway provided by pkgconf Reported by: jbeich --- audio/libcanberra-gtk2/Makefile | 4 ++++ audio/libcanberra-gtk3/Makefile | 4 ++++ audio/libcanberra/Makefile | 11 ++++++++--- audio/libcanberra/files/patch-libcanberra-gtk.pc.in | 11 +++++++++++ audio/libcanberra/files/patch-libcanberra-gtk3.pc.in | 11 +++++++++++ audio/libcanberra/pkg-plist | 3 ++- 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/audio/libcanberra-gtk2/Makefile b/audio/libcanberra-gtk2/Makefile index 80b43da73f6e..047d9d77e49c 100644 --- a/audio/libcanberra-gtk2/Makefile +++ b/audio/libcanberra-gtk2/Makefile @@ -4,4 +4,8 @@ MASTERDIR= ${.CURDIR:H}/libcanberra SLAVEPORT= gtk2 +post-install: + @${MKDIR} ${STAGEDIR}/${PREFIX}/include/canberra-gtk2 + @${MV} ${STAGEDIR}/${PREFIX}/include/canberra-gtk.h ${STAGEDIR}/${PREFIX}/include/canberra-gtk2 + .include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index cccd151f3676..2b81f4d539d7 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -4,4 +4,8 @@ MASTERDIR= ${.CURDIR:H}/libcanberra SLAVEPORT= gtk3 +post-install: + @${MKDIR} ${STAGEDIR}/${PREFIX}/include/canberra-gtk3 + @${MV} ${STAGEDIR}/${PREFIX}/include/canberra-gtk.h ${STAGEDIR}/${PREFIX}/include/canberra-gtk3 + .include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 4f2d3d9262a9..7535bb147d9f 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -3,7 +3,7 @@ PORTNAME= libcanberra PORTVERSION= 0.30 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \ http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/ @@ -35,13 +35,17 @@ PKGNAMESUFFIX= -${SLAVEPORT} USE_GNOME+= gtk30 LIB_DEPENDS+= libcanberra.so:audio/libcanberra CONFIGURE_ARGS+= --enable-gtk3 \ - --disable-gtk + --disable-gtk \ + --disable-gstreamer \ + --disable-pulse PLIST_SUB+= BASE="@comment " GTK3="" GTK2="@comment " .elif ${SLAVEPORT:U} == gtk2 USE_GNOME+= gnomeprefix gtk20 LIB_DEPENDS+= libcanberra.so:audio/libcanberra CONFIGURE_ARGS+= --enable-gtk \ - --disable-gtk3 + --disable-gtk3 \ + --disable-gstreamer \ + --disable-pulse PLIST_SUB+= BASE="@comment " GTK3="@comment " GTK2="" .else CONFIGURE_ARGS+= --disable-gtk \ @@ -61,4 +65,5 @@ post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure + .include diff --git a/audio/libcanberra/files/patch-libcanberra-gtk.pc.in b/audio/libcanberra/files/patch-libcanberra-gtk.pc.in new file mode 100644 index 000000000000..9fae2df88c29 --- /dev/null +++ b/audio/libcanberra/files/patch-libcanberra-gtk.pc.in @@ -0,0 +1,11 @@ +--- libcanberra-gtk.pc.in.orig 2022-05-19 16:04:44 UTC ++++ libcanberra-gtk.pc.in +@@ -1,7 +1,7 @@ libdir=@libdir@ + prefix=@prefix@ + exec_prefix=${prefix} + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/canberra-gtk2 + + Name: libcanberra-gtk + Description: Gtk Event Sound API diff --git a/audio/libcanberra/files/patch-libcanberra-gtk3.pc.in b/audio/libcanberra/files/patch-libcanberra-gtk3.pc.in new file mode 100644 index 000000000000..5238c31eac22 --- /dev/null +++ b/audio/libcanberra/files/patch-libcanberra-gtk3.pc.in @@ -0,0 +1,11 @@ +--- libcanberra-gtk3.pc.in.orig 2022-05-19 16:04:19 UTC ++++ libcanberra-gtk3.pc.in +@@ -1,7 +1,7 @@ libdir=@libdir@ + prefix=@prefix@ + exec_prefix=${prefix} + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/canberra-gtk3 + + Name: libcanberra-gtk3 + Description: Gtk3 Event Sound API diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist index e92f3d0a6c9a..a24f785cf019 100644 --- a/audio/libcanberra/pkg-plist +++ b/audio/libcanberra/pkg-plist @@ -1,5 +1,6 @@ %%GTK2%%bin/canberra-gtk-play -%%GTK2%%include/canberra-gtk.h +%%GTK2%%include/canberra-gtk2/canberra-gtk.h +%%GTK3%%include/canberra-gtk3/canberra-gtk.h %%BASE%%include/canberra.h %%GTK2%%lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %%GTK2%%lib/gtk-2.0/modules/libcanberra-gtk-module.so