Attachment 243516 Details for Bug 272635 – deskutils/copyq: fix wayland detection and qt6 deps

[patch] deskutils/copyq: fix wayland detection and qt6 deps

0001-deskutils-copyq-Fix-wayland-detecton-and-qt6-deps.patch (text/plain), 4.01 KB, created by Jason E. Hale on 2023-07-21 06:32:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2023-07-21 06:32:01 UTC

Size: 4.01 KB

patch

obsolete

>From 2926cd8de055f5270a87e0ff764312b358668f7d Mon Sep 17 00:00:00 2001
>From: "Jason E. Hale" <jhale@FreeBSD.org>
>Date: Fri, 21 Jul 2023 02:07:25 -0400
>Subject: [PATCH] deskutils/copyq: Fix wayland detecton and qt6 deps
>
>Fix detection of wayland.xml and empty version strings. ECM uses pkgconfig for
>this functionality and it was missing from USES.
>CMake Warning at /usr/local/share/ECM/find-modules/FindWayland.cmake:130 (message):
>  Could not find wayland.xml in
>Call Stack (most recent call first):
>  src/platform/x11/systemclipboard/CMakeLists.txt:2 (find_package)
>-- Found Wayland_Server: /usr/local/lib/libwayland-server.so (found version "")
>-- Found Wayland_Cursor: /usr/local/lib/libwayland-cursor.so (found version "")
>-- Found Wayland_Egl: /usr/local/lib/libwayland-egl.so (found version "")
>
>Remove unneeded and unused kf5-knotifications from the qt6 flavor. It just
>pulls in qt5 runtime dependencies which makes a qt6 flavor kind of moot.
>Qt5 build dependencies are still required for ECM.
>CMake Warning at src/notifications.cmake:4 (message):
>  Native notifications are not supported with Qt 6
>Call Stack (most recent call first):
>  src/CMakeLists.txt:24 (include)
>
>Defining QtWaylandScanner_EXECUTABLE is no longer needed, see:
>https://github.com/hluk/CopyQ/pull/2133
>
>Add missing desktop-file-utils to USES.
>
>Add patch to silence CMake warnings.
>
>PR:		272635
>---
> deskutils/copyq/Makefile | 18 ++++++++++--------
> deskutils/copyq/distinfo |  4 +++-
> 2 files changed, 13 insertions(+), 9 deletions(-)
>
>diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile
>index 4a8d24d6d5eb..730901e0ccb7 100644
>--- a/deskutils/copyq/Makefile
>+++ b/deskutils/copyq/Makefile
>@@ -1,12 +1,13 @@
> PORTNAME=	copyq
> DISTVERSIONPREFIX=	v
> DISTVERSION=	7.0.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	deskutils
> PKGNAMESUFFIX=	-${FLAVOR}
> 
> PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
> PATCHFILES+=	79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch:-p1 # Fix build with Qt 6.5.x
>+PATCHFILES+=	8ae296bed45a7679712aff0cb2e2d0508330ad37.patch:-p1 # Fix cmake warnings
> 
> MAINTAINER=	eduardo@FreeBSD.org
> COMMENT=	Qt${FLAVOR:S/qt//} based clipboard manager
>@@ -18,26 +19,27 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
> 		libxkbcommon.so:x11/libxkbcommon
> 
>-FLAVORS=	qt5 qt6
>-FLAVOR?=	qt5
>-
>+FLAVORS=		qt5 qt6
>+FLAVOR?=		qt5
> qt5_CONFLICTS_INSTALL=	copyq-qt6
> qt6_CONFLICTS_INSTALL=	copyq-qt5
> 
>-USES=		cmake compiler:c++17-lang gl kde:5 qt:${FLAVOR:S/qt//} xorg
>+USES=		cmake compiler:c++17-lang desktop-file-utils gl kde:5 pkgconfig \
>+		qt:${FLAVOR:S/qt//} xorg
> USE_GITHUB=	yes
> GH_ACCOUNT=	hluk
> GH_PROJECT=	CopyQ
> USE_GL=		gl
>-USE_KDE=	notifications # needed WITH_QT6, Extra CMake Modules (ECM)
>+_USE_KDE_qt5=	ecm:build notifications
>+_USE_KDE_qt6=	ecm:build
>+USE_KDE=	${_USE_KDE_${FLAVOR}}
> _USE_QT5=	core dbus declarative gui network svg wayland widgets x11extras \
> 		xml buildtools:build qmake:build
> _USE_QT6=	base declarative svg wayland translations:build
> USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
> USE_XORG=	ice sm x11 xext xfixes xtst
> 
>-_QT6_CMAKE_ARGS=	-DQtWaylandScanner_EXECUTABLE=${PREFIX}/libexec/qt6/qtwaylandscanner \
>-			-DWITH_QT6:BOOL=TRUE
>+_QT6_CMAKE_ARGS=	-DWITH_QT6:BOOL=TRUE
> CMAKE_ARGS=		${_QT${FLAVOR:S/qt//}_CMAKE_ARGS}
> 
> PORTSCOUT=	limit:^d\.d\.
>diff --git a/deskutils/copyq/distinfo b/deskutils/copyq/distinfo
>index 7c7a3eb50671..aec8b2f8dd90 100644
>--- a/deskutils/copyq/distinfo
>+++ b/deskutils/copyq/distinfo
>@@ -1,5 +1,7 @@
>-TIMESTAMP = 1689891691
>+TIMESTAMP = 1689919063
> SHA256 (hluk-CopyQ-v7.0.0_GH0.tar.gz) = 5898ba2025f8e9f61a4b4732e85adf3b1653fad20b5c1f1b0c879a7b72cd4d48
> SIZE (hluk-CopyQ-v7.0.0_GH0.tar.gz) = 3323354
> SHA256 (79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch) = 1e35ffd348245b2ca74671e17e38ea77888c589730da69974f6440923226872e
> SIZE (79d33dd337deeb357ce92c3d1e2b5b56b6f2c97d.patch) = 1734
>+SHA256 (8ae296bed45a7679712aff0cb2e2d0508330ad37.patch) = 3b59ead404fed04a6296c5e7de3f8208837d8da805ec217f428076ebf9df0f2c
>+SIZE (8ae296bed45a7679712aff0cb2e2d0508330ad37.patch) = 4577
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 272635: 243516