From ed540e229fae9b471be49fcb625338d61ee6e5c6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 May 2014 08:46:10 -0500 Subject: [PATCH] qt5-qtbase-5.3.0-2.fc21 breaks keyboard input (#1100213) --- qt5-qtbase.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index da51ddf..999a9f5 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -22,7 +22,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.3.0 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -105,9 +105,17 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(NetworkManager) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) -%if 0%{?fedora} -BuildRequires: pkgconfig(xkbcommon) +# waiting on libxkbcommon update, https://bugzilla.redhat.com/1000497 +#if 0%{?fedora} > 20 +%if 0 +BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 +BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 +%global xkbcommon -system-xkbcommon +%else +Provides: bundled(libxkbcommon) = 0.4.1 +%global xkbcommon -qt-xkbcommon %endif +BuildRequires: pkgconfig(xkeyboard-config) %if 0%{?fedora} || 0%{?rhel} > 6 %define egl 1 BuildRequires: pkgconfig(atspi-2) @@ -328,6 +336,7 @@ popd %{?pcre} \ %{?sqlite} \ %{?tds} \ + %{?xkbcommon} \ -system-zlib make %{?_smp_mflags} @@ -676,6 +685,9 @@ popd %changelog +* Thu May 22 2014 Rex Dieter 5.3.0-3 +- qt5-qtbase-5.3.0-2.fc21 breaks keyboard input (#1100213) + * Wed May 21 2014 Rex Dieter 5.3.0-2 - limit -reduce-relocations to %%ix86 x86_64 archs (QTBUG-36129)