diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 0d624c9..6e5ee19 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: 4%{?dist} +Release: 5%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -45,6 +45,9 @@ Source5: qconfig-multilib.h # QT_XCB_FORCE_SOFTWARE_OPENGL for them Source6: 10-qt5-check-opengl2.sh +# drop configure check for xkbcommon-x11 +Patch1: qtbase-opensource-src-5.3.0-no_xkbcommon-x11.patch + # support multilib optflags Patch2: qtbase-multilib_optflags.patch @@ -107,7 +110,6 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) %if 0%{?fedora} > 20 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 -BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 %global xkbcommon -system-xkbcommon %else Provides: bundled(libxkbcommon) = 0.4.1 @@ -250,6 +252,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %prep %setup -q -n qtbase-opensource-src-%{version}%{?pre:-%{pre}} +%patch1 -p1 -b .no_xkbcommon-x11 %patch2 -p1 -b .multilib_optflags # drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463 rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags @@ -683,6 +686,9 @@ popd %changelog +* Tue May 27 2014 Rex Dieter 5.3.0-5 +- libcomposeplatforminputcontextplugin doesn't need xkbcommon-x11 + * Fri May 23 2014 Rex Dieter 5.3.0-4 - -system-libxkbcommon (f21+) diff --git a/qtbase-opensource-src-5.3.0-no_xkbcommon-x11.patch b/qtbase-opensource-src-5.3.0-no_xkbcommon-x11.patch new file mode 100644 index 0000000..d906f66 --- /dev/null +++ b/qtbase-opensource-src-5.3.0-no_xkbcommon-x11.patch @@ -0,0 +1,16 @@ +diff -up qtbase-opensource-src-5.3.0/configure.xkbcommon-x11 qtbase-opensource-src-5.3.0/configure +--- qtbase-opensource-src-5.3.0/configure.xkbcommon-x11 2014-05-15 12:12:04.000000000 -0500 ++++ qtbase-opensource-src-5.3.0/configure 2014-05-27 09:48:23.038647709 -0500 +@@ -5056,9 +5056,9 @@ ORIG_CFG_XKBCOMMON="$CFG_XKBCOMMON" + # currently only xcb platform plugin supports building xkbcommon + if [ "$CFG_XCB" != "no" ]; then + if [ "$CFG_XKBCOMMON" = "auto" ] || [ "$CFG_XKBCOMMON" = "system" ]; then +- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then +- QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`" +- QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`" ++ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then ++ QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" ++ QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" + + QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" + QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON"