diff --git a/0001-Remove-the-GLES-2-dependency-for-eglfs-and-kms.patch b/0001-Remove-the-GLES-2-dependency-for-eglfs-and-kms.patch deleted file mode 100644 index 79e0bd1..0000000 --- a/0001-Remove-the-GLES-2-dependency-for-eglfs-and-kms.patch +++ /dev/null @@ -1,240 +0,0 @@ -From f087ffdc53254fbab438180cd2da750d54c2be76 Mon Sep 17 00:00:00 2001 -From: Jorgen Lind -Date: Tue, 12 Nov 2013 10:50:42 +0100 -Subject: [PATCH 1/1] Remove the GLES 2 dependency for eglfs and kms - -Change-Id: If7b80487e01db726367f5a67d2860073f60a0844 -Reviewed-by: Gunnar Sletta ---- - src/plugins/platforms/eglfs/qeglfsbackingstore.cpp | 1 + - src/plugins/platforms/eglfs/qeglfsbackingstore.h | 3 ++- - src/plugins/platforms/eglfs/qeglfscompositor.cpp | 7 ++++++- - src/plugins/platforms/eglfs/qeglfscompositor.h | 6 ++++-- - src/plugins/platforms/eglfs/qeglfscursor.cpp | 5 +++-- - src/plugins/platforms/eglfs/qeglfscursor.h | 7 +++++-- - src/plugins/platforms/kms/qkmsbackingstore.cpp | 6 ++++++ - src/plugins/platforms/kms/qkmsbackingstore.h | 4 +++- - src/plugins/platforms/kms/qkmsscreen.h | 3 +-- - 9 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp b/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp -index 9de5960..0353191 100644 ---- a/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp -+++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp -@@ -139,6 +139,7 @@ void QEglFSBackingStore::resize(const QSize &size, const QRegion &staticContents - m_window->create(); - - rootWin->screen()->rootContext()->makeCurrent(rootWin->window()); -+ initializeOpenGLFunctions(); - - if (m_texture) - glDeleteTextures(1, &m_texture); -diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.h b/src/plugins/platforms/eglfs/qeglfsbackingstore.h -index 535428a..9af856e 100644 ---- a/src/plugins/platforms/eglfs/qeglfsbackingstore.h -+++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.h -@@ -43,6 +43,7 @@ - #define QEGLFSBACKINGSTORE_H - - #include -+#include - - #include - #include -@@ -52,7 +53,7 @@ QT_BEGIN_NAMESPACE - class QOpenGLPaintDevice; - class QEglFSWindow; - --class QEglFSBackingStore : public QPlatformBackingStore -+class QEglFSBackingStore : public QPlatformBackingStore, public QOpenGLFunctions - { - public: - QEglFSBackingStore(QWindow *window); -diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp -index 9db43a5..845bb5b 100644 ---- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp -+++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp -@@ -53,7 +53,8 @@ static QEglFSCompositor *compositor = 0; - - QEglFSCompositor::QEglFSCompositor() - : m_screen(0), -- m_program(0) -+ m_program(0), -+ m_initialized(false) - { - Q_ASSERT(!compositor); - m_updateTimer.setSingleShot(true); -@@ -86,6 +87,10 @@ void QEglFSCompositor::renderAll() - Q_ASSERT(context); - - context->makeCurrent(rootWin->window()); -+ if (!m_initialized) { -+ initializeOpenGLFunctions(); -+ m_initialized = true; -+ } - ensureProgram(); - m_program->bind(); - -diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.h b/src/plugins/platforms/eglfs/qeglfscompositor.h -index ade2e06..0d5daaf 100644 ---- a/src/plugins/platforms/eglfs/qeglfscompositor.h -+++ b/src/plugins/platforms/eglfs/qeglfscompositor.h -@@ -42,7 +42,8 @@ - #ifndef QEGLFSCOMPOSITOR_H - #define QEGLFSCOMPOSITOR_H - --#include -+#include -+#include - - QT_BEGIN_NAMESPACE - -@@ -50,7 +51,7 @@ class QEglFSScreen; - class QEglFSWindow; - class QOpenGLShaderProgram; - --class QEglFSCompositor : public QObject -+class QEglFSCompositor : public QObject, public QOpenGLFunctions - { - Q_OBJECT - -@@ -76,6 +77,7 @@ private: - int m_vertexCoordEntry; - int m_textureCoordEntry; - int m_isRasterEntry; -+ bool m_initialized; - }; - - QT_END_NAMESPACE -diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp -index c00e86d..0066426 100644 ---- a/src/plugins/platforms/eglfs/qeglfscursor.cpp -+++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp -@@ -79,7 +79,7 @@ void QEglFSCursor::resetResources() - m_cursorAtlas.texture = 0; - } - --static GLuint createShader(GLenum shaderType, const char *program) -+GLuint QEglFSCursor::createShader(GLenum shaderType, const char *program) - { - GLuint shader = glCreateShader(shaderType); - glShaderSource(shader, 1 /* count */, &program, NULL /* lengths */); -@@ -98,7 +98,7 @@ static GLuint createShader(GLenum shaderType, const char *program) - return 0; - } - --static GLuint createProgram(GLuint vshader, GLuint fshader) -+GLuint QEglFSCursor::createProgram(GLuint vshader, GLuint fshader) - { - GLuint program = glCreateProgram(); - glAttachShader(program, vshader); -@@ -286,6 +286,7 @@ void QEglFSCursor::draw(const QRectF &r) - { - if (!m_program) { - // one time initialization -+ initializeOpenGLFunctions(); - createShaderPrograms(); - - if (!m_cursorAtlas.texture) { -diff --git a/src/plugins/platforms/eglfs/qeglfscursor.h b/src/plugins/platforms/eglfs/qeglfscursor.h -index 51a34e0..71ff73b 100644 ---- a/src/plugins/platforms/eglfs/qeglfscursor.h -+++ b/src/plugins/platforms/eglfs/qeglfscursor.h -@@ -43,15 +43,15 @@ - #define QEGLFSCURSOR_H - - #include -+#include - #include "qeglfsscreen.h" --#include - - QT_BEGIN_NAMESPACE - - class QOpenGLShaderProgram; - class QEglFSScreen; - --class QEglFSCursor : public QPlatformCursor -+class QEglFSCursor : public QPlatformCursor, public QOpenGLFunctions - { - public: - QEglFSCursor(QEglFSScreen *screen); -@@ -78,6 +78,9 @@ protected: - void draw(const QRectF &rect); - void update(const QRegion ®ion); - -+ GLuint createShader(GLenum shaderType, const char *program); -+ GLuint createProgram(GLuint vshader, GLuint fshader); -+ - QEglFSScreen *m_screen; - - // current cursor information -diff --git a/src/plugins/platforms/kms/qkmsbackingstore.cpp b/src/plugins/platforms/kms/qkmsbackingstore.cpp -index 29395f3..fa4ef84 100644 ---- a/src/plugins/platforms/kms/qkmsbackingstore.cpp -+++ b/src/plugins/platforms/kms/qkmsbackingstore.cpp -@@ -52,6 +52,7 @@ QKmsBackingStore::QKmsBackingStore(QWindow *window) - , m_context(new QOpenGLContext) - , m_texture(0) - , m_program(0) -+ , m_initialized(false) - { - m_context->setFormat(window->requestedFormat()); - m_context->setScreen(window->screen()); -@@ -85,6 +86,11 @@ void QKmsBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoin - - m_context->makeCurrent(window); - -+ if (!m_initialized) { -+ initializeOpenGLFunctions(); -+ m_initialized = true; -+ } -+ - if (!m_program) { - static const char *textureVertexProgram = - "attribute highp vec2 vertexCoordEntry;\n" -diff --git a/src/plugins/platforms/kms/qkmsbackingstore.h b/src/plugins/platforms/kms/qkmsbackingstore.h -index 34ea49a..c5f6c81 100644 ---- a/src/plugins/platforms/kms/qkmsbackingstore.h -+++ b/src/plugins/platforms/kms/qkmsbackingstore.h -@@ -43,6 +43,7 @@ - #define QBACKINGSTORE_KMS_H - - #include -+#include - #include - - QT_BEGIN_NAMESPACE -@@ -50,7 +51,7 @@ QT_BEGIN_NAMESPACE - class QOpenGLContext; - class QOpenGLShaderProgram; - --class QKmsBackingStore : public QPlatformBackingStore -+class QKmsBackingStore : public QPlatformBackingStore, public QOpenGLFunctions - { - public: - QKmsBackingStore(QWindow *window); -@@ -69,6 +70,7 @@ private: - uint m_texture; - QOpenGLShaderProgram *m_program; - QRegion m_dirty; -+ bool m_initialized; - }; - - QT_END_NAMESPACE -diff --git a/src/plugins/platforms/kms/qkmsscreen.h b/src/plugins/platforms/kms/qkmsscreen.h -index a90d6fa..f0c49ad 100644 ---- a/src/plugins/platforms/kms/qkmsscreen.h -+++ b/src/plugins/platforms/kms/qkmsscreen.h -@@ -55,8 +55,7 @@ extern "C" { - - #include - #include --#include --#include -+#include - - #include - --- -1.8.4.4 - diff --git a/0002-Fix-configure-script-to-not-dictate-OpenGL-ES-2-when.patch b/0002-Fix-configure-script-to-not-dictate-OpenGL-ES-2-when.patch deleted file mode 100644 index 9a5bb9e..0000000 --- a/0002-Fix-configure-script-to-not-dictate-OpenGL-ES-2-when.patch +++ /dev/null @@ -1,115 +0,0 @@ -From bad2e9fad4b9574528b02e8b60a03672f41ebe35 Mon Sep 17 00:00:00 2001 -From: Jorgen Lind -Date: Tue, 12 Nov 2013 09:25:23 +0100 -Subject: [PATCH 1/1] Fix configure script to not dictate OpenGL ES 2 when EGL - is enabled - -Change-Id: I4d940ef436f21fd915f3d03558fd4fb4c7b3e5b7 -Reviewed-by: Gunnar Sletta -(cherry picked from commit 20272ad6e5c56db87146f85f98c560099bfdbb75) - -Conflicts: - configure ---- - configure | 34 +++++++--------------------------- - 1 file changed, 7 insertions(+), 27 deletions(-) - -diff --git a/configure b/configure -index a330dd6..a83aeb7 100755 ---- a/configure -+++ b/configure -@@ -2419,7 +2419,7 @@ Additional options: - * -xcb ............... Compile Xcb support. - - -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support. -- * -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support). -+ * -eglfs ............. Compile EGLFS support. - - -no-directfb ....... Do not compile DirectFB support. - * -directfb .......... Compile DirectFB support. -@@ -2428,7 +2428,7 @@ Additional options: - * -linuxfb ........... Compile Linux Framebuffer support. - - -no-kms ............ Do not compile KMS support. -- * -kms ............... Compile KMS support (Requires EGL and OpenGL ES 2 support). -+ * -kms ............... Compile KMS support (Requires EGL support). - - -qpa ......... Sets the default QPA platform (e.g xcb, cocoa, windows). - -@@ -4423,11 +4423,6 @@ if [ "$CFG_EGLFS" = "yes" ]; then - echo "The EGLFS plugin requires EGL support and cannot be built" - exit 101 - fi -- if [ "$CFG_OPENGL" != "es2" ]; then -- echo "The EGLFS plugin requires OpenGL ES 2 support and cannot be built" -- exit 101 -- fi -- CFG_OPENGL="es2" - CFG_EGL=yes - fi - -@@ -4436,10 +4431,6 @@ if [ "$CFG_KMS" = "yes" ]; then - echo "The KMS plugin requires EGL support and cannot be built" - exit 101 - fi -- if [ "$CFG_OPENGL" != "es2" ]; then -- echo "The KMS plugin requires OpenGL ES 2 support and cannot be built" -- exit 101 -- fi - fi - - # auto-detect SQL-modules support -@@ -5269,17 +5260,10 @@ elif [ "$CFG_XKBCOMMON" = "no" ]; then - fi - - # EGL Support --if [ "$CFG_OPENGL" != "es2" ]; then -- if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "desktop" ]; then -- echo "EGL support was requested but Qt is being configured for desktop OpenGL." -- echo "Either disable EGL support or enable OpenGL ES support." -- exit 101 -- elif [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then -- echo "EGL support was requested but OpenGL ES support is disabled." -+if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then -+ echo "EGL support was requested but OpenGL support is disabled." - echo "Either disable EGL support or enable OpenGL ES support." - exit 101 -- fi -- CFG_EGL=no - elif [ "$CFG_EGL" != "no" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then - QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` -@@ -5302,7 +5286,7 @@ elif [ "$CFG_EGL" != "no" ]; then - fi - - if [ "$CFG_EGLFS" != "no" ]; then -- if [ "$CFG_OPENGL" = "es2" ] && [ "$XPLATFORM_QNX" = "no" ]; then -+ if [ "$XPLATFORM_QNX" = "no" ]; then - CFG_EGLFS="$CFG_EGL" - else - CFG_EGLFS="no" -@@ -5310,7 +5294,7 @@ if [ "$CFG_EGLFS" != "no" ]; then - fi - - if [ "$CFG_KMS" = "yes" ]; then -- if [ "$CFG_OPENGL" = "es2" ] && [ "$CFG_EGL" = "yes" ]; then -+ if [ "$CFG_EGL" = "yes" ]; then - CFG_KMS="yes" - else - CFG_KMS="no" -@@ -5694,11 +5678,7 @@ else - fi - - if [ "$CFG_OPENGL" = "es2" ]; then -- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES" --fi -- --if [ "$CFG_OPENGL" = "es2" ]; then -- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2" -+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES QT_OPENGL_ES_2" - QT_CONFIG="$QT_CONFIG opengles2" - fi - --- -1.8.4.4 - diff --git a/0003-EGL-convenience-deal-with-DefaultRenderableType-when.patch b/0003-EGL-convenience-deal-with-DefaultRenderableType-when.patch deleted file mode 100644 index 6239577..0000000 --- a/0003-EGL-convenience-deal-with-DefaultRenderableType-when.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 7b6253efbf28b43c8b2a561c188670466ac3d916 Mon Sep 17 00:00:00 2001 -From: Andrew Knight -Date: Wed, 20 Nov 2013 16:56:07 +0200 -Subject: [PATCH 1/1] EGL convenience: deal with DefaultRenderableType when - appropriate - -When encountering QSurfaceFormat::DefaultRenderableType, the surface -format choosers should not default to OpenGL ES, but rather desktop -OpenGL when Qt has been configured without ES2 support. - -Change-Id: I57aa7cfe63ebe0ffb32f4ba32808e62b0a4589f8 -Reviewed-by: Gunnar Sletta ---- - .../eglconvenience/qeglconvenience.cpp | 29 ++++++++++++++++------ - .../eglconvenience/qeglplatformcontext.cpp | 15 ++++++++--- - 2 files changed, 34 insertions(+), 10 deletions(-) - -diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp -index b711a2a..32f553a 100644 ---- a/src/platformsupport/eglconvenience/qeglconvenience.cpp -+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp -@@ -232,17 +232,28 @@ EGLConfig QEglConfigChooser::chooseConfig() - configureAttributes.append(surfaceType()); - - configureAttributes.append(EGL_RENDERABLE_TYPE); -- if (m_format.renderableType() == QSurfaceFormat::OpenVG) -+ switch (m_format.renderableType()) { -+ case QSurfaceFormat::OpenVG: - configureAttributes.append(EGL_OPENVG_BIT); -+ break; - #ifdef EGL_VERSION_1_4 -- else if (m_format.renderableType() == QSurfaceFormat::OpenGL) -+# if !defined(QT_OPENGL_ES_2) -+ case QSurfaceFormat::DefaultRenderableType: -+# endif -+ case QSurfaceFormat::OpenGL: - configureAttributes.append(EGL_OPENGL_BIT); -+ break; - #endif -- else if (m_format.majorVersion() == 1) -- configureAttributes.append(EGL_OPENGL_ES_BIT); -- else -+ case QSurfaceFormat::OpenGLES: -+ if (m_format.majorVersion() == 1) { -+ configureAttributes.append(EGL_OPENGL_ES_BIT); -+ break; -+ } -+ // fall through -+ default: - configureAttributes.append(EGL_OPENGL_ES2_BIT); -- -+ break; -+ } - configureAttributes.append(EGL_NONE); - - EGLConfig cfg = 0; -@@ -336,7 +347,11 @@ QSurfaceFormat q_glFormatFromConfig(EGLDisplay display, const EGLConfig config, - if (referenceFormat.renderableType() == QSurfaceFormat::OpenVG && (renderableType & EGL_OPENVG_BIT)) - format.setRenderableType(QSurfaceFormat::OpenVG); - #ifdef EGL_VERSION_1_4 -- else if (referenceFormat.renderableType() == QSurfaceFormat::OpenGL && (renderableType & EGL_OPENGL_BIT)) -+ else if ((referenceFormat.renderableType() == QSurfaceFormat::OpenGL -+# if !defined(QT_OPENGL_ES_2) -+ || referenceFormat.renderableType() == QSurfaceFormat::DefaultRenderableType -+# endif -+ ) && (renderableType & EGL_OPENGL_BIT)) - format.setRenderableType(QSurfaceFormat::OpenGL); - #endif - else -diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -index 34ba21a..714ad8a 100644 ---- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -@@ -49,14 +49,23 @@ - - static inline void bindApi(const QSurfaceFormat &format) - { -- if (format.renderableType() == QSurfaceFormat::OpenVG) -+ switch (format.renderableType()) { -+ case QSurfaceFormat::OpenVG: - eglBindAPI(EGL_OPENVG_API); -+ break; - #ifdef EGL_VERSION_1_4 -- else if (format.renderableType() == QSurfaceFormat::OpenGL) -+# if !defined(QT_OPENGL_ES_2) -+ case QSurfaceFormat::DefaultRenderableType: -+# endif -+ case QSurfaceFormat::OpenGL: - eglBindAPI(EGL_OPENGL_API); -+ break; - #endif -- else -+ case QSurfaceFormat::OpenGLES: -+ default: - eglBindAPI(EGL_OPENGL_ES_API); -+ break; -+ } - } - - QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, --- -1.8.4.4 - diff --git a/0004-Do-not-disable-egl-on-desktop-gl-automatically.patch b/0004-Do-not-disable-egl-on-desktop-gl-automatically.patch deleted file mode 100644 index 5210bc5..0000000 --- a/0004-Do-not-disable-egl-on-desktop-gl-automatically.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 95ffd606f8a632a8a963486ce340e7e1b707be0a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 19 Nov 2013 16:53:21 +0100 -Subject: [PATCH 1/1] Do not disable egl on desktop gl automatically -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -desktop opengl and egl are not incompatible with eachother, so there -is no need to disable egl when on desktop opengl - -Task-number: QTBUG-34949 - -Change-Id: I757c38674a480910d1cb23853c255eb993e107ff -Reviewed-by: Oswald Buddenhagen -Reviewed-by: Andrew Knight -Reviewed-by: Jørgen Lind ---- - configure | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 120150c..72c13ab 100755 ---- a/configure -+++ b/configure -@@ -5267,11 +5267,13 @@ elif [ "$CFG_XKBCOMMON" = "no" ]; then - fi - - # EGL Support --if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then -+if [ "$CFG_EGL" != "no" ]; then -+ if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then - echo "EGL support was requested but OpenGL support is disabled." -- echo "Either disable EGL support or enable OpenGL ES support." -+ echo "Either disable EGL support or enable OpenGL support." - exit 101 --elif [ "$CFG_EGL" != "no" ]; then -+ fi -+ - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then - QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` - QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` --- -1.8.4.4 - diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index e1c6c88..8334d59 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Feb 10 11:36:36 UTC 2014 - mlin@suse.com + +- Update LICENSE files to %doc + +------------------------------------------------------------------- +Wed Feb 5 17:07:24 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.2.1: + * For more details please see: + http://blog.qt.digia.com/blog/2014/02/05/qt-5-2-1-released/ +- Split out (private) devel packages for each library. Also added + common-devel package, which contains mkspecs, and basic binaries + (e.g. moc, qmake, rcc, syncqt and uic) +- Only create qt5 symlinks for binaries which conflict with + Qt4 version +- Remove libtool archives from packages +- Apply conditionals for %arm also for aarch64 +- Removed unneeded or upstreamed patches: + * 0001-Remove-the-GLES-2-dependency-for-eglfs-and-kms.patch + * 0002-Fix-configure-script-to-not-dictate-OpenGL-ES-2-when.patch + * 0003-EGL-convenience-deal-with-DefaultRenderableType-when.patch + * 0004-Do-not-disable-egl-on-desktop-gl-automatically.patch + * qt-never-strip.diff + * qtbase-opensource-src-5.1.1-bigendian.patch +- modified patches: + * qmake-add-usr-include.diff + ------------------------------------------------------------------- Fri Jan 3 22:28:56 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 5732b42..aa3d29b 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -16,7 +16,34 @@ # +%define qt5_snapshot 0 + Name: libqt5-qtbase +Version: 5.2.1 +Release: 0 +Summary: C++ Program Library, Core Components +License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 +Group: System/Libraries +Url: http://qt.digia.com +%define base_name libqt5 +%define real_version 5.2.1 +%define so_version 5.2.1 +%if %qt5_snapshot +%define tar_version qtbase-%{real_version} +%else +%define tar_version qtbase-opensource-src-%{real_version} +%endif +Source: %{tar_version}.tar.xz +# to get mtime of file: +Source1: libqt5-qtbase.changes +Source2: macros.qt5 +Source3: baselibs.conf +# PATCH-FIX-UPSTREAM qtbase-qatomic-ppc.patch -- fixes build on PPC +Patch3: qtbase-qatomic-ppc.patch +# PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build +Patch109: libqt5-libtool-nodate.diff +# PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path +Patch131: qmake-add-usr-include.diff BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: fdupes @@ -29,14 +56,20 @@ BuildRequires: libtiff-devel BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(mtdev) +%if %qt5_snapshot +#to create the forwarding headers +BuildRequires: perl +%endif BuildRequires: postgresql-devel BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) -%ifarch %arm +%ifarch %arm aarch64 BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glesv2) %endif @@ -57,38 +90,6 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xkbcommon) >= 0.2.0 -Version: 5.2.0 -Release: 0 -Summary: C++ Program Library, Core Components -License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1 -Group: System/Libraries -Url: http://qt.digia.com -%define base_name libqt5 -%define real_version 5.2.0 -%define so_version 5.2.0 -%define tar_version qtbase-opensource-src-%{real_version} -Source: %{tar_version}.tar.xz -# to get mtime of file: -Source1: libqt5-qtbase.changes -Source2: macros.qt5 -Source3: baselibs.conf -# PATCH-FIX-UPSTREAM qt-never-strip.diff -- for creating debug packages -Patch2: qt-never-strip.diff -# PATCH-FIX-UPSTREAM qtbase-qatomic-ppc.patch -- fixes build on PPC -Patch3: qtbase-qatomic-ppc.patch -# PATCH-FIX-UPSTREAM qtbase-opensource-src-5.1.1-bigendian.patch -- fixes build on big endian arches/PPC -Patch4: qtbase-opensource-src-5.1.1-bigendian.patch -# PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build -Patch109: libqt5-libtool-nodate.diff -# PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path -Patch131: qmake-add-usr-include.diff -# PATCH-FIXES-UPSTREAM -- patches 1000 - 1003 are from upstream stable branch, they finally alow building egl support -# without requiring GLES -Patch1000: 0001-Remove-the-GLES-2-dependency-for-eglfs-and-kms.patch -Patch1001: 0002-Fix-configure-script-to-not-dictate-OpenGL-ES-2-when.patch -Patch1002: 0003-EGL-convenience-deal-with-DefaultRenderableType-when.patch -Patch1003: 0004-Do-not-disable-egl-on-desktop-gl-automatically.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -112,16 +113,14 @@ handling. %define libqt5_translationdir %{libqt5_datadir}/translations %prep +%if %qt5_snapshot +%setup -q -n qtbase-%{real_version} +%else %setup -q -n qtbase-opensource-src-%{real_version} -#patch2 -p1 +%endif %patch3 -p1 -%patch4 -p1 %patch109 -p1 %patch131 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 # be sure not to use them rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} @@ -130,56 +129,20 @@ rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: alsa-devel -Requires: c++_compiler -Requires: cups-devel -Requires: libQt5Concurrent5 = %{version} -Requires: libQt5Core5 = %{version} -Requires: libQt5DBus5 = %{version} -Requires: libQt5Gui5 = %{version} -Requires: libQt5Network5 = %{version} -Requires: libQt5OpenGL5 = %{version} -Requires: libQt5PrintSupport5 = %{version} -Requires: libQt5Sql5-mysql = %{version} -Requires: libQt5Sql5-postgresql = %{version} -Requires: libQt5Sql5-sqlite = %{version} -Requires: libQt5Sql5-unixODBC = %{version} -Requires: libQt5Test5 = %{version} -Requires: libQt5Widgets5 = %{version} -Requires: libQt5Xml5 = %{version} -Requires: libjpeg-devel -Requires: libmng-devel -Requires: libpng-devel -Requires: libtiff-devel -Requires: make -Requires: openssl-devel -Requires: pcre-devel -Requires: pkgconfig -Requires: sqlite3-devel -Requires: pkgconfig(dbus-1) -Requires: pkgconfig(egl) -Requires: pkgconfig(freetype2) -Requires: pkgconfig(gl) -%ifarch %arm -Requires: pkgconfig(gbm) -Requires: pkgconfig(glesv2) -%endif -Requires: libicu-devel -Requires: libpulse-devel -Requires: libudev-devel -Requires: xcb-util-image-devel -Requires: xcb-util-keysyms-devel -Requires: xcb-util-renderutil-devel -Requires: xcb-util-wm-devel -Requires: xorg-x11-devel -Requires: zlib-devel -Requires: pkgconfig(glib-2.0) -%if 0%{?suse_version} >= 1310 -Requires: pkgconfig(harfbuzz) -%endif -Requires: pkgconfig(ice) -Requires: pkgconfig(sm) -Requires: pkgconfig(xkbcommon) >= 0.2.0 +# External deps shall be found via pkgconfig +Requires: %{name}-common-devel +Requires: %{name}-doc = %{version} +Requires: libQt5Concurrent-devel = %{version} +Requires: libQt5Core-devel = %{version} +Requires: libQt5DBus-devel = %{version} +Requires: libQt5Gui-devel = %{version} +Requires: libQt5Network-devel = %{version} +Requires: libQt5OpenGL-devel = %{version} +Requires: libQt5PrintSupport-devel = %{version} +Requires: libQt5Sql-devel = %{version} +Requires: libQt5Test-devel = %{version} +Requires: libQt5Widgets-devel = %{version} +Requires: libQt5Xml-devel = %{version} %description devel You need this package, if you want to compile programs with Qt. It @@ -187,6 +150,16 @@ contains the "Qt Crossplatform Development Kit". It does contain include files and development applications like GUI designers, translator tools and code generators. +%package common-devel +Summary: Qt 5 Core Development Binaries +Group: Development/Libraries/X11 +Requires: gcc-c++ +Requires: pkg-config + +%description common-devel +Qt 5 Core Development Binaries. It contains Qt5's moc, qmake, +rcc, uic and syncqt.pl binaries. + %package -n libQt5Core5 Summary: Qt 5 Core Library Group: Development/Libraries/X11 @@ -196,40 +169,22 @@ Obsoletes: libqt5-qtbase < %{version} %description -n libQt5Core5 The Qt 5 Core library. -%package -n libQt5DBus5 -Summary: Qt 5 DBus Library +%package -n libQt5Core-devel +Summary: Qt 5 Core Library - development files Group: Development/Libraries/X11 +Requires: %{name}-common-devel = %{version} +Requires: libQt5Core5 = %{version} -%description -n libQt5DBus5 -The Qt 5 DBus library. +%description -n libQt5Core-devel +Qt 5 Core Library - development files. -%package -n libQt5Network5 -Summary: Qt 5 Network Library +%package -n libQt5Core-private-headers-devel +Summary: Qt 5 Core Library - Non-ABI stable development files Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} -%description -n libQt5Network5 -The Qt 5 Network library. - -%package -n libQt5OpenGL5 -Summary: Qt 5 OpenGL Library -Group: Development/Libraries/X11 - -%description -n libQt5OpenGL5 -The Qt 5 OpenGL library. - -%package -n libQt5PrintSupport5 -Summary: Qt 5 Print Support Library -Group: Development/Libraries/X11 - -%description -n libQt5PrintSupport5 -The Qt 5 Print Support library. - -%package -n libQt5Xml5 -Summary: Qt 5 Xml Library -Group: Development/Libraries/X11 - -%description -n libQt5Xml5 -The Qt 5 Xml library. +%description -n libQt5Core-private-headers-devel +Qt 5 Core Library - Non-ABI stable development files. %package -n libQt5Concurrent5 Summary: Qt 5 Concurrent Library @@ -238,6 +193,145 @@ Group: Development/Libraries/X11 %description -n libQt5Concurrent5 The Qt 5 Concurrent library. +%package -n libQt5Concurrent-devel +Summary: Qt 5 Concurrent Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Concurrent5 = %{version} +Requires: libQt5Core-devel = %{version} + +%description -n libQt5Concurrent-devel +The Qt 5 Concurrent library - development files. + +%package -n libQt5DBus5 +Summary: Qt 5 DBus Library +Group: Development/Libraries/X11 + +%description -n libQt5DBus5 +The Qt 5 DBus library. + +%package -n libQt5DBus-devel +Summary: Qt 5 DBus Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5DBus5 = %{version} + +%description -n libQt5DBus-devel +The Qt 5 DBus library - development files. Aditionally, it contains +Qt5's qdbusxml2cpp and qdbuscpp2xml binaries. + +%package -n libQt5DBus-private-headers-devel +Summary: Qt 5 DBus Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5DBus-devel = %{version} + +%description -n libQt5DBus-private-headers-devel +Qt 5 DBus Library - Non-ABI stable development files. + +%package -n libQt5Network5 +Summary: Qt 5 Network Library +Group: Development/Libraries/X11 + +%description -n libQt5Network5 +The Qt 5 Network library. + +%package -n libQt5Network-devel +Summary: Qt 5 Network Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5Network5 = %{version} + +%description -n libQt5Network-devel +The Qt 5 Network library - development files. + +%package -n libQt5Network-private-headers-devel +Summary: Qt 5 Network Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Network-devel = %{version} + +%description -n libQt5Network-private-headers-devel +Qt 5 Network Library - Non-ABI stable development files. + +%package -n libQt5OpenGL5 +Summary: Qt 5 OpenGL Library +Group: Development/Libraries/X11 + +%description -n libQt5OpenGL5 +The Qt 5 OpenGL library. + +%package -n libQt5OpenGL-devel +Summary: Qt 5 OpenGL Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui-devel = %{version} +Requires: libQt5OpenGL5 = %{version} +Requires: libQt5Widgets-devel = %{version} +%ifarch %arm aarch64 +Requires: pkgconfig(glesv2) +%else +Requires: pkgconfig(gl) +%endif + +%description -n libQt5OpenGL-devel +The Qt 5 OpenGL library - development files. + +%package -n libQt5OpenGL-private-headers-devel +Summary: Qt 5 OpenGL Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Gui-private-headers-devel = %{version} +Requires: libQt5OpenGL-devel = %{version} +Requires: libQt5Widgets-private-headers-devel = %{version} + +%description -n libQt5OpenGL-private-headers-devel +Qt 5 OpenGL Library - Non-ABI stable development files. + +%package -n libQt5PrintSupport5 +Summary: Qt 5 Print Support Library +Group: Development/Libraries/X11 + +%description -n libQt5PrintSupport5 +The Qt 5 Print Support library. + +%package -n libQt5PrintSupport-devel +Summary: Qt 5 Print Support Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui-devel = %{version} +Requires: libQt5PrintSupport5 = %{version} +Requires: libQt5Widgets-devel = %{version} + +%description -n libQt5PrintSupport-devel +The Qt 5 Print Support library - development files. + +%package -n libQt5PrintSupport-private-headers-devel +Summary: Qt 5 Print Support Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Gui-private-headers-devel = %{version} +Requires: libQt5PrintSupport-devel = %{version} +Requires: libQt5Widgets-private-headers-devel = %{version} + +%description -n libQt5PrintSupport-private-headers-devel +Qt 5 Print Support Library - Non-ABI stable development files. + +%package -n libQt5Xml5 +Summary: Qt 5 Xml Library +Group: Development/Libraries/X11 + +%description -n libQt5Xml5 +The Qt 5 Xml library. + +%package -n libQt5Xml-devel +Summary: Qt 5 Xml Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5Xml5 = %{version} + +%description -n libQt5Xml-devel +The Qt 5 Xml library - development files. + %package -n libQt5Test5 Summary: Qt 5 Test Library Group: Development/Libraries/X11 @@ -245,13 +339,51 @@ Group: Development/Libraries/X11 %description -n libQt5Test5 The Qt 5 library for testing. +%package -n libQt5Test-devel +Summary: Qt 5 Test Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5Test5 = %{version} + +%description -n libQt5Test-devel +The Qt 5 library for testing - development files. + +%package -n libQt5Test-private-headers-devel +Summary: Qt 5 Test Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Test-devel = %{version} + +%description -n libQt5Test-private-headers-devel +Qt 5 Test Library - Non-ABI stable development files. + %package -n libQt5Widgets5 -Summary: Qt 5 Test Library +Summary: Qt 5 Widgets Library Group: Development/Libraries/X11 %description -n libQt5Widgets5 The Qt 5 library to display widgets. +%package -n libQt5Widgets-devel +Summary: Qt 5 Widgets Library - development files +Group: Development/Libraries/X11 +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui-devel = %{version} +Requires: libQt5Widgets5 = %{version} + +%description -n libQt5Widgets-devel +The Qt 5 library to display widgets - development files. + +%package -n libQt5Widgets-private-headers-devel +Summary: Qt 5 Widgets Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Gui-private-headers-devel = %{version} +Requires: libQt5Widgets-devel = %{version} + +%description -n libQt5Widgets-private-headers-devel +Qt 5 Widgets Library - Non-ABI stable development files. + %package -n libQt5Sql5-sqlite Summary: Qt 5 sqlite plugin Group: Development/Libraries/C and C++ @@ -306,6 +438,30 @@ Recommends: libqt5-qtimageformats = %{version} %description -n libQt5Gui5 Qt 5 libraries which are depending on X11. +%package -n libQt5Gui-devel +Summary: Qt 5 GUI related libraries - development files +Group: Development/Libraries/C and C++ +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui5 = %{version} +%ifarch %arm aarch64 +Requires: pkgconfig(glesv2) +%else +Requires: pkgconfig(gl) +%endif +Requires: pkgconfig(egl) + +%description -n libQt5Gui-devel +Qt 5 libraries which are depending on X11 - development files. + +%package -n libQt5Gui-private-headers-devel +Summary: Qt 5 Gui Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Gui-devel = %{version} + +%description -n libQt5Gui-private-headers-devel +Qt 5 Gui Library - Non-ABI stable development files. + %package -n libQt5Sql5 Summary: Qt 5 SQL related libraries Group: Development/Libraries/C and C++ @@ -316,10 +472,51 @@ Suggests: libqt5-sql-sqlite Qt 5 libraries which are used for connection with an SQL server. You will need also a plugin package for a supported SQL server. +%package -n libQt5Sql-devel +Summary: Qt 5 SQL related libraries - development files +Group: Development/Libraries/C and C++ +Requires: libQt5Core-devel = %{version} +Requires: libQt5Sql5 = %{version} +Requires: libQt5Sql5-mysql = %{version} +Requires: libQt5Sql5-postgresql = %{version} +Requires: libQt5Sql5-sqlite = %{version} +Requires: libQt5Sql5-unixODBC = %{version} + +%description -n libQt5Sql-devel +Qt 5 libraries which are used for connection with an SQL server. You +will need also a plugin package for a supported SQL server - development files. + +%package -n libQt5Sql-private-headers-devel +Summary: Qt 5 SQL Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Sql-devel = %{version} + +%description -n libQt5Sql-private-headers-devel +Qt 5 SQL Library - Non-ABI stable development files. + +%package doc +Summary: Qt 5 tool used by Qt Developers to generate documentation +Group: Development/Libraries/C and C++ +Requires: %{name}-common-devel = %{version} + +%description doc +Qt 5 tool used by Qt Developers to generate documentation for software projects. + + %package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libqt5-qtbase-devel = %{version} +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5DBus-private-headers-devel = %{version} +Requires: libQt5Gui-private-headers-devel = %{version} +Requires: libQt5Network-private-headers-devel = %{version} +Requires: libQt5OpenGL-private-headers-devel = %{version} +Requires: libQt5PlatformSupport-private-headers-devel = %{version} +Requires: libQt5PrintSupport-private-headers-devel = %{version} +Requires: libQt5Sql-private-headers-devel = %{version} +Requires: libQt5Test-private-headers-devel = %{version} +Requires: libQt5Widgets-private-headers-devel = %{version} %description private-headers-devel This package provides private headers of libqt5-qtbase-devel that are normally @@ -327,6 +524,56 @@ not used by application development and that do not have any ABI or API guarantees. The packages that build against these have to require the exact Qt version. +%package -n libQt5Bootstrap-devel-static +Summary: Qt Bootstrap module +Group: Development/Libraries/C and C++ +Requires: %{name}-common-devel = %{version} + +%description -n libQt5Bootstrap-devel-static +Qt Bootstrap module. + +%package -n libQt5OpenGLExtensions-devel-static +Summary: Qt OpenGLExtensions module +Group: Development/Libraries/C and C++ +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui-devel = %{version} +# List the below ones manually - they are private, but this is a static lib +Requires: pkgconfig(GL) + +%description -n libQt5OpenGLExtensions-devel-static +Qt OpenGLExtensions module. + +%package -n libQt5PlatformSupport-devel-static +Summary: Qt PlatformSupport module +Group: Development/Libraries/C and C++ +Requires: libQt5Core-devel = %{version} +Requires: libQt5Gui-devel = %{version} +# List the below ones manually - they are private, but this is a static lib +Requires: pkgconfig(Qt5DBus) +Requires: pkgconfig(egl) +Requires: pkgconfig(fontconfig) +Requires: pkgconfig(freetype2) +Requires: pkgconfig(gl) +Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(mtdev) +Requires: pkgconfig(udev) +Requires: pkgconfig(x11) +Requires: pkgconfig(xext) +Requires: pkgconfig(xrender) + +%description -n libQt5PlatformSupport-devel-static +Qt PlatformSupport module. + +%package -n libQt5PlatformSupport-private-headers-devel +Summary: Qt 5 PlatformSupport Library - Non-ABI stable development files +Group: Development/Libraries/X11 +Requires: libQt5Core-private-headers-devel = %{version} +Requires: libQt5Gui-private-headers-devel = %{version} +Requires: libQt5PlatformSupport-devel-static = %{version} + +%description -n libQt5PlatformSupport-private-headers-devel +Qt 5 PlatformSupport Library - Non-ABI stable development files. + %build export QMAKESPEC=$PWD/mkspecs/linux-g++ %ifarch ppc64 @@ -340,6 +587,10 @@ platform="-platform linux-g++-64" %else platform="" %endif +%if %qt5_snapshot +#force the configure script to generate the forwarding headers (it checks whether .git directory exists) +mkdir .git +%endif # Record mtime of changes file instead of build time CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10` sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure @@ -393,6 +644,7 @@ echo yes | ./configure $platform \ -glib \ -system-sqlite \ -no-sql-mysql \ + -no-strip \ -xsync \ -xinput \ -gtkstyle \ @@ -402,17 +654,17 @@ echo yes | ./configure $platform \ -xcb \ -egl \ -eglfs \ -%ifarch %arm +%ifarch %arm aarch64 -eglfs -kms \ -opengl es2 \ %else -opengl desktop \ %endif -release \ -%ifarch %arm +%ifarch %arm aarch64 -no-neon \ %endif - -plugin-sql-sqlite -nomake examples \ + -plugin-sql-sqlite -nomake examples -nomake tests \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ -plugin-sql-mysql -I/usr/include/mysql/ -I/usr/include -v @@ -429,22 +681,33 @@ find %{buildroot}/%{libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e # insanity ... find %{buildroot}/%{libqt5_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=%libqt5_bindir/moc," -e "s,uic_location=.*,uic_location=%libqt5_bindir/uic," {} \; find %{buildroot}/%{libqt5_libdir}/ -name 'lib*.a' -exec chmod -x -- {} \; +# kill .la files +rm -f %{buildroot}%{libqt5_libdir}/lib*.la mkdir -p %{buildroot}/%{libqt5_plugindir}/sqldrivers # put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{libqt5_bindir} for i in * ; do + case "${i}" in + moc|qdbuscpp2xml|qdbusxml2cpp|qmake|rcc|syncqt|uic) mv $i ../../../bin/${i}-qt5 ln -s ../../../bin/${i}-qt5 . ln -s ../../../bin/${i}-qt5 $i + ;; + *) + mv $i ../../../bin/ + ln -s ../../../bin/$i . + ;; + esac done popd pushd %{buildroot}%{libqt5_docdir}/global/template/images chmod -R 644 *.png popd -%fdupes -s %{buildroot} +# Only symlink mkspecs, as headers and cmake files are across different packages. If needed, call fdupes on every dir, as per package split +%fdupes -s %{buildroot}%{libqt5_archdatadir}/mkspecs/ %post -n libQt5Core5 -p /sbin/ldconfig @@ -490,59 +753,172 @@ popd %postun -n libQt5Widgets5 -p /sbin/ldconfig +%files common-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{_sysconfdir}/rpm/macros.qt5 +%{_bindir}/moc* +%{libqt5_bindir}/moc* +%{_bindir}/qmake* +%{libqt5_bindir}/qmake* +%{_bindir}/rcc* +%{libqt5_bindir}/rcc* +%{_bindir}/uic* +%{libqt5_bindir}/uic* +%{_bindir}/syncqt.pl* +%{libqt5_bindir}/syncqt.pl* +%{libqt5_archdatadir}/mkspecs/ +%dir %{libqt5_libdir}/cmake +%dir %{libqt5_includedir} +%dir %{libqt5_archdatadir} +%dir %{libqt5_bindir} + %files -n libQt5Core5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Core.so.* +%files -n libQt5Core-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Core.so +%{libqt5_libdir}/libQt5Core.prl +%{libqt5_libdir}/cmake/Qt5Core/ +%{libqt5_libdir}/cmake/Qt5/ +%{libqt5_libdir}/pkgconfig/Qt5Core.pc +%{libqt5_includedir}/QtCore/ +%exclude %{libqt5_includedir}/QtCore/%{so_version} + %files -n libQt5Concurrent5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Concurrent.so.* +%files -n libQt5Concurrent-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Concurrent.so +%{libqt5_libdir}/libQt5Concurrent.prl +%{libqt5_libdir}/cmake/Qt5Concurrent/ +%{libqt5_libdir}/pkgconfig/Qt5Concurrent.pc +%{libqt5_includedir}/QtConcurrent/ + %files -n libQt5DBus5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5DBus.so.* +%files -n libQt5DBus-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5DBus.so +%{libqt5_libdir}/libQt5DBus.prl +%{libqt5_libdir}/cmake/Qt5DBus/ +%{libqt5_libdir}/pkgconfig/Qt5DBus.pc +%{libqt5_includedir}/QtDBus/ +%exclude %{libqt5_includedir}/QtDBus/%{so_version} +%{libqt5_bindir}/qdbusxml2cpp* +%{_bindir}/qdbusxml2cpp* +%{libqt5_bindir}/qdbuscpp2xml* +%{_bindir}/qdbuscpp2xml* + %files -n libQt5Network5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Network.so.* %dir %{libqt5_libdir}/qt5 %dir %{libqt5_plugindir} %{libqt5_plugindir}/bearer +%files -n libQt5Network-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Network.so +%{libqt5_libdir}/libQt5Network.prl +%{libqt5_libdir}/cmake/Qt5Network/ +%{libqt5_libdir}/pkgconfig/Qt5Network.pc +%{libqt5_includedir}/QtNetwork/ +%exclude %{libqt5_includedir}/QtNetwork/%{so_version} + %files -n libQt5OpenGL5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5OpenGL.so.* +%files -n libQt5OpenGL-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5OpenGL.so +%{libqt5_libdir}/libQt5OpenGL.prl +%{libqt5_libdir}/cmake/Qt5OpenGL/ +%{libqt5_libdir}/pkgconfig/Qt5OpenGL.pc +%{libqt5_includedir}/QtOpenGL/ +%exclude %{libqt5_includedir}/QtOpenGL/%{so_version} + %files -n libQt5PrintSupport5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5PrintSupport.so.* %{libqt5_plugindir}/printsupport +%files -n libQt5PrintSupport-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5PrintSupport.so +%{libqt5_libdir}/libQt5PrintSupport.prl +%{libqt5_libdir}/cmake/Qt5PrintSupport/ +%{libqt5_libdir}/pkgconfig/Qt5PrintSupport.pc +%{libqt5_includedir}/QtPrintSupport/ +%exclude %{libqt5_includedir}/QtPrintSupport/%{so_version} + %files -n libQt5Xml5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Xml.so.* +%files -n libQt5Xml-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Xml.so +%{libqt5_libdir}/libQt5Xml.prl +%{libqt5_libdir}/cmake/Qt5Xml/ +%{libqt5_libdir}/pkgconfig/Qt5Xml.pc +%{libqt5_includedir}/QtXml/ + %files -n libQt5Test5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Test.so.* +%files -n libQt5Test-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Test.so +%{libqt5_libdir}/libQt5Test.prl +%{libqt5_libdir}/cmake/Qt5Test/ +%{libqt5_libdir}/pkgconfig/Qt5Test.pc +%{libqt5_includedir}/QtTest/ +%exclude %{libqt5_includedir}/QtTest/%{so_version} + %files -n libQt5Widgets5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Widgets.so.* %{libqt5_plugindir}/accessible +%files -n libQt5Widgets-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Widgets.so +%{libqt5_libdir}/libQt5Widgets.prl +%{libqt5_libdir}/cmake/Qt5Widgets/ +%{libqt5_libdir}/pkgconfig/Qt5Widgets.pc +%{libqt5_includedir}/QtWidgets/ +%exclude %{libqt5_includedir}/QtWidgets/%{so_version} + %files -n libQt5Gui5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Gui.so.* %{libqt5_plugindir}/generic %{libqt5_plugindir}/imageformats @@ -550,53 +926,140 @@ popd %{libqt5_plugindir}/platforms %{libqt5_plugindir}/platformthemes +%files -n libQt5Gui-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Gui.so +%{libqt5_libdir}/libQt5Gui.prl +%{libqt5_libdir}/cmake/Qt5Gui/ +%{libqt5_libdir}/pkgconfig/Qt5Gui.pc +%{libqt5_includedir}/QtGui/ +%exclude %{libqt5_includedir}/QtGui/%{so_version} + %files devel %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL -%{_bindir}/* -%libqt5_bindir/* -%dir %libqt5_bindir -%exclude %{libqt5_includedir}/*/%{so_version} -%{libqt5_includedir}/ -%{libqt5_libdir}/cmake -%{libqt5_libdir}/libQt5*.la -%{libqt5_libdir}/libQt5*.prl -%{libqt5_libdir}/libQt5*.so -%{libqt5_libdir}/libQt5*.a -%{libqt5_libdir}/pkgconfig/Qt5*.pc -%{libqt5_archdatadir}/mkspecs -%{libqt5_docdir} -%{_sysconfdir}/rpm/macros.qt5 +%doc *.txt LICENSE.* %files private-headers-devel %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL -%{libqt5_includedir}/*/%{so_version} +%doc *.txt LICENSE.* %files -n libQt5Sql5 %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Sql.so.* %dir %{libqt5_plugindir}/sqldrivers +%files -n libQt5Sql-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Sql.so +%{libqt5_libdir}/libQt5Sql.prl +%{libqt5_libdir}/cmake/Qt5Sql/ +%{libqt5_libdir}/pkgconfig/Qt5Sql.pc +%{libqt5_includedir}/QtSql/ +%exclude %{libqt5_includedir}/QtSql/%{so_version} + %files -n libQt5Sql5-sqlite %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_plugindir}/sqldrivers/libqsqlite*.so %files -n libQt5Sql5-unixODBC %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_plugindir}/sqldrivers/libqsqlodbc*.so %files -n libQt5Sql5-postgresql %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_plugindir}/sqldrivers/libqsqlpsql*.so %files -n libQt5Sql5-mysql %defattr(-,root,root,755) -%doc *.txt LICENSE.LGPL LICENSE.FDL +%doc *.txt LICENSE.* %{libqt5_plugindir}/sqldrivers/libqsqlmysql*.so +%files doc +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{_bindir}/qdoc* +%{libqt5_bindir}/qdoc* +%{libqt5_docdir} + +%files -n libQt5Bootstrap-devel-static +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5Bootstrap.a +%{libqt5_libdir}/libQt5Bootstrap.prl +%{libqt5_libdir}/pkgconfig/Qt5Bootstrap.pc + +%files -n libQt5OpenGLExtensions-devel-static +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5OpenGLExtensions.a +%{libqt5_libdir}/libQt5OpenGLExtensions.prl +%{libqt5_libdir}/cmake/Qt5OpenGLExtensions/ +%{libqt5_libdir}/pkgconfig/Qt5OpenGLExtensions.pc +%{libqt5_includedir}/QtOpenGLExtensions/ + +%files -n libQt5PlatformSupport-devel-static +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_libdir}/libQt5PlatformSupport.a +%{libqt5_libdir}/libQt5PlatformSupport.prl +%{libqt5_libdir}/pkgconfig/Qt5PlatformSupport.pc +%{libqt5_includedir}/QtPlatformSupport/ +%exclude %{libqt5_includedir}/QtPlatformSupport/%{so_version} + +%files -n libQt5Core-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtCore/%{so_version}/ + +%files -n libQt5DBus-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtDBus/%{so_version}/ + +%files -n libQt5Gui-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtGui/%{so_version}/ + +%files -n libQt5Network-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtNetwork/%{so_version}/ + +%files -n libQt5OpenGL-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtOpenGL/%{so_version}/ + +%files -n libQt5PlatformSupport-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtPlatformSupport/%{so_version}/ + +%files -n libQt5PrintSupport-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtPrintSupport/%{so_version}/ + +%files -n libQt5Sql-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtSql/%{so_version}/ + +%files -n libQt5Test-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtTest/%{so_version}/ + +%files -n libQt5Widgets-private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%{libqt5_includedir}/QtWidgets/%{so_version}/ + %changelog diff --git a/qmake-add-usr-include.diff b/qmake-add-usr-include.diff index f63c183..37a9930 100644 --- a/qmake-add-usr-include.diff +++ b/qmake-add-usr-include.diff @@ -1,11 +1,13 @@ ---- qtbase/qmake/generators/unix/unixmake2.cpp 2012/08/30 12:10:34 1.1 -+++ qtbase/qmake/generators/unix/unixmake2.cpp 2012/08/30 12:10:41 -@@ -128,7 +128,7 @@ +diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp +index e4d33e2..920ebe9 100644 +--- a/qmake/generators/unix/unixmake2.cpp ++++ b/qmake/generators/unix/unixmake2.cpp +@@ -128,7 +128,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) << varGlue("DEFINES","-D"," -D","") << endl; t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n"; t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; - t << "INCPATH = -I" << specdir(); -+ t << "INCPATH = " << "-I/usr/include -I" << specdir(); ++ t << "INCPATH = -I/usr/include -I" << specdir(); if(!project->isActiveConfig("no_include_pwd")) { QString pwd = escapeFilePath(fileFixify(qmake_getpwd())); if(pwd.isEmpty()) diff --git a/qt-never-strip.diff b/qt-never-strip.diff deleted file mode 100644 index 55a7b93..0000000 --- a/qt-never-strip.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- qtbase/configure 2012/05/24 14:10:06 1.1 -+++ qtbase/configure 2012/05/24 14:11:09 -@@ -65,7 +65,6 @@ - - # initialize global variables - QMAKE_SWITCHES= --QMAKE_VARS= - QMAKE_CONFIG= - QTCONFIG_CONFIG= - QT_CONFIG= -@@ -1199,7 +1198,7 @@ - QMakeVar add QMAKE_CFLAGS -pg - QMakeVar add QMAKE_CXXFLAGS -pg - QMakeVar add QMAKE_LFLAGS -pg -- QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip" -+ QMakeVar add CONFIG nostrip - else - UNKNOWN_OPT=yes - fi -@@ -2426,6 +2425,8 @@ - esac - fi - -+QMakeVar add CONFIG nostrip -+ - #------------------------------------------------------------------------------- - # tests that don't need qmake (must be run before displaying help) - #------------------------------------------------------------------------------- diff --git a/qtbase-opensource-src-5.1.1-bigendian.patch b/qtbase-opensource-src-5.1.1-bigendian.patch deleted file mode 100644 index 500a09e..0000000 --- a/qtbase-opensource-src-5.1.1-bigendian.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c ---- qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c.bigendian 2013-09-23 11:10:42.000000000 +0200 -+++ qtbase-opensource-src-5.1.1/src/3rdparty/sha3/KeccakF-1600-opt64.c 2013-09-23 11:16:02.000000000 +0200 -@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned c - KeccakPermutationOnWords((UINT64*)state); - } - --#if 0 // Unused in the Qt configuration -+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) - static void fromBytesToWord(UINT64 *word, const UINT8 *bytes) - { - unsigned int i; -@@ -445,7 +445,7 @@ static void KeccakAbsorb(unsigned char * - #endif - } - --#if 0 // Unused in the Qt configuration -+#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) - static void fromWordToBytes(UINT8 *bytes, const UINT64 word) - { - unsigned int i; diff --git a/qtbase-opensource-src-5.2.0.tar.xz b/qtbase-opensource-src-5.2.0.tar.xz deleted file mode 100644 index 3696e26..0000000 --- a/qtbase-opensource-src-5.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628 -size 46353264 diff --git a/qtbase-opensource-src-5.2.1.tar.xz b/qtbase-opensource-src-5.2.1.tar.xz new file mode 100644 index 0000000..f2c79f3 --- /dev/null +++ b/qtbase-opensource-src-5.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0 +size 46380984