From nobody Fri Nov 11 22:41:38 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 4N8DGC2X8fz4YSqx; Fri, 11 Nov 2022 22:41:39 +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 4N8DGC1FvQz3Ks8; Fri, 11 Nov 2022 22:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206499; 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=PLMDAD+E4m0QtOHlj4gVRO22tKId2nrbDPsHUQRFI0Y=; b=MZT4qqLpa2yXOHV1Z0nV6vHrYjnOALKsuHYdNcE/5N7ADiIS6/Mwusl2gZLGMkaZ3gzIsf P3OFuBxRVkH1XSJklo1/d2Q1BNozf/XyoHMA43gXW+Tel7tnsGKceCQ5IRfwFWpK8EPqw3 OFPjZ/PdwNA4ty/85+e/WKhGPcPpBxTBThFIWiC81Q02VBCGmogeytHIm5g11wm47Anvo4 m6T1y8w1uhBd41c2O31o0AKDOH+B5wDRUuF1gqh5jLyrj3T5XmDpJVw/jcYpR2TFyv+n89 1aRf3BXBPffx43nFFIW0OMjXO4VLjZ6klsC1/i6repi1aGciPhj721+xds3L3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206499; 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=PLMDAD+E4m0QtOHlj4gVRO22tKId2nrbDPsHUQRFI0Y=; b=giYHGqs0Gy95A/G26n3ELJ2AtciCCKrU2i45VVs70G4OT+VDYtS72hTGdy03/WaeZ7jzFJ fq0qnk8MKusNaVydA2m4GGjaNpHD+1sT5w42a9DHyh24xalUPMQKJ4VVOI/+2ON4KR8zwv bQ+8gU/aKr53iNzobyvzDkR+SoOwFJAb1D4utgxT4zJb+O0ut2CwnqhGpxGBk7oYMCb6IY S6wUbuBBGBFx0aUTuth502rLYJr1DvNoGnAGOHmc31Uqyoa9Z/OhusIZoYUv3eH0Ae0ZQC 0lEcJrQA5AYU4/F8mRJqHGebXepU24bd9f2f2jppcNgrCF3q8nqL85H2SNKDCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668206499; a=rsa-sha256; cv=none; b=UOe8gAUda0kBA2DNaKQAiprLaxgf/vN8dKlbSP5XtKo6DyR4mFwqGRhGjyh7OgzJMawPvK MSfZBG0aDwE12ZP0tCHpHQMqiPF+HHhjiBh33UvY9357Wzdq96QIP+som7diTkC8i0Gnxi UVuzuR9IZ9obiOouEtk3gxjYmD1XBJnFY/F8XugtdPT74iU5gQgYm83ZxP50oOQt9fXjYo 4YvOkY1ivJVHkxzF8m+eW/XpHveSPA1/17E4PD3lHowsxJYLeQnNloYRbTM2DAMv2eKVpC bAj6wPof9/fQwTB2wHuEhH7e7Xv7HyZZIaM1xZM45huG4AeNob9Gxtmf6qCu4Q== 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 4N8DGC0Gyhz10kk; Fri, 11 Nov 2022 22:41:39 +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 2ABMfcnQ059371; Fri, 11 Nov 2022 22:41:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABMfceT059370; Fri, 11 Nov 2022 22:41:38 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:41:38 GMT Message-Id: <202211112241.2ABMfceT059370@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: 1c4b6bc295c6 - main - x11-toolkits/wlroots: update to 0.16.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/main X-Git-Reftype: branch X-Git-Commit: 1c4b6bc295c65bd8a4ac04f13b7972f78a834c0d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c4b6bc295c65bd8a4ac04f13b7972f78a834c0d commit 1c4b6bc295c65bd8a4ac04f13b7972f78a834c0d Author: Jan Beich AuthorDate: 2022-11-11 17:22:17 +0000 Commit: Jan Beich CommitDate: 2022-11-11 22:39:55 +0000 x11-toolkits/wlroots: update to 0.16.0 Changes: https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.16.0 Reported by: GitLab (notify releases) --- x11-toolkits/wlroots/Makefile | 17 ++++++++++------- x11-toolkits/wlroots/distinfo | 22 +++++++++++----------- x11-toolkits/wlroots/pkg-plist | 12 +++++++++--- x11-wm/cage/Makefile | 3 ++- x11-wm/cagebreak/Makefile | 2 ++ x11-wm/dwl/Makefile | 2 ++ x11-wm/gamescope/Makefile | 2 ++ x11-wm/hikari/Makefile | 3 ++- x11-wm/kwinft/Makefile | 2 ++ x11-wm/labwc/Makefile | 2 ++ x11-wm/river/Makefile | 3 ++- x11-wm/sway/Makefile | 2 ++ x11-wm/wayfire-plugins-extra/Makefile | 3 ++- x11-wm/wayfire/Makefile | 2 ++ 14 files changed, 52 insertions(+), 25 deletions(-) diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 60e086feb362..997c19b70ce9 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,13 +1,13 @@ PORTNAME= wlroots -DISTVERSION= 0.15.1 +DISTVERSION= 0.16.0 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} CATEGORIES= x11-toolkits PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github -PATCHFILES+= 7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 -PATCHFILES+= 55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= 29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= 91a8ff42d26e.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= 347b32642fb6.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library @@ -16,12 +16,14 @@ WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= wayland-protocols>=1.24:graphics/wayland-protocols +BUILD_DEPENDS= wayland-protocols>=1.27:graphics/wayland-protocols \ + hwdata>0:misc/hwdata LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libseat.so:sysutils/seatd \ libxkbcommon.so:x11/libxkbcommon +RUN_DEPENDS= hwdata>0:misc/hwdata USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes @@ -29,7 +31,7 @@ USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org -GL_COMMIT= 29938b74251e826f3778f6bf9c54974a30488cc1 +GL_COMMIT= 1712a7d27444d62f8da8eeedf0840b386a810e96 MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} OPTIONS_DEFINE= DRM NVIDIA OPENGL VULKAN X11 @@ -42,8 +44,9 @@ DRM_VARS= BACKENDS+="drm libinput" NVIDIA_DESC= EGLStreams support for DRM backend (experimental) NVIDIA_PATCH_SITES= https://github.com/danvd/${GL_PROJECT}-eglstreams/commit/:nvidia -NVIDIA_PATCHFILES= c0fc017207f0.patch:-p1:nvidia # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2769 +NVIDIA_PATCHFILES= 5bde12a6dbf4.patch:-p1:nvidia # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2769 NVIDIA_IMPLIES= DRM OPENGL X11 +NVIDIA_BROKEN= fails to patch .if make(makesum) .MAKEFLAGS: WITH+=NVIDIA .endif diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index de04adb00a97..8312c7f2366b 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1643923194 -SHA256 (wlroots-wlroots-29938b74251e826f3778f6bf9c54974a30488cc1_GL0.tar.gz) = 7d3bc1ee9851354a76632de5d0428a3b9583f43ee3e3194f7be616f404f8eae1 -SIZE (wlroots-wlroots-29938b74251e826f3778f6bf9c54974a30488cc1_GL0.tar.gz) = 566013 -SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e -SIZE (7c0e2a271a4c.patch) = 5729 -SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad0849594f10383ce7 -SIZE (55a8d225cf8c.patch) = 4209 -SHA256 (347b32642fb6.patch) = 56804ce34cd02cb3b2b11a0dbf27c2820c2c0d112f351cdaed5d160e0536d418 -SIZE (347b32642fb6.patch) = 3810 -SHA256 (c0fc017207f0.patch) = bdafef91a067cc95d9b47f5a837e400b641d9479393136818c34f5eb6b846d71 -SIZE (c0fc017207f0.patch) = 108229 +TIMESTAMP = 1668187337 +SHA256 (wlroots-wlroots-1712a7d27444d62f8da8eeedf0840b386a810e96_GL0.tar.gz) = af7c43f14a1836dd7e6d8c06d1f1c3a0b2e6b8b5edf4d335a449f698c2bbe8cc +SIZE (wlroots-wlroots-1712a7d27444d62f8da8eeedf0840b386a810e96_GL0.tar.gz) = 588773 +SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9 +SIZE (fc0854d5f256.patch) = 6013 +SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c +SIZE (29cb694655db.patch) = 4233 +SHA256 (91a8ff42d26e.patch) = 5c48b35841a3614fe589d8f31323deceaf6be2209b9350a128315cdfc6c95d2c +SIZE (91a8ff42d26e.patch) = 3659 +SHA256 (5bde12a6dbf4.patch) = 5bec2c114d6f5bb8cece6c8fe681d6c30b05c625b130dea50122a91212ea846a +SIZE (5bde12a6dbf4.patch) = 110451 diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist index 0651a6d62807..da12f6318c33 100644 --- a/x11-toolkits/wlroots/pkg-plist +++ b/x11-toolkits/wlroots/pkg-plist @@ -8,7 +8,7 @@ include/wlr/backend/session.h include/wlr/backend/wayland.h %%X11%%include/wlr/backend/x11.h include/wlr/config.h -include/wlr/interfaces/wlr_input_device.h +include/wlr/interfaces/wlr_buffer.h include/wlr/interfaces/wlr_keyboard.h include/wlr/interfaces/wlr_output.h include/wlr/interfaces/wlr_pointer.h @@ -26,10 +26,10 @@ include/wlr/render/pixman.h %%VULKAN%%include/wlr/render/vulkan.h include/wlr/render/wlr_renderer.h include/wlr/render/wlr_texture.h -include/wlr/types/wlr_box.h include/wlr/types/wlr_buffer.h include/wlr/types/wlr_compositor.h include/wlr/types/wlr_cursor.h +include/wlr/types/wlr_damage_ring.h include/wlr/types/wlr_data_control_v1.h include/wlr/types/wlr_data_device.h include/wlr/types/wlr_drm.h @@ -40,6 +40,7 @@ include/wlr/types/wlr_fullscreen_shell_v1.h include/wlr/types/wlr_gamma_control_v1.h include/wlr/types/wlr_idle.h include/wlr/types/wlr_idle_inhibit_v1.h +include/wlr/types/wlr_idle_notify_v1.h include/wlr/types/wlr_input_device.h include/wlr/types/wlr_input_inhibitor.h include/wlr/types/wlr_input_method_v2.h @@ -66,6 +67,9 @@ include/wlr/types/wlr_scene.h include/wlr/types/wlr_screencopy_v1.h include/wlr/types/wlr_seat.h include/wlr/types/wlr_server_decoration.h +include/wlr/types/wlr_session_lock_v1.h +include/wlr/types/wlr_single_pixel_buffer_v1.h +include/wlr/types/wlr_subcompositor.h include/wlr/types/wlr_surface.h include/wlr/types/wlr_switch.h include/wlr/types/wlr_tablet_pad.h @@ -92,6 +96,8 @@ include/wlr/util/region.h include/wlr/version.h include/wlr/xcursor.h %%X11%%include/wlr/xwayland.h +%%X11%%include/wlr/xwayland/server.h +%%X11%%include/wlr/xwayland/xwayland.h lib/libwlroots.so -lib/libwlroots.so.10 +lib/libwlroots.so.11 libdata/pkgconfig/wlroots.pc diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile index 578dda91e589..5eaa0aba2f46 100644 --- a/x11-wm/cage/Makefile +++ b/x11-wm/cage/Makefile @@ -1,7 +1,7 @@ PORTNAME= cage DISTVERSIONPREFIX= v DISTVERSION= 0.1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -45,4 +45,5 @@ post-patch: -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile index af412da9ea7b..147938f31ab6 100644 --- a/x11-wm/cagebreak/Makefile +++ b/x11-wm/cagebreak/Makefile @@ -1,5 +1,6 @@ PORTNAME= cagebreak DISTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -45,4 +46,5 @@ post-patch: ${WRKSRC}/${PORTNAME}.c \ ${WRKSRC}/meson.build +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile index 047b1982bb43..2a5464365c59 100644 --- a/x11-wm/dwl/Makefile +++ b/x11-wm/dwl/Makefile @@ -1,6 +1,7 @@ PORTNAME= dwl DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -67,4 +68,5 @@ do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \ ${STAGEDIR}${DOCSDIR}) +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index c5022356e278..108b40f6627f 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,5 +1,6 @@ PORTNAME= gamescope DISTVERSION= 3.11.48 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -48,4 +49,5 @@ post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile index cf5807fb0a94..56640dfca3f7 100644 --- a/x11-wm/hikari/Makefile +++ b/x11-wm/hikari/Makefile @@ -1,6 +1,6 @@ PORTNAME= hikari DISTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MASTER_SITES= https://hikari.acmelabs.space/releases/ @@ -48,4 +48,5 @@ post-install: ${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \ ${STAGEDIR}${ETCDIR}/hikari.conf.sample +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile index da3f90de5a76..646ee3d42a40 100644 --- a/x11-wm/kwinft/Makefile +++ b/x11-wm/kwinft/Makefile @@ -1,6 +1,7 @@ PORTNAME= kwinft DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.24.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -58,4 +59,5 @@ QA11Y_DESC= Accessibility (focus tracking) for Zoom effect QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient QA11Y_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile index 4b9b994febe8..e2f1ae25a038 100644 --- a/x11-wm/labwc/Makefile +++ b/x11-wm/labwc/Makefile @@ -1,5 +1,6 @@ PORTNAME= labwc DISTVERSION= 0.5.3 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -53,4 +54,5 @@ 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/river/Makefile b/x11-wm/river/Makefile index e9ef002759ee..8fcbb0db1e63 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -1,7 +1,7 @@ PORTNAME= river DISTVERSIONPREFIX= v DISTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -73,4 +73,5 @@ do-build: do-test: @(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS}) +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 236bdb3213f6..ab6f60a4b9a9 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,5 +1,6 @@ PORTNAME= sway DISTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -62,4 +63,5 @@ post-patch: -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile index 9dbcd3caa03c..7dcd133c0626 100644 --- a/x11-wm/wayfire-plugins-extra/Makefile +++ b/x11-wm/wayfire-plugins-extra/Makefile @@ -1,7 +1,7 @@ PORTNAME= wayfire-plugins-extra DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -50,4 +50,5 @@ post-patch: @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/subprojects/windecor/deco-theme.cpp +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 112df93590fe..d9b57e0c1821 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,6 +1,7 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v DISTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -52,4 +53,5 @@ post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include