diff --git a/qt-everywhere-opensource-src-4.8.5-javascriptcore_debuginfo.patch b/qt-everywhere-opensource-src-4.8.5-javascriptcore_debuginfo.patch deleted file mode 100644 index 08733ea..0000000 --- a/qt-everywhere-opensource-src-4.8.5-javascriptcore_debuginfo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.5/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri.jscore_debuginfo qt-everywhere-opensource-src-4.8.5/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri ---- qt-everywhere-opensource-src-4.8.5/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri.jscore_debuginfo 2013-06-07 00:16:58.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.5/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri 2013-07-11 15:02:37.097084409 -0500 -@@ -13,6 +13,12 @@ CONFIG(debug, debug|release) { - OBJECTS_DIR = obj/release - } - -+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) { -+ message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1") -+ QMAKE_CXXFLAGS_RELEASE -= -g -+ QMAKE_CXXFLAGS_RELEASE += -g1 -+} -+ - symbian: { - # Need to guarantee this comes before system includes of /epoc32/include - MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler" diff --git a/qt.spec b/qt.spec index 6bebcd3..37b1e15 100644 --- a/qt.spec +++ b/qt.spec @@ -29,7 +29,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.5 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -61,9 +61,6 @@ Patch4: qt-everywhere-opensource-src-4.8.5-uic_multilib.patch # reduce debuginfo in qtwebkit (webcore) Patch5: qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch -# reduce debuginfo in qtscript (javascriptcore) -Patch6: qt-everywhere-opensource-src-4.8.5-javascriptcore_debuginfo.patch - # enable ft lcdfilter Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch @@ -483,7 +480,6 @@ and invoke methods on those objects. rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch4 -p1 -b .uic_multilib %patch5 -p1 -b .webcore_debuginfo -%patch6 -p1 -b .javascriptcore_debuginfo %patch15 -p1 -b .enable_ft_lcdfilter %patch23 -p1 -b .glib_eventloop_nullcheck %patch25 -p1 -b .qdbusconnection_no_debug @@ -1210,6 +1206,9 @@ fi %changelog +* Thu Jul 11 2013 Rex Dieter 4.8.5-4 +- drop qtscript(javascriptcore) debuginfo patch, savings not significant + * Thu Jul 11 2013 Rex Dieter 4.8.5-3 - reduce debuginfo in qtwebkit(webcore) and qtscript(javascriptcore)