[-]
[+]
|
Added |
qtbase.spec
|
|
[-]
[+]
|
Added |
fix-build-qreal.patch
^
|
@@ -0,0 +1,26 @@
+From de346e23ceee2b9e9423e9d1b7f24921ebe434eb Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+Date: Sat, 31 May 2014 13:23:13 +0000
+Subject: [PATCH] Fix error building with qreal set to float
+
+Fix build failure with ambiguous conversion.
+---
+ src/widgets/widgets/qlineedit_p.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
+index 10689b2..0cacbbd 100644
+--- a/src/widgets/widgets/qlineedit_p.cpp
++++ b/src/widgets/widgets/qlineedit_p.cpp
+@@ -349,7 +349,7 @@ void QLineEditIconButton::startOpacityAnimation(qreal endValue)
+ void QLineEditIconButton::updateCursor()
+ {
+ #ifndef QT_NO_CURSOR
+- setCursor(qFuzzyCompare(m_opacity, 1.0) || !parentWidget() ? QCursor(Qt::ArrowCursor) : parentWidget()->cursor());
++ setCursor(qFuzzyCompare(m_opacity, (qreal)1.0) || !parentWidget() ? QCursor(Qt::ArrowCursor) : parentWidget()->cursor());
+ #endif
+ }
+
+--
+1.8.3-rc3
+
|
[-]
[+]
|
Added |
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"
|
[-]
[+]
|
Added |
macros.qt5-default
^
|
@@ -0,0 +1,18 @@
+#
+# QMake macros
+#
+
+%_qt5_prefix %{_prefix}
+%_qt5_bindir %{_prefix}/%{_lib}/qt5/bin
+%_qt5_libdir %{_prefix}/%{_lib}
+%_qt5_docdir %{_prefix}/share/doc/qt5
+%_qt5_headerdir %{_prefix}/include/qt5
+%_qt5_datadir %{_prefix}/share/qt5
+%_qt5_plugindir %{_prefix}/%{_lib}/qt5/plugins
+%_qt5_importdir %{_prefix}/%{_lib}/qt5/imports
+%_qt5_translationdir %{_prefix}/share/qt5/translations
+%_qt5_sysconfdir %{_sysconfdir}/xdg
+%_qt5_demosdir %{_prefix}/%{_lib}/qt5/demos
+%_qt5_examplesdir %{_prefix}/%{_lib}/qt5/examples
+
+
|
|
Added |
qtbase-5.3.2.tar.xz
^
|
[-]
[+]
|
Added |
qtbase-rpmlintrc
^
|
@@ -0,0 +1,16 @@
+from Config import *
+
+# rpmlint nags about *.app files under mkspecs/
+addFilter("qt5-qmake.* script-without-shebang")
+
+# Test suite, allow unorthodox behaviour
+addFilter("qt5-qttest.* shared-lib-calls-exit")
+
+# We manually install /etc/rpm/macros.qmake in spec here
+addFilter("qt5-qmake.* non-conffile-in-etc /etc/rpm/macros.qmake")
+
+# Input method plugin is supposed have all-lowercase summary
+addFilter("qt5-plugin-inputmethod-imsw-multi.* summary-not-capitalised.*")
+
+# Qmake package has generic mkspecs files, this is not an error
+addFilter("qt5-qmake.* devel-file-in-non-devel-package")
|