From nobody Thu Aug 3 21:44:54 2023 X-Original-To: dev-commits-ports-branches@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 4RH2SQ6PRxz4V3pk; Thu, 3 Aug 2023 21:44:54 +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 4RH2SQ612Kz3XrC; Thu, 3 Aug 2023 21:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691099094; 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=x8wjrqJnB7cPFoG8CGq0jlUt5ynUNexhAoWSuTSuwxU=; b=Sa4EhxIKACIQS2S0bkDATLAsLGjNxURO6c+44uVrAJVHtC4qu/zUBXNkEWQPX+aGHJlDp9 +5kVA5Mg7WxphKMBMntx+J3N9FWE5j9zwwdkzxmrTk+w0a91r5idTv8zLnkIJH7b24HzLY K6anLtrZIB6V4B6GO8ig8/RLa8J94N6pMPuYN8R8GLY7KBbQcAUa9dXKYNO1EdlWKRrxXV I0nOI6Ly1jq7Z6oD0YJ+PUeBcBY9C87vBjxoN1Xw8REf1AYhuoYr2KTUbz4v1sRDJrQpU6 neZx14NjeaQeDmbjcYbqHhbMRVas+UQq6FRKeFGzePeo6tRRnI4Gd79EJj18zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691099094; 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=x8wjrqJnB7cPFoG8CGq0jlUt5ynUNexhAoWSuTSuwxU=; b=Ul4Rd/hrZo2mag2okCgS0U438lMgeZOrSCj0LsJKa4mr3pfg3+6NTE7nr3A5Zr/+amvF8Q yocgEyWKaSoP4JV3Pt9Yjgzk6+4BI47J6xWnKtIqtbaJlL72t36CBgeCAZhe6NqQowsu3l kY9b1eI0l8mzeCaZaQ1iGEQE07+vkVo484dsUUmTgYTr7QjWjqMsWYlluYTRtB12gYdFVm f95RZgXCMHJhOivNvzHWkJANUEj0yV4yi7LwxZLHfadpVw1lDym/FgEXReBiMIun4BqOg9 tshxdCvQwka2S6EKv1lKAHU2IpcgwjvElodfgRPIBa5JQwmxFlFBLAI17MV36A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691099094; a=rsa-sha256; cv=none; b=S49fpTjg/JY9dfo2cYUpA4u8yQF0a2rgAGhoJ2yTj4r13OsqFBvDl+haQPNb6zSCua8FcS dYmCwhdaYm/h9wDRa6qmiQzGkqWNQ8Vhas57T8f2tAoNT1uQp1Xilt2rdnvZwWXTJxtV7o 8bX4DKhfQl3hN/51eIMHscRUwdz/D+piUAhhLCexRCDL7XkNbyLp4icHGIWR4PRzuwuCxa CuCWUv/eMJSZnb0I+3m6cvj3US1SENlfx6wfVCBfWnuKM43n2nq8hJ1eYCXpZFP4yldpII LWNSyF35LV9/N/NfMf6fLoo8bfNlIbrD8qDPQBrusQV/V2ZDYcsQ218OqqqC8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RH2SQ55hYzcgp; Thu, 3 Aug 2023 21:44:54 +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 373Lisbo054496; Thu, 3 Aug 2023 21:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373LisPI054495; Thu, 3 Aug 2023 21:44:54 GMT (envelope-from git) Date: Thu, 3 Aug 2023 21:44:54 GMT Message-Id: <202308032144.373LisPI054495@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: 43c381539b15 - 2023Q3 - x11-toolkits/wlroots-devel: update to 0.16.0.681 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 43c381539b15f7aeff2633513be1acf1c62eeb60 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=43c381539b15f7aeff2633513be1acf1c62eeb60 commit 43c381539b15f7aeff2633513be1acf1c62eeb60 Author: Jan Beich AuthorDate: 2023-08-03 14:40:28 +0000 Commit: Jan Beich CommitDate: 2023-08-03 21:43:39 +0000 x11-toolkits/wlroots-devel: update to 0.16.0.681 Changes: https://gitlab.freedesktop.org/wlroots/wlroots/-/compare/d40bcfe2c1...c74f89d4f8 (cherry picked from commit 6312e4808912fc8a6f10cabb867aad110c6f5abd) --- x11-toolkits/wlroots-devel/Makefile | 4 ++-- x11-toolkits/wlroots-devel/distinfo | 6 +++--- x11-wm/hyprland/Makefile | 9 +++++++++ x11-wm/hyprland/distinfo | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index aec6d7a1d033..2a4fe54fa346 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wlroots -DISTVERSION= 0.16.0-677 +DISTVERSION= 0.16.0-681 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel @@ -27,7 +27,7 @@ USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org -GL_COMMIT= d40bcfe2c18f057f4bc324a81230f6ba2267db44 +GL_COMMIT= c74f89d4f84bfed0284d3908aee5d207698c70c5 MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 68bd6d44ef37..994bc5acbe27 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1690546897 -SHA256 (wlroots-wlroots-d40bcfe2c18f057f4bc324a81230f6ba2267db44_GL0.tar.gz) = 407018b74fb45cbc1b72916c115185c280b478a8e534468aaac0243a394ef9c1 -SIZE (wlroots-wlroots-d40bcfe2c18f057f4bc324a81230f6ba2267db44_GL0.tar.gz) = 635499 +TIMESTAMP = 1691073628 +SHA256 (wlroots-wlroots-c74f89d4f84bfed0284d3908aee5d207698c70c5_GL0.tar.gz) = a9b6687915f5b5b7e80cdddc601fc6faf1467f89811c2e11610e751018e4a586 +SIZE (wlroots-wlroots-c74f89d4f84bfed0284d3908aee5d207698c70c5_GL0.tar.gz) = 635433 SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5 SIZE (10f80a8f1bb2.patch) = 6097 SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 104c75d5db1b..2dd84563684a 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -9,6 +9,7 @@ PATCHFILES+= 9fc5f4c48b20.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/26 PATCHFILES+= f6b340cc19d2.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2799 PATCHFILES+= f5913135c638.patch:-p1 # cursor-shape-v1 PATCHFILES+= 7a2027d1fd5d.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/2828 +PATCHFILES+= 7d98181ade0a.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2884 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' @@ -43,6 +44,14 @@ OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland +post-extract: +.if defined(PATCHFILES) && ${PATCHFILES:M7d98181ade0a*} +# Pretend to be a regular file for vendor patch to apply as is + @${RMDIR} ${WRKSRC}/subprojects/wlroots + @${ECHO_CMD} "Subproject commit e8d545a9770a2473db32e0a0bfa757b05d2af4f3" \ + >${WRKSRC}/subprojects/wlroots +.endif + post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \ diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index 13f464ef5327..c147d27e7154 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -15,3 +15,5 @@ SHA256 (f5913135c638.patch) = 5ce790d91b4918f77dfa67cf3f42a129a1dbef20f8906facb8 SIZE (f5913135c638.patch) = 9018 SHA256 (7a2027d1fd5d.patch) = dcf2e5b2233077c3b35dd1191ea672104e0f7632a6310a8c4661933444d13819 SIZE (7a2027d1fd5d.patch) = 1916 +SHA256 (7d98181ade0a.patch) = d94c45c2abeb4d3b96c058e31d2c2090cdaf934a6f289846e9c4050c54b25c23 +SIZE (7d98181ade0a.patch) = 1195