From nobody Sat Sep 23 00:59:00 2023 X-Original-To: dev-commits-ports-all@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 4RsrPK0c3Sz4tl4C; Sat, 23 Sep 2023 00:59:01 +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 4RsrPK04Cgz3HxF; Sat, 23 Sep 2023 00:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695430741; 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=nSm7S7HBGl3C+rPsNt1xyW7XrV4whIbFFwUZF8ZgCcw=; b=X/NlVoVKpyfindTGtzaeuPkpDuSv174XShQDHGKXDx2oIF4vuFWf1bmGk/GqGm4/rDrnj8 s86F+OHlP6M1W8N7cBqPcM/jOniByd4DgQ+tEQI1+hhd6Ll9E/Fw2dmrc0f+YVtQTT2lwN XRF7NOTDohxC8izFhR7GDZD5wnhzgBaStzAmwskXgZGUsR7joiUO/O9U4ashUoqL6Mzamy JRTCPRSl5wWFScz8qjlCK8/bNccuFkvRTvPB6e5jnI8Ff0i43s/d+EbpqXfoMeClbgexWm csgO5yT0T7fFD7LQfFKyZ198UUSj90Vfs99nZ4g9MDcmW9wZ9lagXitlz+xUAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695430741; a=rsa-sha256; cv=none; b=GJHksX7v1nBC846ni+PAM/qUAA/N7BJoXMR+9dcE00T5/dTJ302TzrNVDZuaeiBiJmktco m3a25i4OLvnuqheYwFESk2ZAbR8J6fdu0wx3htkpDFnIvQv2A3MTFS5Ez8fc5FeRYMXttc qjB1v57qtz/9WAsKgSjUFQzU7yUxt8LQtvaICZ2x2DYAj2gtEnV48/7pfX4idT/9G0A1Tl R1KqPlUWHb4dw7USEW/6GeeslCVqe9jjFxPAmuXLQs0oDuvTb3+n8Wq+cH+iPKz/6gMrWp +KEJu8IIcue4ri8Zxr/c/EGHOqm+h8xcplXrC13xcvZYsPU9AiQIeKOJhUYuwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695430741; 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=nSm7S7HBGl3C+rPsNt1xyW7XrV4whIbFFwUZF8ZgCcw=; b=a+yXf6FMTcWCOkohoJOTl8xo0qXEQoiZwfMJPOzEUgCKq5ltKwSzl3Q6B+VF2mv2j2eLso W/BSeIj3Wc8FAxiczk+Ng9MYgqDq+pDokxd8G2L5+qJwDNGcJLLb4RtFsLnIpGLiJwahSr 0jiRHMJ2D/3OxGl3ocheyBWbMGndLiviUMvDw1feBpo1byZJA86dsKg+wjQ6UxBCGoOuHf JCrDlXfiumJd7l9Gd3MiKh3xecDLgjEkyxDRc3AClk9JxXp4XoyX8XeWXKEoYiln+GFbH8 34E3+Ce345yKMdlHiGlc2KLu6kUaW7xn7ZlhzAyxbXrzSinK/YEmWucGa07uxw== 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 4RsrPJ66fkzkKj; Sat, 23 Sep 2023 00:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38N0x0L0059147; Sat, 23 Sep 2023 00:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38N0x00J059144; Sat, 23 Sep 2023 00:59:00 GMT (envelope-from git) Date: Sat, 23 Sep 2023 00:59:00 GMT Message-Id: <202309230059.38N0x00J059144@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 4907de1a82c9 - 2023Q3 - x11/xdg-desktop-portal-hyprland: update to 1.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 4907de1a82c993f2508b102ede069de772d681fe Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4907de1a82c993f2508b102ede069de772d681fe commit 4907de1a82c993f2508b102ede069de772d681fe Author: Jan Beich AuthorDate: 2023-09-06 18:36:48 +0000 Commit: Jan Beich CommitDate: 2023-09-23 00:56:27 +0000 x11/xdg-desktop-portal-hyprland: update to 1.1.0 Changes: https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v1.1.0 Reported by: GitHub (watch releases) (cherry picked from commit 4ce3b4b71dcbf414bd7304c7336a78b2721f77f2) (cherry picked from commit ea74fe0de08e3e2cee2f35286896b32f120faa0c) (cherry picked from commit 8bed8f91a83ca7bae52607fe63edca0c406f5b97) (cherry picked from commit 4d59be6930e8d7f26c67454eaf05d4f1f934a101) (cherry picked from commit c4c6f690d7bb8de7a320f0cb73b9decdcc1437be) (cherry picked from commit 66be1d09f008a202f02624a48435cc7ec124d341) --- x11/hyprland-share-picker/Makefile | 5 +-- x11/hyprland-share-picker/distinfo | 6 +-- x11/xdg-desktop-portal-hyprland/Makefile | 62 +++++++++++++++++++++++++------ x11/xdg-desktop-portal-hyprland/distinfo | 10 +++-- x11/xdg-desktop-portal-hyprland/pkg-descr | 5 +-- 5 files changed, 63 insertions(+), 25 deletions(-) diff --git a/x11/hyprland-share-picker/Makefile b/x11/hyprland-share-picker/Makefile index 8b64c6a732bf..b867b9b7dc18 100644 --- a/x11/hyprland-share-picker/Makefile +++ b/x11/hyprland-share-picker/Makefile @@ -1,14 +1,13 @@ PORTNAME= hyprland-share-picker DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 -PORTREVISION= 1 +DISTVERSION= 1.1.0 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Share picker for xdg-desktop-portal-hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland -LICENSE= MIT +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC:H}/LICENSE RUN_DEPENDS= slurp:x11/slurp diff --git a/x11/hyprland-share-picker/distinfo b/x11/hyprland-share-picker/distinfo index e1271eef1301..093cc075d392 100644 --- a/x11/hyprland-share-picker/distinfo +++ b/x11/hyprland-share-picker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691082525 -SHA256 (hyprwm-xdg-desktop-portal-hyprland-v0.5.0_GH0.tar.gz) = d346cbe170e7042d5e364242a715d021d9b8da2078a169771cf84cda13f24e76 -SIZE (hyprwm-xdg-desktop-portal-hyprland-v0.5.0_GH0.tar.gz) = 50608 +TIMESTAMP = 1695057057 +SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.1.0_GH0.tar.gz) = 4a51163ec91f1d5ec7f8c44205d44e4cb429db05edf75cc273d3a8a8efffb7c3 +SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.1.0_GH0.tar.gz) = 42732 diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 6155720de1e5..f6a5a8d16903 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -1,46 +1,84 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 +DISTVERSION= 1.1.0 CATEGORIES= x11 wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 54b5467ec12f.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/pull/98 + MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland -LICENSE= MIT +LICENSE= BSD3CLAUSE 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 \ +BROKEN_FreeBSD_12= libc++ too old + +BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols +LIB_DEPENDS= libsdbus-c++.so:devel/sdbus-cpp \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ - libuuid.so:misc/e2fsprogs-libuuid \ libpipewire-0.3.so:multimedia/pipewire -RUN_DEPENDS= grim:x11/grim \ - hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} \ - slurp:x11/slurp +RUN_DEPENDS= hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} FLAVORS= qt5 qt6 qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} qt6_PKGNAMESUFFIX= -qt6 -USES= compiler:c11 gl meson pkgconfig +USES= compiler:gcc-c++11-lib gl meson pkgconfig USE_GITHUB= yes USE_GL= gbm GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols -MESON_ARGS= -Dsd-bus-provider=basu -Dsystemd=disabled +MESON_ARGS= -Dsystemd=disabled 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 14.0 EOL around 2025-03-01 +.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) +# Emulate -fexperimental-library for GCC +CXXFLAGS+= -D_LIBCPP_ENABLE_EXPERIMENTAL # std::vformat +LDFLAGS+= -lc++experimental +.endif + +post-patch: +# XXX Merge with hyprland-share-picker instead + @${REINPLACE_CMD} '/hyprland-share-picker/d' ${WRKSRC}/meson.build + .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif +# XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) +.if ${CXX} == c++ && exists(/usr/lib/libc++.so) +.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) +BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core +CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" +CMAKE_BIN= ${LOCALBASE}/bin/cmake + +# XXX Move into separate port and standardize via USES +GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx +CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 +# Don't link against new libc++ as it's not necessary +#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt + +pre-configure: bundled-libcxx +bundled-libcxx: + @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ + -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ + -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx + @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build +.endif +.endif # exists(/usr/lib/libc++.so) + .include + +# XXX USES=compiler:gcc-c++11-lib +RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} +LDFLAGS+= -static-libgcc diff --git a/x11/xdg-desktop-portal-hyprland/distinfo b/x11/xdg-desktop-portal-hyprland/distinfo index 17c570244bb3..08010d9d71ea 100644 --- a/x11/xdg-desktop-portal-hyprland/distinfo +++ b/x11/xdg-desktop-portal-hyprland/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1691082525 -SHA256 (hyprwm-xdg-desktop-portal-hyprland-v0.5.0_GH0.tar.gz) = d346cbe170e7042d5e364242a715d021d9b8da2078a169771cf84cda13f24e76 -SIZE (hyprwm-xdg-desktop-portal-hyprland-v0.5.0_GH0.tar.gz) = 50608 +TIMESTAMP = 1695057057 +SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.1.0_GH0.tar.gz) = 4a51163ec91f1d5ec7f8c44205d44e4cb429db05edf75cc273d3a8a8efffb7c3 +SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.1.0_GH0.tar.gz) = 42732 SHA256 (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0 SIZE (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 6342 +SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 +SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 +SHA256 (54b5467ec12f.patch) = 2cacc5de7b4b72410b9d338377ee51927fdc61918bf4657dd4c03eda7e56b34f +SIZE (54b5467ec12f.patch) = 2818 diff --git a/x11/xdg-desktop-portal-hyprland/pkg-descr b/x11/xdg-desktop-portal-hyprland/pkg-descr index 679d78190620..94c1572120d6 100644 --- a/x11/xdg-desktop-portal-hyprland/pkg-descr +++ b/x11/xdg-desktop-portal-hyprland/pkg-descr @@ -1,4 +1 @@ -Due to reasons explained in hyprland-protocols, we have a separate -desktop portal impl for Hyprland. - -Although -wlr *does* work with Hyprland, -hyprland offers more features. +An XDG Desktop Portal backend for Hyprland.