Bug 272635 - deskutils/copyq: Fix wayland detection and remove qt5 runtime deps from qt6 flavor
Summary: deskutils/copyq: Fix wayland detection and remove qt5 runtime deps from qt6 f...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Nuno Teixeira
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-07-21 06:29 UTC by Jason E. Hale
Modified: 2023-07-21 18:28 UTC (History)
0 users

See Also:
eduardo: maintainer-feedback+


Attachments
deskutils/copyq: fix wayland detection and qt6 deps (4.01 KB, patch)
2023-07-21 06:32 UTC, Jason E. Hale
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jason E. Hale freebsd_committer freebsd_triage 2023-07-21 06:29:52 UTC
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.
Comment 1 Jason E. Hale freebsd_committer freebsd_triage 2023-07-21 06:32:01 UTC
Created attachment 243516 [details]
deskutils/copyq: fix wayland detection and qt6 deps
Comment 2 Nuno Teixeira freebsd_committer freebsd_triage 2023-07-21 09:38:08 UTC
Hello Jason,

Awesome work here. Very happy that upstream fix these issues out.

Thanks very much!
Please commit it!
Comment 3 Nuno Teixeira freebsd_committer freebsd_triage 2023-07-21 09:40:00 UTC
(In reply to Nuno Teixeira from comment #2)
(...)

Nevermind about commit. It's assigned to me so I can do the commit.

Cheers
Comment 4 Nuno Teixeira freebsd_committer freebsd_triage 2023-07-21 18:01:12 UTC
(In reply to Jason E. Hale from comment #0)

> Add missing desktop-file-utils to USES.

Not needed here as done in 0723f2e
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-07-21 18:14:51 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8cd4394245dbc74a6bab678798c5d6e2ec053921

commit 8cd4394245dbc74a6bab678798c5d6e2ec053921
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-07-21 18:02:17 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-07-21 18:02:17 +0000

    deskutils/copyq: Fix wayland detection and remove qt5 runtime deps from qt6 flavor

    PR:             272635

 deskutils/copyq/Makefile | 18 ++++++++++--------
 deskutils/copyq/distinfo |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)
Comment 6 Nuno Teixeira freebsd_committer freebsd_triage 2023-07-21 18:28:39 UTC
Committed, thanks!