1.1 --- a/qt/qt.spec Wed May 27 19:56:08 2009 +0200
1.2 +++ b/qt/qt.spec Sat Jul 04 20:51:55 2009 +0200
1.3 @@ -28,9 +28,6 @@
1.4 # FIXME: MSvB: The effects of these bugs are platform dependent.
1.5 # FIXME: MSvB: Solaris 11 IA-32 builds fail while Linux 2.6.25.18
1.6 # FIXME: MSvB: AMD64 builds succeed.
1.7 -# FIXME: MSvB:
1.8 -# FIXME: MSvB: The webkit is flawed in Qt 4.4.3, and has been disabled
1.9 -# FIXME: MSvB: in this build until a new release corrects the problem.
1.10
1.11 # package information
1.12 Name: qt
1.13 @@ -42,8 +39,8 @@
1.14 Class: EVAL
1.15 Group: Development
1.16 License: GPL
1.17 -Version: 4.4.3
1.18 -Release: 20090106
1.19 +Version: 4.5.2
1.20 +Release: 20090702
1.21
1.22 # build options
1.23 %option with_tools yes
1.24 @@ -142,7 +139,7 @@
1.25 -e "s;^\(LIBS += \)-lfreetype -lfontconfig;\1$fontconflibs;" \
1.26 config.tests/x11/fontconfig/fontconfig.pro
1.27 %{l_shtool} subst \
1.28 - -e "s;\(LIBS += -lpq\);\1 -lssl -lcrypto $loclibs;" \
1.29 + -e "s;\(LIBS += -lpq\);\1 `%{l_prefix}/bin/pg_config --libs` $loclibs;" \
1.30 config.tests/unix/psql/psql.pro
1.31 %{l_shtool} subst \
1.32 -e 's;^mac:\(LIBS\);\1;' \
1.33 @@ -228,6 +225,7 @@
1.34 # optional shared build (precedes mandatory static build)
1.35 echo 'yes' | ./configure \
1.36 $archflags \
1.37 + -opensource \
1.38 -prefix %{l_prefix} \
1.39 -bindir %{l_prefix}/bin \
1.40 -libdir %{l_prefix}/lib/qt \
1.41 @@ -263,7 +261,6 @@
1.42 -openssl-linked \
1.43 -xmlpatterns \
1.44 -svg \
1.45 - -no-webkit \
1.46 -system-zlib \
1.47 -qt-gif \
1.48 -system-libpng \
1.49 @@ -294,8 +291,16 @@
1.50 sub-script sub-testlib sub-qt3support sub-dbus \
1.51 sub-opengl sub-xmlpatterns sub-svg sub-plugins
1.52 ) || exit $?
1.53 +
1.54 + # arthur plugin requires libQtDesigner
1.55 ( cd demos
1.56 + ( cd ../tools/designer/src/lib
1.57 + %{l_make} %{l_mflags -O} staticlib
1.58 + ) || exit $?
1.59 %{l_make} %{l_mflags -O} sub-arthurplugin
1.60 + ( cd ../tools/designer/src/lib
1.61 + %{l_make} %{l_mflags -O} distclean
1.62 + ) || exit $?
1.63 ) || exit $?
1.64
1.65 # cache shared libs and initialize the build configuration, which
1.66 @@ -311,6 +316,7 @@
1.67 # mandatory static build (follows optional shared build)
1.68 echo 'yes' | ./configure \
1.69 $archflags \
1.70 + -opensource \
1.71 -prefix %{l_prefix} \
1.72 -bindir %{l_prefix}/bin \
1.73 -libdir %{l_prefix}/lib \
1.74 @@ -343,7 +349,6 @@
1.75 -openssl-linked \
1.76 -xmlpatterns \
1.77 -svg \
1.78 - -no-webkit \
1.79 -system-zlib \
1.80 -qt-gif \
1.81 -system-libpng \
1.82 @@ -434,10 +439,6 @@
1.83 echo "%{l_prefix}/lib/qt/dynamic/pkgconfig."
1.84 ) >$RPM_BUILD_ROOT%{l_prefix}/lib/qt/README
1.85
1.86 - # remove unbuilt component link files
1.87 - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/libQtWebKit*
1.88 - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/pkgconfig/QtWebKit*
1.89 -
1.90 # remove temporary dynamic link paths
1.91 %{l_shtool} subst \
1.92 -e "s;-L\([\t ]*\)[^\t ][^\t ]*qt-x11-opensource-src-%{version}\(/[^\t ][^\t ]*\);-L\1%{l_prefix}\2;g" \
