From nobody Fri Jun 21 20:33:08 2024 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 4W5TZZ47PPz5PGp0; Fri, 21 Jun 2024 20:33:10 +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 4W5TZZ0cVfz4VgW; Fri, 21 Jun 2024 20:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719001990; 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=Cj7ocxbr+ZPAy1jZzR/dWaqCrbEQxAaeF7pSE4CVRGE=; b=LKG3jJ8OvIMSyvPAXgVjDZgZXHbUxEj1nCRxpido2GXMfl30MeS9dOCIRkCAiRZiMb/HiD uYqa/w2KcmqFMfPGy4HjOqhhXyrJBe5bdVEtq+m6eI9Zm7atRMWyPmnH9pRofiQ0sFFlzN bt7ex6503CPekdW1ff0buihB2fq2TDVPW3ognHfhPURhZGLF8c7B4gx7R/jhWRip7g6BTZ 8CJvS0tae0LnkDt5mt55AzgrFF35pg41lfZyIM8ZCStJ4l5bUEFRJIMx228icECawgEHW2 YWqEID8MrcMWhPrqey51UIn7Z9JHzmVhG3omSOBRw8zcY7hB8sXKofKud5ywdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719001990; a=rsa-sha256; cv=none; b=TUkDf6DCvDg/E0oBJFQvt3/zPtOb2xM2kB0nLobNVleqpWdAkbEj+kigAkAQcbeIECzCu3 bHlVHfq02hxG5FNoLkTAngygBcyN6RBV8Rsya+XZ9bFWpxSlLqLPDqXk2wlGvVWQRfFHHO iT7DPsQVw5NPC7So52b1Wl31bNq568gH1hF4cPlGHfXhF/33IaHNoiuY9CpMuoRGYsNb4D rUb+WnUdvhhj2aOLodK07BLX09UM1Ppf4vGVt9X+4wdmObSxX4ZYKz9usjy75qdPQKCSlC 0JzigU1CKIKKN7J0riHBGaJOqH0YZqR7LErAoX20HK5ewLB4hyOww0VIsBo7Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719001990; 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=Cj7ocxbr+ZPAy1jZzR/dWaqCrbEQxAaeF7pSE4CVRGE=; b=rJBWz5l14BRCabPTJzsrWA07VXc9scZBuPa9yAs5HNX8cgoNNZKYW/eT2VQgU1GgwH7wQG ctltaKafMPAaAN3oKx+Cg3s/vD3FZHUXjOPrWG4ghLq0FlBo7INvQjMEiLOPx0muhdSttj 7hxrMYZqq1yyDB2xusUiGNnQxTqoltotsGIAi8JsqGcYR/IevsM5hkPKXCkd9KU0gRUKys 9SYq2cSxAD64WXB+m9JaXoZ1+8RzKmy9+N2l1nGL+PXtWeYMY9hAmV55JxNajvwYDnm0PU ni0TiBTGEbkOJlClMz6H4FSbQPxAVso+O9rtQ6DT1RPLkzYt3dmGzKZGqcJ92Q== 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 4W5TZX4x9QzN37; Fri, 21 Jun 2024 20:33:08 +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 45LKX8iS074198; Fri, 21 Jun 2024 20:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LKX8q7074195; Fri, 21 Jun 2024 20:33:08 GMT (envelope-from git) Date: Fri, 21 Jun 2024 20:33:08 GMT Message-Id: <202406212033.45LKX8q7074195@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: fbe61eb8a4c1 - main - x11-wm/theseus-ship: update to 6.1.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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: fbe61eb8a4c17cca491ac466899734b86745b8dc Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbe61eb8a4c17cca491ac466899734b86745b8dc commit fbe61eb8a4c17cca491ac466899734b86745b8dc Author: Jan Beich AuthorDate: 2024-06-19 18:47:54 +0000 Commit: Jan Beich CommitDate: 2024-06-21 20:26:59 +0000 x11-wm/theseus-ship: update to 6.1.0 Changes: https://github.com/winft/theseus-ship/releases/tag/v6.1.0 Reported by: GitHub (watch releases) --- x11-wm/theseus-ship/Makefile | 4 +- x11-wm/theseus-ship/distinfo | 6 +- x11-wm/theseus-ship/files/patch-plasma-6.0 | 93 ++++++++++++++++++++++++++++++ x11-wm/theseus-ship/pkg-plist | 2 + 4 files changed, 99 insertions(+), 6 deletions(-) diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile index 7ec625ef0fbc..bd56442633bd 100644 --- a/x11-wm/theseus-ship/Makefile +++ b/x11-wm/theseus-ship/Makefile @@ -1,6 +1,6 @@ PORTNAME= theseus-ship DISTVERSIONPREFIX= v -DISTVERSION= 6.0.0 +DISTVERSION= 6.1.0 CATEGORIES= x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9 MAINTAINER= jbeich@FreeBSD.org @@ -10,8 +10,6 @@ WWW= https://github.com/winft/theseus-ship LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build with como-0.2.0 - LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ diff --git a/x11-wm/theseus-ship/distinfo b/x11-wm/theseus-ship/distinfo index 1edabc80943a..fd43f06328a7 100644 --- a/x11-wm/theseus-ship/distinfo +++ b/x11-wm/theseus-ship/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1709039440 -SHA256 (winft-theseus-ship-v6.0.0_GH0.tar.gz) = ffd8cf6c0b48cda918a74df372c55f42e00c9151420b4148b5e9f67ae05a05d5 -SIZE (winft-theseus-ship-v6.0.0_GH0.tar.gz) = 2691337 +TIMESTAMP = 1718822874 +SHA256 (winft-theseus-ship-v6.1.0_GH0.tar.gz) = dd3bb31644636e4d3e855df36b4467b20312184ac2b5462594c211107f36824c +SIZE (winft-theseus-ship-v6.1.0_GH0.tar.gz) = 2693171 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 diff --git a/x11-wm/theseus-ship/files/patch-plasma-6.0 b/x11-wm/theseus-ship/files/patch-plasma-6.0 new file mode 100644 index 000000000000..8206d9b2e98f --- /dev/null +++ b/x11-wm/theseus-ship/files/patch-plasma-6.0 @@ -0,0 +1,93 @@ +Drop after x11/plasma6-libplasma >= 6.1.0 update +Drop after x11-wm/plasma6-kdecoration >= 6.1.0 + +CMake Warning at CMakeLists.txt:59 (find_package): + Could not find a configuration file for package "Plasma" that is compatible + with requested version "6.1". + + The following configuration files were considered but not accepted: + + /usr/local/lib/cmake/Plasma/PlasmaConfig.cmake, version: 6.0.4 + +CMake Error at CMakeLists.txt:68 (find_package): + Could not find a configuration file for package "KDecoration2" that is + compatible with requested version "6.1". + + The following configuration files were considered but not accepted: + + /usr/local/lib/cmake/KDecoration2/KDecoration2Config.cmake, version: 6.0.4 + +kcms/decoration/declarative-plugin/buttonsmodel.cpp:72:32: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType' + case DecorationButtonType::Spacer: + ~~~~~~~~~~~~~~~~~~~~~~^ +kcms/decoration/declarative-plugin/buttonsmodel.cpp:72:32: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType' + case DecorationButtonType::Spacer: + ~~~~~~~~~~~~~~~~~~~~~~^ +kcms/decoration/utils.cpp:46:42: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType' + {KDecoration2::DecorationButtonType::Spacer, QChar('_')}, + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ + +--- CMakeLists.txt.orig 2024-06-19 18:47:54 UTC ++++ CMakeLists.txt +@@ -56,7 +56,7 @@ set_package_properties(KF6Kirigami PROPERTIES + TYPE RUNTIME + ) + +-find_package(Plasma ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR} ++find_package(Plasma ${CMAKE_PROJECT_VERSION_MAJOR} + CONFIG + ) + set_package_properties(Plasma PROPERTIES +@@ -65,7 +65,7 @@ set_package_properties(Plasma PROPERTIES + TYPE RUNTIME + ) + +-find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR} ++find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR} + CONFIG REQUIRED + ) + +--- kcms/decoration/declarative-plugin/previewbutton.cpp.orig 2024-06-19 18:47:54 UTC ++++ kcms/decoration/declarative-plugin/previewbutton.cpp +@@ -121,12 +121,7 @@ void PreviewButtonItem::paint(QPainter* painter) + } + + const QRect rect(0, 0, width(), height()); +- if (type() == KDecoration2::DecorationButtonType::Spacer) { +- static const QIcon icon = QIcon::fromTheme(QStringLiteral("distribute-horizontal")); +- icon.paint(painter, rect); +- } else { + m_button->paint(painter, rect); +- } + + painter->setCompositionMode(QPainter::CompositionMode_SourceAtop); + painter->fillRect(rect, m_color); +--- kcms/decoration/declarative-plugin/buttonsmodel.cpp.orig 2024-06-19 18:47:54 UTC ++++ kcms/decoration/declarative-plugin/buttonsmodel.cpp +@@ -32,7 +32,6 @@ ButtonsModel::ButtonsModel(QObject* parent) + DecorationButtonType::ContextHelp, + DecorationButtonType::KeepBelow, + DecorationButtonType::KeepAbove, +- DecorationButtonType::Spacer, + }), + parent) + { +@@ -69,8 +68,6 @@ static QString buttonToName(DecorationButtonType type) + return i18n("Keep below other windows"); + case DecorationButtonType::KeepAbove: + return i18n("Keep above other windows"); +- case DecorationButtonType::Spacer: +- return i18n("Spacer"); + default: + return QString(); + } +--- kcms/decoration/utils.cpp.orig 2024-06-19 18:47:54 UTC ++++ kcms/decoration/utils.cpp +@@ -43,7 +43,6 @@ const QHash + {KDecoration2::DecorationButtonType::KeepAbove, QChar('F')}, + {KDecoration2::DecorationButtonType::KeepBelow, QChar('B')}, + {KDecoration2::DecorationButtonType::Shade, QChar('L')}, +- {KDecoration2::DecorationButtonType::Spacer, QChar('_')}, + }; + } + diff --git a/x11-wm/theseus-ship/pkg-plist b/x11-wm/theseus-ship/pkg-plist index d7cd11535f8f..59b6ddb5d824 100644 --- a/x11-wm/theseus-ship/pkg-plist +++ b/x11-wm/theseus-ship/pkg-plist @@ -13,6 +13,8 @@ lib/libkcmkwincommon.so.%%VERSION%% %%QT_PLUGINDIR%%/plasma/kcms/systemsettings_qwidgets/kcm_kwinscreenedges.so %%QT_PLUGINDIR%%/plasma/kcms/systemsettings_qwidgets/kcm_kwintouchscreen.so %%QT_PLUGINDIR%%/plasma/kcms/systemsettings_qwidgets/kwincompositing.so +%%QT_QMLDIR%%/org/kde/kwin/private/kdecoration/kde-qmlmodule.version +%%QT_QMLDIR%%/org/kde/kwin/private/kdecoration/kdecorationprivatedeclarative.qmltypes %%QT_QMLDIR%%/org/kde/kwin/private/kdecoration/libkdecorationprivatedeclarative.so %%QT_QMLDIR%%/org/kde/kwin/private/kdecoration/qmldir libexec/kwin-applywindowdecoration