From nobody Fri Jan 05 15:09:03 2024 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 4T66L765LFz57J83; Fri, 5 Jan 2024 15:09:03 +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 4T66L724ZFz4k6S; Fri, 5 Jan 2024 15:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704467343; 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=k+bKPXb7GStiAgkfPVgpv8gtdoeYKtDEMnqruWfSPvY=; b=Rtr9O4NSYN9M+Q2B66bpsJ0VPz2r2LtPCB+3I3UtFGN1r2clMuKs/5l0BHwZQ74MOO6RmL W+dztE4e6W1IL20BJ/vXODX4T7z7toZPII62b1zyi/3G/91UUlamD5JnPC90nxlwAY/wCi QOK6sYYhpiqgCsG6/CRZxktok4+nY4gmRDdExtQC7Yb5ElbvmCQ9JjPHTuzKQbyI8s5Xit skIDInaStEOPgHdHYWgYzGyOTrIbkarmYUYF4Ge9enLlPuqwCwWvaZinnd6BRDOeJtFEcy eJTq8bRD/UCCxaob7cURv+4dIbNqVwwS3c9M+7DbGwtWxeSw+PEfrb9Jv7ALZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704467343; 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=k+bKPXb7GStiAgkfPVgpv8gtdoeYKtDEMnqruWfSPvY=; b=HiojuvLTcX2y203+PVKspLWxPE98EkWAfeHoKd80wqfmaTpasH3i2IsYdiYzMgIQ0M3IVl lni0s+M5/WJTGJAYE4DYK3tQXV3613O1y2xCNw2n0g3CkPTRdF+eFD6RuUItZi806U9j1V rCdUq37dZw9N7fV9htSpJvy8jvn3vBPrgiDE5kkVB8pBAPvfChbfk4JOSPOlqin+iE/FcP rhBaKrAhq5YeT3bb1jhSdG+fpYe/c3GHZNK/UMOWg+rFar0XydzVwGyyrSpgabLtVrMPLj Lh94d7s+qkOfXJFelwDVzdoZgC+Msy840JEpLjh1CUPx2tbT1y6Snq06ocpFVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704467343; a=rsa-sha256; cv=none; b=bw6qpfMP4WOCFHp5Es35R47MaOOB2M+he2+5VngEgKe8VgOxoPjaUnPqzBkz3oSGN24cvx asVpX0iB6y798Kdz/greVZ49CG5nVlFaW1A3q0kJoknfYqQIwcysM90QpNubPZ3Y9UH6sH FmaeoUPPYuNdZjau5Pe0WyV5CWRgKhTQcnfqUjbDibHCmfXt64J4KFlX7ouNbI3mjk2o4h 2o8RznIeR4SYPXe3QrpqqDLUAMGfFz1p33Msd9qjXDzX5SM5o8BXHSvdPoGv3bCt5xGVTr ugieCL5cpN8KShpNH99QkxvCfpLhNJZwDu4+CwMu9x1lpGVCAOAp6ep+lekB5g== 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 4T66L70r3hz12Pq; Fri, 5 Jan 2024 15:09:03 +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 405F931I005586; Fri, 5 Jan 2024 15:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405F93pa005583; Fri, 5 Jan 2024 15:09:03 GMT (envelope-from git) Date: Fri, 5 Jan 2024 15:09:03 GMT Message-Id: <202401051509.405F93pa005583@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ad8bd257a16b - main - x11/xdg-desktop-portal-hyprland: convert to USES=cmake 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad8bd257a16baf7813815ec7c597d0706e2343e5 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad8bd257a16baf7813815ec7c597d0706e2343e5 commit ad8bd257a16baf7813815ec7c597d0706e2343e5 Author: Jan Beich AuthorDate: 2024-01-04 18:33:17 +0000 Commit: Jan Beich CommitDate: 2024-01-05 15:07:54 +0000 x11/xdg-desktop-portal-hyprland: convert to USES=cmake --- x11/xdg-desktop-portal-hyprland/Makefile | 26 ++++++++++++++------------ x11/xdg-desktop-portal-hyprland/distinfo | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 73f7cf90b6f1..2b1c29f5a767 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -3,6 +3,15 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 CATEGORIES= x11 wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= f46cff1df2d8.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/151 +PATCHFILES+= 21d216ed7f64.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/pull/154 +PATCHFILES+= c0b606460a09.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/156 +PATCHFILES+= df8c154f5793.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/157 +PATCHFILES+= 86a94c3e4edb.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/158 +PATCHFILES+= 1c802128f6cc.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/159 +PATCHFILES+= 379b27281e2c.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/160 + MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland @@ -25,13 +34,14 @@ qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} qt6_PKGNAMESUFFIX= -qt6 -USES= compiler:c++11-lib gl meson pkgconfig +USES= cmake compiler:c++11-lib gl pkgconfig USE_GITHUB= yes USE_GL= gbm GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols -MESON_ARGS= -Dsystemd=disabled -PLIST_FILES= libexec/${PORTNAME} \ +LDFLAGS+= -Wl,--as-needed # sdbus-cpp deps +PLIST_FILES= lib/systemd/user/${PORTNAME}.service \ + libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal @@ -42,22 +52,14 @@ CXXFLAGS+= -fexperimental-library 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 + @${REINPLACE_CMD} '/hyprland-share-picker/d' ${WRKSRC}/CMakeLists.txt # 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 USES+= llvm:min=16,build,export PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* 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 diff --git a/x11/xdg-desktop-portal-hyprland/distinfo b/x11/xdg-desktop-portal-hyprland/distinfo index e258b7c1add6..d261a9b5d24e 100644 --- a/x11/xdg-desktop-portal-hyprland/distinfo +++ b/x11/xdg-desktop-portal-hyprland/distinfo @@ -5,3 +5,17 @@ SHA256 (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 106cb189d0fbe4ec0ee11a12a17 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 (f46cff1df2d8.patch) = c33ca9926012d563d1c5e8c68132556dae039dcc8e7b5805b3be55f14ab1c075 +SIZE (f46cff1df2d8.patch) = 1345 +SHA256 (21d216ed7f64.patch) = 04249d9ac3ff4157005439580fe1b7be31f609456e8364479d643643897c8d2b +SIZE (21d216ed7f64.patch) = 8417 +SHA256 (c0b606460a09.patch) = 66f8d6f936b7050497d37b3f4aa29dae033b9230e3b20f224629f95ed97120de +SIZE (c0b606460a09.patch) = 787 +SHA256 (df8c154f5793.patch) = 11d736a17916617d69936e109312764264d9ddc120545147ff3816c5520a1cee +SIZE (df8c154f5793.patch) = 1135 +SHA256 (86a94c3e4edb.patch) = 02b10b0888ebfc36726b5743eb2ac961abaaef064f84f5555d1e1e630ae8916a +SIZE (86a94c3e4edb.patch) = 766 +SHA256 (1c802128f6cc.patch) = bd8b01b6e7e9b0ab34458dcd8a41eaee24c296c2b917c3c68b236f2c1bf8bfc0 +SIZE (1c802128f6cc.patch) = 839 +SHA256 (379b27281e2c.patch) = 3abb1a458423d678bbd819c509266e8568474081b434c2ca0999252dc0a3a8f3 +SIZE (379b27281e2c.patch) = 794