From nobody Tue Feb 07 22:40:24 2023 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 4PBJ485l30z3np58; Tue, 7 Feb 2023 22:40: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 4PBJ484W2Qz3j0t; Tue, 7 Feb 2023 22:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675809624; 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=cVv5acwDgZfXwAjlX+LIhnbUU5O4gNqqa5jR+1koel0=; b=OLNRPv9AYl2yRR6lNw701xpIL+G7XB5qHAow7axdhABoyxaAeNimcsjYHW9PTjfkk2NZY8 Q2E+Dm5dGZ85jOOJ3MfePTmmQOAa182zA0lMyIu68z2m/YZipYO2rPlYW438povNgIfDOE Bb/Jw88jFOmqtGjKCL2NSLgxHZkVQlm6L/qfZKlSxV0hdKHBNMDdlcAP0C+/iAUGvBKE+F i+dOu1AvwmMBx3rGK5AmbKetfp+ZecS74BnUQ86PUgzbVgNHL6jmiBfatOZVJcBwwhrd1u 1D4FlDRCUqufcDjiJWFUU363Avp5RPc6C8EDhW2Vg0CCZzyd780bkH4YXFPDIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675809624; 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=cVv5acwDgZfXwAjlX+LIhnbUU5O4gNqqa5jR+1koel0=; b=VdplwZfUpj7h0tvOg5PenCKU1P6v9cAQ0xdO2hpOPdEzQtOJatHzemMuDUOOBI1nmbUJUO WGQBFKJKMVOvq1KOD9yZvZK65/wyhq9iUP3x9EJnRLkHMQzycMnboqLYCuhr9eRbWIx6XU qzv0GN9Y8MbsP9I0HwqwkSGCncnJRKh4n3Ojdszb7FT7X/CQ5ydKfi3mOVoIzRqy7ZTu/j Uput62GdeLjs5yeocOnRRb3oJLO1lSu8tYjZRt7oq1IruK2ufp8VazAplLvcjeH4f2McVS NiuMaSJiDJU05AU8zEYvzvprI1VMg7BNkm08MldLqPEzwcqcj7cJsRxoe6oa3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675809624; a=rsa-sha256; cv=none; b=lmI4T00nh+3uEb2/9gPNbq1fpKa2gxj6Z5Jze24/XgHFtMVlsM3erHARBzGLYW3erQCgw2 2tHM3fqLSeyeljJ20oTzLUE3ivbSy+ymXyUFd3KNIjhZkSkq3so2nuClyvmWVzyEkgZBvM kOjbKPrxOMBXEbFfswWohmNf6I0ObuF/MNYJS0P8q3D4B3mKoV/PaIyzM6zqfPENKElx5N dCbAZPbFIVlCD2X4yMcLeu5DbVLJqQQcthBSNZjjBCQ1Lyv3twGGdJhXWRHDmlNL0SSA0B Qmll80xHpqvZ3LoUWHRcbXCs5aTGiQhbTwA7bRZ2dyR5ZhAx7UWkuihXJsP8BA== 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 4PBJ4838jwzYhb; Tue, 7 Feb 2023 22:40: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 317MeOGc045963; Tue, 7 Feb 2023 22:40:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317MeOHq045962; Tue, 7 Feb 2023 22:40:24 GMT (envelope-from git) Date: Tue, 7 Feb 2023 22:40:24 GMT Message-Id: <202302072240.317MeOHq045962@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: ef668a97494d - main - x11/disman: update to 0.525.0 after d06d26f8c45e 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: ef668a97494d938fdc8e25e41d3a63911eaa370d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef668a97494d938fdc8e25e41d3a63911eaa370d commit ef668a97494d938fdc8e25e41d3a63911eaa370d Author: Jan Beich AuthorDate: 2022-06-14 20:05:24 +0000 Commit: Jan Beich CommitDate: 2023-02-07 22:37:19 +0000 x11/disman: update to 0.525.0 after d06d26f8c45e Changes: https://gitlab.com/kwinft/disman/-/releases/disman@0.525.0-beta.0 Changes: https://gitlab.com/kwinft/disman/-/releases/disman@0.525.0 --- x11/disman/Makefile | 5 +-- x11/disman/distinfo | 6 +-- x11/disman/files/patch-CMakeLists.txt | 18 ++++---- x11/disman/files/patch-optional-deps | 77 +++++++++++++++++++++++++++++++++++ x11/disman/pkg-plist | 41 +++++++++---------- x11/kdisplay/Makefile | 6 ++- x11/kdisplay/distinfo | 2 + 7 files changed, 118 insertions(+), 37 deletions(-) diff --git a/x11/disman/Makefile b/x11/disman/Makefile index a756795db474..2876c9f77e92 100644 --- a/x11/disman/Makefile +++ b/x11/disman/Makefile @@ -1,7 +1,6 @@ PORTNAME= disman DISTVERSIONPREFIX= ${PORTNAME}@ -DISTVERSION= 0.524.0 -PORTREVISION= 1 +DISTVERSION= 0.525.0 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -19,7 +18,7 @@ USE_KDE= ecm:build coreaddons USE_LDCONFIG= yes USE_QT= qmake:build buildtools:build core dbus gui GL_ACCOUNT= kwinft -GL_COMMIT= a8fc81af423ab14513c7096b405cec3f58943495 +GL_COMMIT= 877a0ab15f339c974d9a9929d9c6a757520a2f51 PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= WAYLAND X11 diff --git a/x11/disman/distinfo b/x11/disman/distinfo index fba509c34895..2e77ea64249e 100644 --- a/x11/disman/distinfo +++ b/x11/disman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644333020 -SHA256 (kwinft-disman-a8fc81af423ab14513c7096b405cec3f58943495_GL0.tar.gz) = 9bfedb145cd2e114e85428ad5a1365e51fdd89be247f71c07a4605e60898de16 -SIZE (kwinft-disman-a8fc81af423ab14513c7096b405cec3f58943495_GL0.tar.gz) = 153102 +TIMESTAMP = 1655237124 +SHA256 (kwinft-disman-877a0ab15f339c974d9a9929d9c6a757520a2f51_GL0.tar.gz) = 31bdd343db201da6b82a4764fda827037200fb8a440854841d9c46469699f0aa +SIZE (kwinft-disman-877a0ab15f339c974d9a9929d9c6a757520a2f51_GL0.tar.gz) = 150270 diff --git a/x11/disman/files/patch-CMakeLists.txt b/x11/disman/files/patch-CMakeLists.txt index f620c68b1996..578f05f6f75b 100644 --- a/x11/disman/files/patch-CMakeLists.txt +++ b/x11/disman/files/patch-CMakeLists.txt @@ -5,17 +5,17 @@ CMake Error at /usr/local/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): Call Stack (most recent call first): CMakeLists.txt:27 (find_package) ---- CMakeLists.txt.orig 2021-10-14 15:23:56 UTC +--- CMakeLists.txt.orig 2022-06-14 20:05:24 UTC +++ CMakeLists.txt -@@ -28,7 +28,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED - Core - DBus - Gui -- Test +@@ -34,7 +34,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED + Core + DBus + Gui +- Test + OPTIONAL_COMPONENTS + X11Extras ) - - # Wayland backend plugin KWayland -@@ -66,6 +65,7 @@ add_subdirectory(service) +@@ -72,6 +71,7 @@ if(BUILD_TESTING) add_subdirectory(ctl) add_subdirectory(backends) if(BUILD_TESTING) diff --git a/x11/disman/files/patch-optional-deps b/x11/disman/files/patch-optional-deps new file mode 100644 index 000000000000..7d79872b4571 --- /dev/null +++ b/x11/disman/files/patch-optional-deps @@ -0,0 +1,77 @@ +Revert https://gitlab.com/kwinft/disman/-/commit/78771e145b7f +and https://gitlab.com/kwinft/disman/-/commit/18d0a3aa7940 +to support disabling build dependencies at configure (CMake) time. + +CMake Error at backends/wayland/plugins/kwayland/CMakeLists.txt:21 (target_link_libraries): + Target "disman-kwayland" links to: + + KF5::WaylandClient + + but the target was not found. Possible reasons include: + + * There is a typo in the target name. + * A find_package call is missing for an IMPORTED target. + * An ALIAS target is missing. + +CMake Error at /usr/local/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package): + find_package for module Qt5X11Extras called with REQUIRED, but + CMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras is enabled. A REQUIRED package + cannot be disabled. +Call Stack (most recent call first): + CMakeLists.txt:32 (find_package) + +--- CMakeLists.txt.orig 2022-06-14 20:05:24 UTC ++++ CMakeLists.txt +@@ -34,9 +34,14 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED + Core + DBus + Gui ++) ++ ++# XXX REQUIRED negates TYPE OPTIONAL ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG + OPTIONAL_COMPONENTS + X11Extras + ) ++ + set_package_properties(Qt5X11Extras PROPERTIES + PURPOSE "Required for X11/RandR backend" + ) +--- backends/CMakeLists.txt.orig 2022-06-14 20:05:24 UTC ++++ backends/CMakeLists.txt +@@ -35,4 +35,10 @@ add_subdirectory(wayland) + add_subdirectory(fake) + add_subdirectory(qscreen) + add_subdirectory(wayland) +-add_subdirectory(xrandr) ++ ++if(${XCB_RANDR_FOUND}) ++ message(STATUS "Will build xrandr backend.") ++ add_subdirectory(xrandr) ++else() ++ message(STATUS "Not building xrandr backend, no XCB_RANDR_FOUND set.") ++endif() +--- backends/wayland/plugins/CMakeLists.txt.orig 2022-06-14 20:05:24 UTC ++++ backends/wayland/plugins/CMakeLists.txt +@@ -1,3 +1,8 @@ +-add_subdirectory(kwayland) +-add_subdirectory(kwinft) +-add_subdirectory(wlroots) ++if(KF5Wayland_FOUND) ++ add_subdirectory(kwayland) ++endif() ++ ++if(Wrapland_FOUND) ++ add_subdirectory(kwinft) ++ add_subdirectory(wlroots) ++endif() +--- backends/xrandr/CMakeLists.txt.orig 2022-06-14 20:05:24 UTC ++++ backends/xrandr/CMakeLists.txt +@@ -1,3 +1,7 @@ ++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED ++ X11Extras ++) ++ + set(xrandr_SRCS + xrandr.cpp + xrandrconfig.cpp diff --git a/x11/disman/pkg-plist b/x11/disman/pkg-plist index 686077568d32..c43862cc6c23 100644 --- a/x11/disman/pkg-plist +++ b/x11/disman/pkg-plist @@ -12,35 +12,34 @@ include/disman/output.h include/disman/screen.h include/disman/setconfigoperation.h include/disman/types.h -include/disman/wayland/disman_wayland_export.h +include/disman/wayland/dismanwl_export.h include/disman/wayland/wayland_interface.h include/disman/wayland/waylandoutput.h include/disman_version.h -include/disman_wayland_version.h -lib/cmake/Disman/DismanConfig.cmake -lib/cmake/Disman/DismanConfigVersion.cmake -lib/cmake/Disman/DismanTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Disman/DismanTargets.cmake -lib/cmake/DismanWayland/DismanWaylandConfig.cmake -lib/cmake/DismanWayland/DismanWaylandConfigVersion.cmake -lib/cmake/DismanWayland/DismanWaylandTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/DismanWayland/DismanWaylandTargets.cmake -lib/libDisman.so -lib/libDisman.so.0 -lib/libDisman.so.%%VERSION%% -lib/libDismanWayland.so -lib/libDismanWayland.so.0 -lib/libDismanWayland.so.%%VERSION%% -lib/libexec/disman_backend_launcher -%%QT_MKSPECDIR%%/modules/qt_Disman.pri +include/dismanwl_version.h +lib/cmake/disman/disman-config-version.cmake +lib/cmake/disman/disman-config.cmake +lib/cmake/disman/disman-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/disman/disman-targets.cmake +lib/cmake/dismanwl/dismanwl-config-version.cmake +lib/cmake/dismanwl/dismanwl-config.cmake +lib/cmake/dismanwl/dismanwl-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/dismanwl/dismanwl-targets.cmake +lib/libdisman.so +lib/libdisman.so.%%VERSION%% +lib/libdisman.so.0 +lib/libdismanwl.so +lib/libdismanwl.so.%%VERSION%% +lib/libdismanwl.so.0 +lib/libexec/disman-launcher %%QT_PLUGINDIR%%/disman/fake.so %%QT_PLUGINDIR%%/disman/qscreen.so %%X11%%%%QT_PLUGINDIR%%/disman/randr.so %%QT_PLUGINDIR%%/disman/wayland.so %%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/kwayland.so %%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/kwinft.so -%%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/wlroots-wrapland.so -libdata/pkgconfig/disman-wayland.pc +%%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/wlroots.so libdata/pkgconfig/disman.pc +libdata/pkgconfig/dismanwl.pc share/dbus-1/services/org.kwinft.disman.service -share/qlogging-categories5/Disman.categories +share/qlogging-categories5/disman.categories diff --git a/x11/kdisplay/Makefile b/x11/kdisplay/Makefile index 77d5b4fd5bef..ab27cd032bd8 100644 --- a/x11/kdisplay/Makefile +++ b/x11/kdisplay/Makefile @@ -1,8 +1,12 @@ PORTNAME= kdisplay DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.24.0 +PORTREVISION= 1 CATEGORIES= x11 +PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ +PATCHFILES+= 74cab01dbddf.patch:-p1 # https://gitlab.com/kwinft/kdisplay/-/merge_requests/26 + MAINTAINER= jbeich@FreeBSD.org COMMENT= App and daemon for display managing WWW= https://gitlab.com/kwinft/kdisplay @@ -12,7 +16,7 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL -LIB_DEPENDS= libDisman.so:x11/disman +LIB_DEPENDS= libdisman.so:x11/disman TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT} USES= cmake:testing kde:5 qt:5 diff --git a/x11/kdisplay/distinfo b/x11/kdisplay/distinfo index bd1bc8c26476..17f74241a12a 100644 --- a/x11/kdisplay/distinfo +++ b/x11/kdisplay/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1644336089 SHA256 (kwinft-kdisplay-a4dcebd297fded753579c7aef5a874617d274b7f_GL0.tar.gz) = a73936b3bdf161a99e60463e1c52590a885214a49dbc64ba0697681500cbc93f SIZE (kwinft-kdisplay-a4dcebd297fded753579c7aef5a874617d274b7f_GL0.tar.gz) = 185938 +SHA256 (74cab01dbddf.patch) = 95fd6993c031586773ca2c8ec58788fb2a347ea0efb4b5e17dfd567f6192750f +SIZE (74cab01dbddf.patch) = 3845