--- a/SFEqt-gpp.spec Thu Nov 03 11:23:30 2011 +0000
+++ b/SFEqt-gpp.spec Thu Nov 03 23:39:26 2011 +0000
@@ -10,7 +10,6 @@
%define standard_prefix /usr
%include Solaris.inc
%define cc_is_gcc 1
-%define _gpp /usr/gnu/bin/g++
%include base.inc
%define srcname qt-everywhere-opensource-src
%define run_autotests 0
@@ -22,7 +21,7 @@
Group: Desktop (GNOME)/Libraries
URL: http://trolltech.com/products/qt
License: LGPLv2
-Version: 4.7.3
+Version: 4.7.4
Source: ftp://ftp.trolltech.com/qt/source/%srcname-%version.tar.gz
# These were obtained from http://solaris.bionicmutton.org/hg/kde4-specs-470/file/db0a8c7904f6/specs/gcc/patches/qt
@@ -45,6 +44,7 @@
Patch6: qt-gpp-06-isnan.diff
Patch7: qt-gpp-07-471-shm.diff
Patch8: qt-gpp-08-QPixmap-warning.diff
+Patch9: qt-gpp-09-qdbus.patch
SUNW_Copyright: qt.copyright
@@ -95,6 +95,7 @@
%patch6
%patch7
%patch8 -p1
+%patch9
%if %{run_autotests}
%patch4
%patch5
@@ -107,14 +108,14 @@
%define extra_includes -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libpng14 -I%{standard_prefix}/%{mysql_default_includedir}
%define extra_libs -L%{standard_prefix}/%{mysql_default_libdir} -R%{standard_prefix}/%{mysql_default_libdir}
-export CC=/usr/gnu/bin/gcc
-export CXX=/usr/gnu/bin/g++
+export CC=gcc
+export CXX=g++
export LD=/usr/gnu/bin/ld
export CFLAGS="%optflags"
export CXXFLAGS="%cxx_optflags -pthreads -fpermissive"
export LDFLAGS="%_ldflags -L/usr/g++/lib -R/usr/g++/lib %{gnu_lib_path} -pthreads"
-# Assume i386 CPU is not higher than Pentium
+# Assume i386 CPU is not higher than Pentium 4
# This can be changed locally if your CPU is newer
./configure -prefix %_prefix \
-confirm-license \
@@ -215,6 +216,8 @@
%changelog
+* Wed Nov 2 2011 - Alex Viskovatoff
+- update to 4.7.4, reworking two patches and adding another
* Tue Aug 16 2011 - Thomas Wagner
- need -R /usr/g++/lib and -R /usr/gnu/lib earlier in RUNPATH, via LDFLAGS,
needs updated SFEgcc patch gcc-03-gnulib.diff to work
--- a/patches/qt-gpp-02-MathExtras.diff Thu Nov 03 11:23:30 2011 +0000
+++ b/patches/qt-gpp-02-MathExtras.diff Thu Nov 03 23:39:26 2011 +0000
@@ -4,8 +4,8 @@
inline float rad2grad(float r) { return r * 200.0f / piFloat; }
inline float grad2rad(float g) { return g * piFloat / 200.0f; }
--#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW)
-+#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
+-#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN)
++#if !COMPILER(MSVC) && !OS(ANDROID) && !OS(SYMBIAN) && !OS(SOLARIS)
using std::isfinite;
using std::isinf;
using std::isnan;
--- a/patches/qt-gpp-03-qmake.SFE.diff Thu Nov 03 11:23:30 2011 +0000
+++ b/patches/qt-gpp-03-qmake.SFE.diff Thu Nov 03 23:39:26 2011 +0000
@@ -1,5 +1,5 @@
---- mkspecs/solaris-g++/qmake.conf.orig 2011-03-30 06:16:35.000000000 +0100
-+++ mkspecs/solaris-g++/qmake.conf 2011-08-17 15:52:40.883067160 +0100
+--- mkspecs/solaris-g++/qmake.conf.orig 2011-09-12 06:49:28.000000000 +0000
++++ mkspecs/solaris-g++/qmake.conf 2011-10-27 22:10:41.160650935 +0000
@@ -28,7 +28,7 @@
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
@@ -9,23 +9,21 @@
QMAKE_CXX = g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-@@ -42,12 +42,12 @@
+@@ -42,10 +42,10 @@
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-QMAKE_INCDIR = /usr/sfw/include
-QMAKE_LIBDIR = /usr/sfw/lib
+-QMAKE_INCDIR_X11 = /usr/openwin/include
+-QMAKE_LIBDIR_X11 = /usr/openwin/lib
+QMAKE_INCDIR = /usr/g++/include
+QMAKE_LIBDIR = /usr/g++/lib
- QMAKE_INCDIR_X11 = /usr/openwin/include
- QMAKE_LIBDIR_X11 = /usr/openwin/lib
--QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
--QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
-+QMAKE_INCDIR_QT = /usr/g++/include/qt
-+QMAKE_LIBDIR_QT = /usr/g++/lib
++QMAKE_INCDIR_X11 = /usr/X11R6/include
++QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
QMAKE_INCDIR_OPENGL = /usr/openwin/include
- QMAKE_LIBDIR_OPENGL = /usr/openwin/lib
-
@@ -63,7 +63,7 @@
QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE
QMAKE_LFLAGS_THREAD =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/qt-gpp-09-qdbus.patch Thu Nov 03 23:39:26 2011 +0000
@@ -0,0 +1,16 @@
+Author: Pavel Heimlich a.k.a. hajma
+The purpose of this patch is to avoid the error undefined symbol
+qt_dbus_metaobject_skip_annotations first referenced in file
+.obj/release-shared/qdbus.o
+This variable also appears in src/dbus/qdbusmetaobject.cpp, so.
+--- tools/qdbus/qdbus/qdbus.cpp.orig Sat Oct 22 10:18:26 2011
++++ tools/qdbus/qdbus/qdbus.cpp Sat Oct 22 10:18:33 2011
+@@ -443,7 +443,7 @@
+
+ int main(int argc, char **argv)
+ {
+- QT_PREPEND_NAMESPACE(qt_dbus_metaobject_skip_annotations) = true;
++// QT_PREPEND_NAMESPACE(qt_dbus_metaobject_skip_annotations) = true;
+ QCoreApplication app(argc, argv);
+ QStringList args = app.arguments();
+ args.takeFirst();