Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Aug 2023 17:05:18 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b465bc7b9d53 - main - x11/xdg-desktop-portal-wlr: drop unused dependency on FreeBSD >= 14.0
Message-ID:  <202308281705.37SH5Inq028597@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

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

commit b465bc7b9d53e5fd90051d92e11728ddb4ff1eaa
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-27 08:24:44 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-08-28 17:05:02 +0000

    x11/xdg-desktop-portal-wlr: drop unused dependency on FreeBSD >= 14.0
---
 x11/xdg-desktop-portal-hyprland/Makefile | 10 +++++++++-
 x11/xdg-desktop-portal-hyprland/distinfo |  2 ++
 x11/xdg-desktop-portal-wlr/Makefile      | 10 +++++++++-
 x11/xdg-desktop-portal-wlr/distinfo      |  2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index c6c13c6d5c76..4e83afbe7da4 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -3,6 +3,9 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
 CATEGORIES=	x11 wayland
 
+PATCH_SITES+=	https://github.com/emersion/xdg-desktop-portal-wlr/commit/:wlr
+PATCHFILES+=	8453779cf394.patch:-p1:wlr # https://github.com/emersion/xdg-desktop-portal-wlr/pull/279
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	xdg-desktop-portal backend for hyprland
 WWW=		https://github.com/hyprwm/xdg-desktop-portal-hyprland
@@ -13,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	wayland-protocols>=1.24:graphics/wayland-protocols
 LIB_DEPENDS=	libbasu.so:devel/basu \
 		libinih.so:devel/inih \
-		libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		libwayland-client.so:graphics/wayland \
 		libuuid.so:misc/e2fsprogs-libuuid \
@@ -36,6 +38,12 @@ PLIST_FILES=	libexec/${PORTNAME} \
 		share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \
 		share/xdg-desktop-portal/portals/hyprland.portal
 
+# XXX Drop after FreeBSD 13.* EOL around 2026-01-31
+# https://cgit.freebsd.org/src/commit/?id=af93fea71038
+.if !exists(/usr/include/sys/timerfd.h)
+LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
+.endif
+
 OPTIONS_DEFINE=	SLURP
 OPTIONS_DEFAULT=SLURP
 
diff --git a/x11/xdg-desktop-portal-hyprland/distinfo b/x11/xdg-desktop-portal-hyprland/distinfo
index 0feabf1cb46c..6002c15e5f0c 100644
--- a/x11/xdg-desktop-portal-hyprland/distinfo
+++ b/x11/xdg-desktop-portal-hyprland/distinfo
@@ -3,3 +3,5 @@ SHA256 (hyprwm-xdg-desktop-portal-hyprland-v0.5.0_GH0.tar.gz) = d346cbe170e7042d
 SIZE (hyprwm-xdg-desktop-portal-hyprland-v0.5.0_GH0.tar.gz) = 50608
 SHA256 (hyprwm-hyprland-protocols-4d29e48_GH0.tar.gz) = 1384ccdbb0149cdc40d74fbe21fba97d706db08b718c7df9481076381d852c74
 SIZE (hyprwm-hyprland-protocols-4d29e48_GH0.tar.gz) = 6340
+SHA256 (8453779cf394.patch) = 45d3dc817e34ef6126f2326917d17258ea67e3e4cfd8fa3dff2c748616e2b9ed
+SIZE (8453779cf394.patch) = 881
diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile
index a3ce6ed7676c..e345b3c56c55 100644
--- a/x11/xdg-desktop-portal-wlr/Makefile
+++ b/x11/xdg-desktop-portal-wlr/Makefile
@@ -4,6 +4,9 @@ DISTVERSION=	0.7.0
 PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	8453779cf394.patch:-p1 # https://github.com/emersion/xdg-desktop-portal-wlr/pull/279
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	xdg-desktop-portal backend for wlroots
 WWW=		https://github.com/emersion/xdg-desktop-portal-wlr
@@ -14,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	wayland-protocols>=1.24:graphics/wayland-protocols
 LIB_DEPENDS=	libbasu.so:devel/basu \
 		libinih.so:devel/inih \
-		libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		libwayland-client.so:graphics/wayland \
 		libpipewire-0.3.so:multimedia/pipewire
@@ -29,6 +31,12 @@ PLIST_FILES=	libexec/${PORTNAME} \
 		share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \
 		share/xdg-desktop-portal/portals/wlr.portal
 
+# XXX Drop after FreeBSD 13.* EOL around 2026-01-31
+# https://cgit.freebsd.org/src/commit/?id=af93fea71038
+.if !exists(/usr/include/sys/timerfd.h)
+LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
+.endif
+
 OPTIONS_DEFINE=	MANPAGES SLURP
 OPTIONS_DEFAULT=MANPAGES SLURP
 
diff --git a/x11/xdg-desktop-portal-wlr/distinfo b/x11/xdg-desktop-portal-wlr/distinfo
index f27304e2a865..e9af4d684694 100644
--- a/x11/xdg-desktop-portal-wlr/distinfo
+++ b/x11/xdg-desktop-portal-wlr/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1681547546
 SHA256 (emersion-xdg-desktop-portal-wlr-v0.7.0_GH0.tar.gz) = 78377c976645c07fe5a099c75976ac3477db4764899acfe43f0910803cadf450
 SIZE (emersion-xdg-desktop-portal-wlr-v0.7.0_GH0.tar.gz) = 37652
+SHA256 (8453779cf394.patch) = 45d3dc817e34ef6126f2326917d17258ea67e3e4cfd8fa3dff2c748616e2b9ed
+SIZE (8453779cf394.patch) = 881



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308281705.37SH5Inq028597>