From nobody Fri Nov 11 22:41:42 2022 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 4N8DGG4Spwz4YSr1; Fri, 11 Nov 2022 22:41:42 +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 4N8DGG3y74z3KqX; Fri, 11 Nov 2022 22:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206502; 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=m8vk3FeQZC1ouJXNu9lJohtd7TUmYVlSqQCJMDJhxqk=; b=dt5cFOEzW/YKT85HF/AncWs0LdLIf2gIgngLgqP8a1xfqhfPVUmEYFWlPLgveccEualVUk DDvTeNrDzbRRVDLfglhwOICZCob6elDtNoRYxXcv8Aucoq1D/y/DFly1xs5spaEB40Pd/S CaR47N5URBCQcb1CRUsPRZpnzokODBizcCGMs95dra0K0oLdSdPkDqfk/hWkyREs46W0xU hDEqtyGiPQzocec0MVE8EtQzlV5Sf8HxLk/zgepDUFdcKj3f6bb8P0+Ymb8tKDXGAZ2g82 SWjT5taJd+fY8TCMZkN8jcYLQc3U86fkRNtetxcpE+/cYrITF6BnwHEXpC2ryw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206502; 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=m8vk3FeQZC1ouJXNu9lJohtd7TUmYVlSqQCJMDJhxqk=; b=J5ovgoV43OA705AJBRz2w0sD8CaKWiQSjUimAm66R+bL9+CAXN/LmvpSNkHRMSZMz7Uoti 25CSTeuQWeTf4pNXSoCGA3Y4CEt2wL/vHKGtD6PuXe068h6MbF7T2A4V/EfshN9U07yyBR TavXUqAJlDnd40Dc8vYpKucLW+0dYyW7zcViZV4UZM3BYCOBvlDZsJp8y2tigC0V4D59LJ DIlWNLXOOkSSthjrFEHGIhJFNAYVqJTNVDm5lzS37U1KuvXM7v+kwwxg18iHz8t31bMkyV uqdjGmiUXW6ntid9QfMMFt/O6pOjSjVBqkOjmfgWx4uz3+rl0NIcmaE4dpfXJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668206502; a=rsa-sha256; cv=none; b=p04N4uvEf3L0SfYiet1uEyb86cmHx4xR8nrXN9SFjZ4s6/g67IuSeDWAsWFRpCsMkasPbq mnCz69qWZdaAgaJz+eUWKE5jr7z2YmPidyY7URBUIbaZ3ugMWWMS5URkIdUVyJX74QVgjP BwY3tdVzWVjz84DgXvXgDxMcSottcAEAYEsoXrB5+n8+IqDlN7bxH9aZ4Fq/AlzPG7NERt JnhcyEnzCrAgq5dgGTBLDdB2aO2A1McaEi0EN714DAknOC8LQm61f4k/dsOlgfH9ZCeyM3 X2Ub53QcDBU5tNeOceRBQSXlWUSR2zG4Tmhf2Fp5DYGBEfnBobN2w0YLnXXv5A== 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 4N8DGG32v8z10d3; Fri, 11 Nov 2022 22:41:42 +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 2ABMfgJQ059443; Fri, 11 Nov 2022 22:41:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABMfg7Q059442; Fri, 11 Nov 2022 22:41:42 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:41:42 GMT Message-Id: <202211112241.2ABMfg7Q059442@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: 5758a46edec9 - main - x11-wm/labwc: back to default wlroots 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/main X-Git-Reftype: branch X-Git-Commit: 5758a46edec9bade8911e74eeecc1dcc1e8dd347 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5758a46edec9bade8911e74eeecc1dcc1e8dd347 commit 5758a46edec9bade8911e74eeecc1dcc1e8dd347 Author: Jan Beich AuthorDate: 2022-06-28 21:11:00 +0000 Commit: Jan Beich CommitDate: 2022-11-11 22:39:56 +0000 x11-wm/labwc: back to default wlroots --- x11-wm/labwc/Makefile | 21 +++++++++++++++------ x11-wm/labwc/distinfo | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile index e2f1ae25a038..3f2a0ee57d37 100644 --- a/x11-wm/labwc/Makefile +++ b/x11-wm/labwc/Makefile @@ -1,8 +1,19 @@ PORTNAME= labwc DISTVERSION= 0.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 9ef7faf376a1.patch:-p1 # wlroots 0.16 +PATCHFILES+= cfca377ca2ec.patch:-p1 # wlroots 0.16 +PATCHFILES+= 581a2bb2f10c.patch:-p1 # wlroots 0.16 +PATCHFILES+= d844f6798b2d.patch:-p1 # wlroots 0.16 +PATCHFILES+= bca2e9be60c8.patch:-p1 # wlroots 0.16 +PATCHFILES+= d6c890ed164a.patch:-p1 # wlroots 0.16 +PATCHFILES+= d8a877749e45.patch:-p1 # wlroots 0.16 +PATCHFILES+= 8fb196cba138.patch:-p1 # wlroots 0.16 +PATCHFILES+= c06100fa3a45.patch:-p1 # wlroots 0.16 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland stacking compositor WWW= https://github.com/labwc/labwc @@ -11,7 +22,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ - wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots + wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ @@ -36,13 +47,12 @@ MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz \ man/man5/${PORTNAME}-menu.5.gz \ man/man5/${PORTNAME}-theme.5.gz +X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm X11_MESON_ENABLED= xwayland -post-extract: +post-patch: # Force system dependencies @${RM} ${WRKSRC}/subprojects/*.wrap - -post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ @@ -54,5 +64,4 @@ post-patch: ${WRKSRC}/docs/${PORTNAME}-environment.5.scd \ ${WRKSRC}/src/common/dir.c -.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/labwc/distinfo b/x11-wm/labwc/distinfo index fdb3d23be6ab..6a70dec3d400 100644 --- a/x11-wm/labwc/distinfo +++ b/x11-wm/labwc/distinfo @@ -1,3 +1,21 @@ TIMESTAMP = 1657906446 SHA256 (labwc-labwc-0.5.3_GH0.tar.gz) = 0b67bc89a5d9059fae28822f3ba2373553dea290cd931c9384a91dbeb2054650 SIZE (labwc-labwc-0.5.3_GH0.tar.gz) = 110293 +SHA256 (9ef7faf376a1.patch) = 94d349d92b969f1589e9566ce41ab8442ceea1ee3384a451c649d534e5392b78 +SIZE (9ef7faf376a1.patch) = 7479 +SHA256 (cfca377ca2ec.patch) = c45eaba3a38b2c5b706524729a78c8d6b94574add898ca581f9f62627d1ea292 +SIZE (cfca377ca2ec.patch) = 918 +SHA256 (581a2bb2f10c.patch) = 2f8bcb000f354c6d1a4976fca972a5ee3f32666cd5242eaf3de32f0c22261586 +SIZE (581a2bb2f10c.patch) = 3737 +SHA256 (d844f6798b2d.patch) = b86f5d87bf9408a5e57e29d26ca9dac9d421bf5b30928b79ff55e0c79d88d0dc +SIZE (d844f6798b2d.patch) = 9865 +SHA256 (bca2e9be60c8.patch) = bc798c40b5c4483f9ab67efbf39813b5058c4562ef1b230c80f71d372dee36fc +SIZE (bca2e9be60c8.patch) = 1267 +SHA256 (d6c890ed164a.patch) = df4162d768d44e461a43e28b2a02f454eb73a1345d3f72f298fcced50a1054ec +SIZE (d6c890ed164a.patch) = 2129 +SHA256 (d8a877749e45.patch) = bb59c777b5ea08d2d4826d1bac16ac30706c60172a8d8c4223183cf665755dcb +SIZE (d8a877749e45.patch) = 1525 +SHA256 (8fb196cba138.patch) = ceeff1d35d271eab75a1ef9a3d1b9812c2ae4d6f301017d15ea7f16142adeb23 +SIZE (8fb196cba138.patch) = 1586 +SHA256 (c06100fa3a45.patch) = f6420b9d09ed4c48de929bba5248287207a6d3b8fe5b824893d4e08b13a97d2a +SIZE (c06100fa3a45.patch) = 2523