diff -r 5aa32536e189 -r a7c3336b8dc2 qt/qt.spec --- a/qt/qt.spec Wed May 27 19:56:08 2009 +0200 +++ b/qt/qt.spec Sat Jul 04 20:51:55 2009 +0200 @@ -28,9 +28,6 @@ # FIXME: MSvB: The effects of these bugs are platform dependent. # FIXME: MSvB: Solaris 11 IA-32 builds fail while Linux 2.6.25.18 # FIXME: MSvB: AMD64 builds succeed. -# FIXME: MSvB: -# FIXME: MSvB: The webkit is flawed in Qt 4.4.3, and has been disabled -# FIXME: MSvB: in this build until a new release corrects the problem. # package information Name: qt @@ -42,8 +39,8 @@ Class: EVAL Group: Development License: GPL -Version: 4.4.3 -Release: 20090106 +Version: 4.5.2 +Release: 20090702 # build options %option with_tools yes @@ -142,7 +139,7 @@ -e "s;^\(LIBS += \)-lfreetype -lfontconfig;\1$fontconflibs;" \ config.tests/x11/fontconfig/fontconfig.pro %{l_shtool} subst \ - -e "s;\(LIBS += -lpq\);\1 -lssl -lcrypto $loclibs;" \ + -e "s;\(LIBS += -lpq\);\1 `%{l_prefix}/bin/pg_config --libs` $loclibs;" \ config.tests/unix/psql/psql.pro %{l_shtool} subst \ -e 's;^mac:\(LIBS\);\1;' \ @@ -228,6 +225,7 @@ # optional shared build (precedes mandatory static build) echo 'yes' | ./configure \ $archflags \ + -opensource \ -prefix %{l_prefix} \ -bindir %{l_prefix}/bin \ -libdir %{l_prefix}/lib/qt \ @@ -263,7 +261,6 @@ -openssl-linked \ -xmlpatterns \ -svg \ - -no-webkit \ -system-zlib \ -qt-gif \ -system-libpng \ @@ -294,8 +291,16 @@ sub-script sub-testlib sub-qt3support sub-dbus \ sub-opengl sub-xmlpatterns sub-svg sub-plugins ) || exit $? + + # arthur plugin requires libQtDesigner ( cd demos + ( cd ../tools/designer/src/lib + %{l_make} %{l_mflags -O} staticlib + ) || exit $? %{l_make} %{l_mflags -O} sub-arthurplugin + ( cd ../tools/designer/src/lib + %{l_make} %{l_mflags -O} distclean + ) || exit $? ) || exit $? # cache shared libs and initialize the build configuration, which @@ -311,6 +316,7 @@ # mandatory static build (follows optional shared build) echo 'yes' | ./configure \ $archflags \ + -opensource \ -prefix %{l_prefix} \ -bindir %{l_prefix}/bin \ -libdir %{l_prefix}/lib \ @@ -343,7 +349,6 @@ -openssl-linked \ -xmlpatterns \ -svg \ - -no-webkit \ -system-zlib \ -qt-gif \ -system-libpng \ @@ -434,10 +439,6 @@ echo "%{l_prefix}/lib/qt/dynamic/pkgconfig." ) >$RPM_BUILD_ROOT%{l_prefix}/lib/qt/README - # remove unbuilt component link files - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/libQtWebKit* - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/pkgconfig/QtWebKit* - # remove temporary dynamic link paths %{l_shtool} subst \ -e "s;-L\([\t ]*\)[^\t ][^\t ]*qt-x11-opensource-src-%{version}\(/[^\t ][^\t ]*\);-L\1%{l_prefix}\2;g" \