diff --git a/.gitignore b/.gitignore index a740d46..3de725e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/qtbase-opensource-src-5.2.0.tar.xz +/qtbase-opensource-src-5.2.1.tar.xz diff --git a/qt-everywhere-opensource-src-4.8.5-QTBUG-35460.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-35460.patch deleted file mode 100644 index e0f4bc8..0000000 --- a/qt-everywhere-opensource-src-4.8.5-QTBUG-35460.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp qt-everywhere-opensource-src-4.8.5-QTBUG-35460/src/xml/sax/qxml.cpp ---- qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp 2013-12-05 19:23:33.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.5-QTBUG-35460/src/xml/sax/qxml.cpp 2014-01-13 20:15:11.000000000 +0100 -@@ -6674,7 +6674,7 @@ - - if (expandedSizes[entity] > entityCharacterLimit) { - if (errorMessage) { -- *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3)."); -+ *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands to a string that is too large to process (%2 characters > %3)."); - *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit); - } - return true; diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index f24a3c6..90785c4 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -21,8 +21,8 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase -Version: 5.2.0 -Release: 11%{?dist} +Version: 5.2.1 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -57,9 +57,6 @@ Patch3: qtbase-qatomic-ppc.patch # fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549) Patch4: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch -# fix QTBUG-35460 (error message for CVE-2013-4549 is misspelled) -Patch5: qt-everywhere-opensource-src-4.8.5-QTBUG-35460.patch - # add a QT_XCB_FORCE_SOFTWARE_OPENGL environment variable to allow forcing # LIBGL_ALWAYS_SOFTWARE (llvmpipe) for Qt 5 apps only Patch6: qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe.patch @@ -72,10 +69,6 @@ Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch # https://bugreports.qt-project.org/browse/QTBUG-27195 # NEEDS REBASE Patch50: qt5-poll.patch -# fix big endian builds -Patch51: qtbase-opensource-src-5.1.1-bigendian.patch -# fix build with -system-harfbuzz -Patch52: qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch ##upstream patches @@ -261,13 +254,10 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch3 -p1 -b .qatomic-ppc %patch4 -p1 -b .QTBUG-35459 -%patch5 -p1 -b .QTBUG-35460 %patch6 -p1 -b .allow-forcing-llvmpipe %patch12 -p1 -b .enable_ft_lcdfilter #patch50 -p1 -b .poll -%patch51 -p1 -b .bigendian -%patch52 -p1 -b .harfbuzz # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -684,6 +674,9 @@ popd %changelog +* Wed Feb 05 2014 Rex Dieter 5.2.1-1 +- 5.2.1 + * Sat Feb 01 2014 Rex Dieter 5.2.0-11 - better %%rpm_macros_dir handling 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 4c37150..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-alpha-harfbuzz.patch b/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch deleted file mode 100644 index 57a044e..0000000 --- a/qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp.harfbuzz qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp ---- qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp.harfbuzz 2013-09-27 06:05:10.000000000 -0500 -+++ qtbase-opensource-src-5.2.0-alpha/src/gui/text/qtextengine.cpp 2013-10-01 12:20:23.089054279 -0500 -@@ -1098,7 +1098,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG - hb_buffer_set_segment_properties(buffer, &props); - hb_buffer_guess_segment_properties(buffer); - -- uint buffer_flags = HB_BUFFER_FLAG_DEFAULT; -+ uint buffer_flags = HB_BUFFER_FLAGS_DEFAULT; - // Symbol encoding used to encode various crap in the 32..255 character code range, - // and thus might override U+00AD [SHY]; avoid hiding default ignorables - if (actualFontEngine->symbol) diff --git a/sources b/sources index 873df0e..4aa3a41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c94bbaf1bb7f0f4a32d2caa7501416e1 qtbase-opensource-src-5.2.0.tar.xz +fa005301a2000b92b61b63edc042567b qtbase-opensource-src-5.2.1.tar.xz