5.2.0-rc1

- revert/omit recent egl packaging changes - -doc install changes-5.* files here (#989149)
2013-12-02 08:13:32 -06:00 · 2013-12-02 08:13:32 -06:00 · e8b08f3abf
parent 03b6541208
commit e8b08f3abf
4 changed files with 14 additions and 123 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 /qtbase-opensource-src-5.1.1.tar.xz
 /qtbase-opensource-src-5.2.0-beta1.tar.xz
+/qtbase-opensource-src-5.2.0-rc1.tar.xz
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@ -19,14 +19,14 @@
 %define docs 1
 %endif

-%define pre beta1
-%define snap 2013-11-08_141
-%define snap_tag 20131108_141
+%define pre rc1
+#define snap 2013-11-08_141
+#define snap_tag 20131108_141

 Summary: Qt5 - QtBase components
 Name:    qt5-qtbase
 Version: 5.2.0
-Release: 0.8.%{pre}.%{snap_tag}%{?dist}
+Release: 0.10.%{pre}%{?dist}

 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -61,8 +61,6 @@ Patch51: qtbase-opensource-src-5.1.1-bigendian.patch
 Patch52: qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch

 ##upstream patches
-# fix egl build
-Patch53: qtbase-opensource-src-5.2.0-egl.patch

 # macros
 %define _qt5 %{name}
@ -213,7 +211,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 #patch50 -p1 -b .poll
 %patch51 -p1 -b .bigendian
 %patch52 -p1 -b .harfbuzz
-%patch53 -p1 -b .egl

 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@ -285,8 +282,7 @@ popd
  -system-libpng \
  %{?pcre} \
  -system-sqlite \
-  -system-zlib \
-  -no-eglfs
+  -system-zlib

 make %{?_smp_mflags}

@ -418,7 +414,6 @@ popd

 %files 
 %doc LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
-%doc dist/README dist/changes-%{version}
 %if 0%{?qtchooser}
 # not editable config files, so not using %%config here
 %dir %{_sysconfdir}/xdg/qtchooser
@ -453,8 +448,9 @@ popd
 %dir %{_qt5_plugindir}/sqldrivers/
 %{_qt5_plugindir}/sqldrivers/libqsqlite.so

-%if 0%{?docs}
 %files doc
+%doc dist/README dist/changes-5.*
+%if 0%{?docs}
 %{_qt5_docdir}/*.qch
 %{_qt5_docdir}/qdoc/
 %{_qt5_docdir}/qmake/
@ -611,6 +607,11 @@ popd


 %changelog
+* Mon Dec 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.10.rc1
+- 5.2.0-rc1
+- revert/omit recent egl packaging changes
+- -doc install changes-5.* files here (#989149)
+
 * Tue Nov 26 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.8.beta1.20131108_141
 - Install changes-5.x.y file (#989149)

--- a/qtbase-opensource-src-5.2.0-egl.patch
+++ b/qtbase-opensource-src-5.2.0-egl.patch
@ -1,111 +0,0 @@
-From 20272ad6e5c56db87146f85f98c560099bfdbb75 Mon Sep 17 00:00:00 2001
-From: Jorgen Lind <jorgen.lind@digia.com>
-Date: Tue, 12 Nov 2013 09:25:23 +0100
-Subject: [PATCH] Fix configure script to not dictate OpenGL ES 2 when EGL is
- enabled
-
-Change-Id: I4d940ef436f21fd915f3d03558fd4fb4c7b3e5b7
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
---
- configure | 34 +++++++---------------------------
- 1 file changed, 7 insertions(+), 27 deletions(-)
-
-diff --git a/configure b/configure
-index 81e2a93..5ff8ad1 100755
--- a/configure
-+++ b/configure
-@@ -3679,7 +3679,7 @@ Additional options:
-  $XCBY  -xcb ............... Compile Xcb support.
- 
-  $EGLFSN  -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support.
- $EGLFSY  -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support).
-+ $EGLFSY  -eglfs ............. Compile EGLFS support.
- 
-  $DFBN  -no-directfb ....... Do not compile DirectFB support.
-  $DFBY  -directfb .......... Compile DirectFB support.
-@@ -3688,7 +3688,7 @@ Additional options:
-  $LFBY  -linuxfb ........... Compile Linux Framebuffer support.
- 
-  $KMSN  -no-kms ............ Do not compile KMS support.
- $KMSY  -kms ............... Compile KMS support (Requires EGL and OpenGL ES 2 support).
-+ $KMSY  -kms ............... Compile KMS support (Requires EGL).
- 
-     -qpa <name> ......... Sets the default QPA platform (e.g xcb, cocoa, windows).
- 
-@@ -4638,11 +4638,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
- 
-@@ -4651,10 +4646,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
-@@ -5490,17 +5481,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'`
-@@ -5523,7 +5507,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"
-@@ -5531,7 +5515,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"
-@@ -5911,11 +5895,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.2
-
--- a/2
+++ b/2
@ -1 +1 @@
-298582a6bf168a34e815bb751bd664c8  qtbase-opensource-src-5.2.0-beta1.tar.xz
+a86dc4cc3aa6443f1ca4b35f826ec240  qtbase-opensource-src-5.2.0-rc1.tar.xz