From nobody Thu Dec 1 15:47:24 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 4NNL704VqMz4jWvj; Thu, 1 Dec 2022 15:47:24 +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 4NNL704354z4DHT; Thu, 1 Dec 2022 15:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669909644; 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=jUAzQf6nPBrgTuDOzttClS5GJmihJPwj+Uu5K+Y3LLA=; b=PTfhVrL780US9B1K9kHDmV3I8dwNBZ4VK6Liods1rltlmtnL8kor46hZOAU59FZm53FK76 uvn61LCPpWKaUtTZXqGv8VpRqfElXQBqRIhPTdP9Eyv1JrEmc2ZMJJx4N5rPhenIylCcYX VNKZyo4R8Z+sfTc6bYJdAo06Nr37+0w1AQfbyKAt+FAHAkwoNkn/v+6b/+Vw9g1i69bDpt IF/A5UbY/rvSuYTfelw8aKKpfZzo1O+QYWDKnaKp8qWwk87FgucTRvx4sIat+hjWKSkWj1 BtK7WSN+65zgyF6YprAAkL0vWuLkS9kz8bB8j2t1uO6Drdu/3mTttGfhhV0MtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669909644; 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=jUAzQf6nPBrgTuDOzttClS5GJmihJPwj+Uu5K+Y3LLA=; b=qTgoMS6nrzgSse0q+hNV8XLXaE+tcFU3n7vqGo8isM5pslGQWmXlMWRDFSaOvjebQr9PaI nqGXBotFHPbhJymrt8aL5rS3Vs8msr5XlYqMMEz7dFgIU4PuL1FPgbl4r0ya96Hxpg5jD2 Jkt3af3fqS4krY/KlkV/Vv73nEbgHhtlAPxb2OV97kJclQrb6qjg8++KQTp6UzQoB3Ujp+ TIzJmPijHSnOFXFVfeOXPz582hlJD9IZAwPPEcY1i84+vuHcC9w3dgXDitEN6GvlYdW/7v AlI5x8SP8yG4bExwxpUPaqucFAPlA5PKfyBXgh+Pbt5XDmkJ788puRo5jAezMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669909644; a=rsa-sha256; cv=none; b=lao0IoXd9BU3qQ7/o9LEz2189uCNh99FmmE8csfDyFJk03O4eIJZsnIJ8al3TJ+jVjBFRH 9xRVZb09ZYOmtylAarf3lkHZbDEspWnK6kcQbZ1GoRimmQqtZhqi+CfmOue67es21Pvwwh 90G7w5U7kxJPg8ikBnx62JRQQT+VfGRHoBrUzl4WyiD/YSzsISG/fgyx/TNVT3ZUryQzxu R8puAz9ySptkwFkyt7trpkYDSoPOs1B+0HkrLcg7Cpg1+fVGIQEi5/uZWPW66kW4srklYK AJbyeoA6gZNSBmJpfmqiGK8N4E+YSQNs8yi+F6cT7opKfrJ+OMtTPA/JDULqpg== 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 4NNL70363FzjBT; Thu, 1 Dec 2022 15:47:24 +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 2B1FlOGI092757; Thu, 1 Dec 2022 15:47:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1FlOno092756; Thu, 1 Dec 2022 15:47:24 GMT (envelope-from git) Date: Thu, 1 Dec 2022 15:47:24 GMT Message-Id: <202212011547.2B1FlOno092756@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: 52bbede93d76 - main - x11-wm/wayfire: update to 0.7.5 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: 52bbede93d769c17286ece1c0e66285bbb070dae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=52bbede93d769c17286ece1c0e66285bbb070dae commit 52bbede93d769c17286ece1c0e66285bbb070dae Author: Jan Beich AuthorDate: 2022-12-01 15:12:48 +0000 Commit: Jan Beich CommitDate: 2022-12-01 15:47:14 +0000 x11-wm/wayfire: update to 0.7.5 Changes: https://github.com/WayfireWM/wayfire/releases/tag/v0.7.5 Changes: https://github.com/WayfireWM/wayfire-plugins-extra/compare/v0.7.0...v0.7.5 Reported by: GitHub (watch releases) --- x11-wm/wayfire-plugins-extra/Makefile | 7 +------ x11-wm/wayfire-plugins-extra/distinfo | 8 +++----- .../wayfire-plugins-extra/files/patch-wlroots-0.16 | 24 ++++++++++++++++++++++ x11-wm/wayfire/Makefile | 6 ++---- x11-wm/wayfire/distinfo | 6 +++--- x11/wcm/Makefile | 1 - x11/wf-shell/Makefile | 1 - 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile index 7dcd133c0626..70ca5507e2d5 100644 --- a/x11-wm/wayfire-plugins-extra/Makefile +++ b/x11-wm/wayfire-plugins-extra/Makefile @@ -1,12 +1,8 @@ PORTNAME= wayfire-plugins-extra DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 -PORTREVISION= 6 +DISTVERSION= 0.7.5 CATEGORIES= x11-wm wayland -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= cf95ac721fb1.patch:-p1 # https://github.com/WayfireWM/wayfire-plugins-extra/pull/127 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Additional plugins for Wayfire WWW= https://wayfire.org/ @@ -50,5 +46,4 @@ 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-plugins-extra/distinfo b/x11-wm/wayfire-plugins-extra/distinfo index 555c783185a8..140f566cfb82 100644 --- a/x11-wm/wayfire-plugins-extra/distinfo +++ b/x11-wm/wayfire-plugins-extra/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1611938557 -SHA256 (WayfireWM-wayfire-plugins-extra-v0.7.0_GH0.tar.gz) = e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287 -SIZE (WayfireWM-wayfire-plugins-extra-v0.7.0_GH0.tar.gz) = 50385 +TIMESTAMP = 1669908612 +SHA256 (WayfireWM-wayfire-plugins-extra-v0.7.5_GH0.tar.gz) = 70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840 +SIZE (WayfireWM-wayfire-plugins-extra-v0.7.5_GH0.tar.gz) = 50246 SHA256 (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 1eef146ea1077b69aa2ec1afdf51dc1a7831d7661c43b9b10ea68a39b7c50ac3 SIZE (damianatorrpm-wayfire-plugin_dbus_interface-c705bf1_GH0.tar.gz) = 30095 SHA256 (wayfireplugins-windecor-6ad31bfc10c5d39c0da7c68fa435064effad6381_GL0.tar.gz) = d3c739481faad2abc4391f165ebcd52a8fde1b062038bdbefcc1540a2dbbeed2 SIZE (wayfireplugins-windecor-6ad31bfc10c5d39c0da7c68fa435064effad6381_GL0.tar.gz) = 16547 -SHA256 (cf95ac721fb1.patch) = 8f059e60e438c3ff9f0b62071b69f567895f399ab8b44f386189a1571e4e1616 -SIZE (cf95ac721fb1.patch) = 6562 diff --git a/x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.16 b/x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.16 new file mode 100644 index 000000000000..4eef4852c0ef --- /dev/null +++ b/x11-wm/wayfire-plugins-extra/files/patch-wlroots-0.16 @@ -0,0 +1,24 @@ +https://github.com/damianatorrpm/wayfire-plugin_dbus_interface/issues/50 + +--- subprojects/dbus/dbus_interface.cpp.orig 2020-12-25 14:04:08 UTC ++++ subprojects/dbus/dbus_interface.cpp +@@ -198,15 +198,15 @@ class dbus_interface_t + #endif + wf::pointf_t cursor_position; + GVariant* signal_data; +- wf::input_event_signal* wf_ev; +- wlr_event_pointer_button* wlr_signal; ++ wf::input_event_signal* wf_ev; ++ wlr_pointer_button_event* wlr_signal; + wlr_button_state button_state; + bool button_released; + uint32_t button; + + cursor_position = core.get_cursor_position(); +- wf_ev = static_cast*> (data); +- wlr_signal = static_cast (wf_ev->event); ++ wf_ev = static_cast*> (data); ++ wlr_signal = static_cast (wf_ev->event); + button_state = wlr_signal->state; + button = wlr_signal->button; + button_released = (button_state == WLR_BUTTON_RELEASED); diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 663cac4e582d..4e0a77f4377b 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,7 +1,6 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v -DISTVERSION= 0.7.4 -PORTREVISION= 1 +DISTVERSION= 0.7.5 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -19,7 +18,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ glm>=0.9.8:math/glm \ - wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots + wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ libpng.so:graphics/png \ @@ -54,5 +53,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} # Keep override.mk in sync with x11/wcm + x11/wf-shell -.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo index 8c112e8b2d12..54486fb52bc6 100644 --- a/x11-wm/wayfire/distinfo +++ b/x11-wm/wayfire/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1659273682 -SHA256 (WayfireWM-wayfire-v0.7.4_GH0.tar.gz) = 343093e3b062383d2a6965ca09eb26d0f68cb897d8efeb69f4967679bb128c8e -SIZE (WayfireWM-wayfire-v0.7.4_GH0.tar.gz) = 364792 +TIMESTAMP = 1669907568 +SHA256 (WayfireWM-wayfire-v0.7.5_GH0.tar.gz) = ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e +SIZE (WayfireWM-wayfire-v0.7.5_GH0.tar.gz) = 365235 SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba349d35fc64643b8e223e6cdf74dbcef33aa SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881 SHA256 (WayfireWM-wf-utils-889fdaf_GH0.tar.gz) = 8848592f4a04dec60c3e09a996f15d1f86e79f544eda4519f2b3d9dc91997db3 diff --git a/x11/wcm/Makefile b/x11/wcm/Makefile index b088dd3be163..e110dd76ab45 100644 --- a/x11/wcm/Makefile +++ b/x11/wcm/Makefile @@ -35,5 +35,4 @@ WFSHELL_DESC= Build with wf-shell support WFSHELL_BUILD_DEPENDS= wf-shell>0:x11/wf-shell WFSHELL_MESON_ENABLED= wf_shell -.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11/wf-shell/Makefile b/x11/wf-shell/Makefile index 71c04aa613ab..c572a5c88c48 100644 --- a/x11/wf-shell/Makefile +++ b/x11/wf-shell/Makefile @@ -47,5 +47,4 @@ post-patch: ${WRKSRC}/src/dock/toplevel-icon.cpp \ ${WRKSRC}/src/panel/widgets/window-list/toplevel.cpp -.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include