From 4f952e275d838c67a8fb9ddd2ea7816726723d835a0a2520890ee5bc52f3d75a Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Aug 2019 11:31:16 +0000 Subject: [PATCH] - Add patch to fix deps in Qt5WaylandClient.pc and .cmake: * 0001-Fix-use-of-private-dependency.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qtwayland?expand=0&rev=11 --- 0001-Fix-use-of-private-dependency.patch | 36 ++++++++++++++++++++++++ libqt5-qtwayland.changes | 6 ++++ libqt5-qtwayland.spec | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 0001-Fix-use-of-private-dependency.patch diff --git a/0001-Fix-use-of-private-dependency.patch b/0001-Fix-use-of-private-dependency.patch new file mode 100644 index 0000000..78fac27 --- /dev/null +++ b/0001-Fix-use-of-private-dependency.patch @@ -0,0 +1,36 @@ +From ce8fd1f97984476b3638569e7a7f0ab379d891ae Mon Sep 17 00:00:00 2001 +From: Pier Luigi Fiorini +Date: Wed, 24 Jul 2019 23:40:55 +0200 +Subject: [PATCH] Fix use of private dependency + +With 0761173a, Linux SPI Accessibility bridge was added to +the Wayland QPA plugin, but this had a bad side-effect to +QtWaylandClient. + +Linux Accessibility support is a private module, this means we have +to link to it with QT_PRIVATE not QT, otherwise CMake and pkg-config +files for Qt5WaylandClient will depend on it. + +Change-Id: I6182267f97adc2cd5bd66895df148a6a45614f45 +Fixes: QTBUG-76042 +Reviewed-by: Frederik Gladhorn +--- + src/client/client.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/client/client.pro b/src/client/client.pro +index db91bd69..4233ac95 100644 +--- a/src/client/client.pro ++++ b/src/client/client.pro +@@ -20,7 +20,7 @@ qtConfig(xkbcommon) { + } + + qtHaveModule(linuxaccessibility_support_private): \ +- QT += linuxaccessibility_support_private ++ QT_PRIVATE += linuxaccessibility_support_private + + QMAKE_USE += wayland-client + +-- +2.22.0 + diff --git a/libqt5-qtwayland.changes b/libqt5-qtwayland.changes index 7e12ac2..b2e077b 100644 --- a/libqt5-qtwayland.changes +++ b/libqt5-qtwayland.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 15 11:30:28 UTC 2019 - Fabian Vogt + +- Add patch to fix deps in Qt5WaylandClient.pc and .cmake: + * 0001-Fix-use-of-private-dependency.patch + ------------------------------------------------------------------- Wed Jul 3 08:50:36 UTC 2019 - Fabian Vogt diff --git a/libqt5-qtwayland.spec b/libqt5-qtwayland.spec index e30151f..bf8d897 100644 --- a/libqt5-qtwayland.spec +++ b/libqt5-qtwayland.spec @@ -42,6 +42,8 @@ Patch3: 0003-Client-Don-t-send-fake-SurfaceCreated-Destroyed-even.patch Patch4: 0004-Client-Make-handleUpdate-aware-of-exposure-changes.patch # https://codereview.qt-project.org/c/qt/qtwayland/+/265997 Patch5: 0005-Client-Reset-frame-callback-timer-when-hiding-a-wind.patch +# PATCH-FIX-UPSTREAM +Patch6: 0001-Fix-use-of-private-dependency.patch # PATCH-FIX-OPENSUSE Patch100: workaround-null-object.patch BuildRequires: fdupes