--- a/ChangeLog Sun Jan 08 20:51:29 2012 +0000
+++ b/ChangeLog Mon Jan 09 20:53:56 2012 +0000
@@ -1,3 +1,7 @@
+2012-01-09 Milan Jurik <[email protected]>
+
+ * SFEqt.spec: use libCstd, bump to 4.7.4
+
2012-01-08 Milan Jurik <[email protected]>
* SFEstellarium.spec: bump to 0.11.1, fix qt-stdcxx
--- a/SFEqt.spec Sun Jan 08 20:51:29 2012 +0000
+++ b/SFEqt.spec Mon Jan 09 20:53:56 2012 +0000
@@ -4,31 +4,22 @@
# package are under the same license as the package itself.
%include Solaris.inc
-
-%define cc_is_gcc 1
+%define srcname qt-everywhere-opensource-src
Name: SFEqt
+IPS_Package_Name: library/desktop/qt
Summary: Cross-platform development framework/toolkit
URL: http://trolltech.com/products/qt
-License: GPL v2
-Version: 4.4.3
-Source: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
-Patch1: qt-01-use_bash.diff
-Patch2: qt-02-libpng.diff
-
+License: GPLv2
+Version: 4.7.4
+Source: ftp://ftp.trolltech.com/qt/source/%srcname-%version.tar.gz
+Patch1: qt-01-q_atomic_test_and_set_ptr.diff
+Patch2: qt-02-ctype.diff
+Patch3: qt-03-disable-helloconcurrent.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-Requires: SUNWgccruntime
-BuildRequires: SUNWgcc
-#FIXME: Requires: SUNWxorg-mesa
-# Guarantee X/freetype environment concisely (hopefully):
-Requires: SUNWxwplt
-# The above bring in many things, including SUNWxwice and SUNWzlib
-Requires: SUNWxwxft
-# The above also pulls in SUNWfreetype2
-
%package devel
Summary: %{summary} - development files
SUNW_BaseDir: %{_basedir}
@@ -36,9 +27,9 @@
Requires: %name
%prep
-%setup -q -n qt-x11-opensource-src-%version
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{srcname}-%version
+%patch1 -p0
+%patch2 -p0
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -46,14 +37,14 @@
CPUS=1
fi
-export CC=gcc
-export CXX=g++
-export CFLAGS="-O4 -fPIC -DPIC -Xlinker -i -fno-omit-frame-pointer"
-export CXXFLAGS="%gcc_cxx_optflags"
+export CFLAGS="%{optflags} -I/usr/include/libpng14"
+export CXXFLAGS="%cxx_optflags -I/usr/include/libpng14"
export LDFLAGS="%_ldflags"
echo yes | ./configure -prefix %{_prefix} \
- -platform solaris-g++ \
+ -opensource \
+ -confirm-license \
+ -platform solaris-cc \
-docdir %{_docdir}/qt \
-headerdir %{_includedir}/qt \
-plugindir %{_libdir}/qt/plugins \
@@ -61,11 +52,9 @@
-translationdir %{_datadir}/qt/translations \
-examplesdir %{_datadir}/qt/examples \
-demosdir %{_datadir}/qt/demos \
- -sysconfdir %{_sysconfdir} \
- -no-exceptions \
- -no-webkit \
- -L /usr/gnu/lib \
- -R /usr/gnu/lib
+ -sysconfdir %{_sysconfdir}
+
+%patch3 -p0
make -j$CPUS
@@ -75,7 +64,6 @@
make install INSTALL_ROOT=$RPM_BUILD_ROOT
rm ${RPM_BUILD_ROOT}%{_libdir}/*.la
-rm ${RPM_BUILD_ROOT}%{_libdir}/*.a
%clean
rm -rf $RPM_BUILD_ROOT
@@ -87,11 +75,21 @@
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
%{_libdir}/lib*.prl
+%{_libdir}/libQtUiTools.a
%dir %attr (0755, root, bin) %{_libdir}/qt
%{_libdir}/qt/*
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/qt
+%dir %attr (0755, root, bin) %{_prefix}/imports
+%{_prefix}/imports/Qt/labs/particles/libqmlparticlesplugin.so
+%{_prefix}/imports/Qt/labs/particles/qmldir
+%{_prefix}/imports/Qt/labs/gestures/libqmlgesturesplugin.so
+%{_prefix}/imports/Qt/labs/gestures/qmldir
+%{_prefix}/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
+%{_prefix}/imports/Qt/labs/folderlistmodel/qmldir
+%{_prefix}/imports/Qt/labs/shaders/libqmlshadersplugin.so
+%{_prefix}/imports/Qt/labs/shaders/qmldir
%files devel
%defattr (-, root, bin)
@@ -106,6 +104,9 @@
%{_datadir}/doc/*
%changelog
+* Mon Jan 09 2012 - Milan Jurik
+- use libCstd (SFEqt-gpp is QT built with GCC)
+- bump to 4.7.4
* Wed Mar 10 2010 - Brian Cameron
- Add -no-webkit to configure, otherwise the linker crashes.
Looks like this will go away when binutils is updated to 2.21 (which is not
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/qt-01-q_atomic_test_and_set_ptr.diff Mon Jan 09 20:53:56 2012 +0000
@@ -0,0 +1,39 @@
+diff --git src/corelib/arch/qatomic_i386.h src/corelib/arch/qatomic_i386.h
+index 73095a9..19660df 100644
+--- src/corelib/arch/qatomic_i386.h
++++ src/corelib/arch/qatomic_i386.h
+@@ -202,7 +202,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
+
+ extern "C" {
+ Q_CORE_EXPORT int q_atomic_test_and_set_int(volatile int *ptr, int expected, int newval);
+- Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval);
++ Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, const volatile void *expected, const volatile void *newval);
+ Q_CORE_EXPORT int q_atomic_increment(volatile int *ptr);
+ Q_CORE_EXPORT int q_atomic_decrement(volatile int *ptr);
+ Q_CORE_EXPORT int q_atomic_set_int(volatile int *ptr, int newval);
+diff --git src/corelib/arch/qatomic_sparc.h src/corelib/arch/qatomic_sparc.h
+index a89a5f3..94b7dd1 100644
+--- src/corelib/arch/qatomic_sparc.h
++++ src/corelib/arch/qatomic_sparc.h
+@@ -127,7 +127,7 @@ extern "C" {
+ Q_CORE_EXPORT int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
+ Q_CORE_EXPORT int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
+
+- Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval);
++ Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, const volatile void *expected, const volatile void *newval);
+ Q_CORE_EXPORT int q_atomic_test_and_set_acquire_ptr(volatile void *ptr,
+ void *expected,
+ void *newval);
+diff --git src/corelib/arch/qatomic_x86_64.h src/corelib/arch/qatomic_x86_64.h
+index 9303f19..3be96fa 100644
+--- src/corelib/arch/qatomic_x86_64.h
++++ src/corelib/arch/qatomic_x86_64.h
+@@ -203,7 +203,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
+
+ extern "C" {
+ Q_CORE_EXPORT int q_atomic_test_and_set_int(volatile int *ptr, int expected, int newval);
+- Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval);
++ Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, const volatile void *expected, const volatile void *newval);
+ Q_CORE_EXPORT int q_atomic_increment(volatile int *ptr);
+ Q_CORE_EXPORT int q_atomic_decrement(volatile int *ptr);
+ Q_CORE_EXPORT int q_atomic_set_int(volatile int *ptr, int newval);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/qt-02-ctype.diff Mon Jan 09 20:53:56 2012 +0000
@@ -0,0 +1,10 @@
+--- tools/qdoc3/cppcodemarker.cpp Sat Jan 7 09:07:04 2012
++++ tools/qdoc3/cppcodemarker.cpp Sat Jan 7 09:07:00 2012
+@@ -48,6 +48,7 @@
+ #include "node.h"
+ #include "text.h"
+ #include "tree.h"
++#include "ctype.h"
+
+ QT_BEGIN_NAMESPACE
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/qt-03-disable-helloconcurrent.diff Mon Jan 09 20:53:56 2012 +0000
@@ -0,0 +1,53 @@
+--- examples/tutorials/threads/Makefile Sun Jan 8 19:31:28 2012
++++ examples/tutorials/threads/Makefile Sun Jan 8 19:07:55 2012
+@@ -30,1 +30,0 @@
+- sub-helloconcurrent \
+@@ -78,22 +77,0 @@
+-helloconcurrent/$(MAKEFILE):
+- @$(CHK_DIR_EXISTS) helloconcurrent/ || $(MKDIR) helloconcurrent/
+- cd helloconcurrent/ && $(QMAKE) /home/jurikm/packages/BUILD/qt-everywhere-opensource-src-4.7.4/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro -spec /home/jurikm/packages/BUILD/qt-everywhere-opensource-src-4.7.4/mkspecs/solaris-cc -o $(MAKEFILE)
+-sub-helloconcurrent-qmake_all: FORCE
+- @$(CHK_DIR_EXISTS) helloconcurrent/ || $(MKDIR) helloconcurrent/
+- cd helloconcurrent/ && $(QMAKE) /home/jurikm/packages/BUILD/qt-everywhere-opensource-src-4.7.4/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro -spec /home/jurikm/packages/BUILD/qt-everywhere-opensource-src-4.7.4/mkspecs/solaris-cc -o $(MAKEFILE)
+-sub-helloconcurrent: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE)
+-sub-helloconcurrent-make_default: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE)
+-sub-helloconcurrent-make_first: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE) first
+-sub-helloconcurrent-all: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE) all
+-sub-helloconcurrent-clean: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE) clean
+-sub-helloconcurrent-distclean: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE) distclean
+-sub-helloconcurrent-install_subtargets: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE) install
+-sub-helloconcurrent-uninstall_subtargets: helloconcurrent/$(MAKEFILE) FORCE
+- cd helloconcurrent/ && $(MAKE) -f $(MAKEFILE) uninstall
+@@ -191,1 +168,1 @@
+-qmake_all: sub-hellothread-qmake_all sub-hellothreadpool-qmake_all sub-helloconcurrent-qmake_all sub-clock-qmake_all sub-movedobject-qmake_all FORCE
++qmake_all: sub-hellothread-qmake_all sub-hellothreadpool-qmake_all sub-clock-qmake_all sub-movedobject-qmake_all FORCE
+@@ -193,4 +170,4 @@
+-make_default: sub-hellothread-make_default sub-hellothreadpool-make_default sub-helloconcurrent-make_default sub-clock-make_default sub-movedobject-make_default FORCE
+-make_first: sub-hellothread-make_first sub-hellothreadpool-make_first sub-helloconcurrent-make_first sub-clock-make_first sub-movedobject-make_first FORCE
+-all: sub-hellothread-all sub-hellothreadpool-all sub-helloconcurrent-all sub-clock-all sub-movedobject-all FORCE
+-clean: sub-hellothread-clean sub-hellothreadpool-clean sub-helloconcurrent-clean sub-clock-clean sub-movedobject-clean FORCE
++make_default: sub-hellothread-make_default sub-hellothreadpool-make_default sub-clock-make_default sub-movedobject-make_default FORCE
++make_first: sub-hellothread-make_first sub-hellothreadpool-make_first sub-clock-make_first sub-movedobject-make_first FORCE
++all: sub-hellothread-all sub-hellothreadpool-all sub-clock-all sub-movedobject-all FORCE
++clean: sub-hellothread-clean sub-hellothreadpool-clean sub-clock-clean sub-movedobject-clean FORCE
+@@ -200,1 +177,1 @@
+-distclean: sub-hellothread-distclean sub-hellothreadpool-distclean sub-helloconcurrent-distclean sub-clock-distclean sub-movedobject-distclean FORCE
++distclean: sub-hellothread-distclean sub-hellothreadpool-distclean sub-clock-distclean sub-movedobject-distclean FORCE
+@@ -202,2 +179,2 @@
+-install_subtargets: sub-hellothread-install_subtargets sub-hellothreadpool-install_subtargets sub-helloconcurrent-install_subtargets sub-clock-install_subtargets sub-movedobject-install_subtargets FORCE
+-uninstall_subtargets: sub-hellothread-uninstall_subtargets sub-hellothreadpool-uninstall_subtargets sub-helloconcurrent-uninstall_subtargets sub-clock-uninstall_subtargets sub-movedobject-uninstall_subtargets FORCE
++install_subtargets: sub-hellothread-install_subtargets sub-hellothreadpool-install_subtargets sub-clock-install_subtargets sub-movedobject-install_subtargets FORCE
++uninstall_subtargets: sub-hellothread-uninstall_subtargets sub-hellothreadpool-uninstall_subtargets sub-clock-uninstall_subtargets sub-movedobject-uninstall_subtargets FORCE
+@@ -209,2 +186,0 @@
+-sub-helloconcurrent-check: helloconcurrent/$(MAKEFILE)
+- cd helloconcurrent/ && $(MAKE) check
+@@ -215,1 +190,1 @@
+-check: sub-hellothread-check sub-hellothreadpool-check sub-helloconcurrent-check sub-clock-check sub-movedobject-check
++check: sub-hellothread-check sub-hellothreadpool-check sub-clock-check sub-movedobject-check