With this QT upgrade, the problem occurs where no strings are able to be shown (looks like maybe an icu/libmeegotouch problem?)
http://bugs.meego.com/show_bug.cgi?id=10120 This doesn't not happen with QT 4.7.0... We need this problem investigated and fixed before we can upgrade to QT 4.7.1... rs On 11/23/10 6:29 AM, "Fathi Boudra" <[email protected]> wrote: Hi, I have made the following changes to qt in project Trunk:Testing. Please review and accept ASAP. Thank You, Fathi Boudra [This message was auto-generated] --- Request #9689: submit: devel:qt-mtf/qt(r99) -> Trunk:Testing/qt Message: * Wed Nov 10 2010 Fathi Boudra <[email protected]> - 4.7.1 - Update to Qt 4.7.1 - Enable GLES only build - Add Qt directories to qmake macros (%{_qt_*dir}) - Remove patches: 10_webkit_self_injection_into_qt_configuration.patch - cherry-picked upstream 13_connman_backend_for_bearer_management.patch - cherry-picked upstream - Add patches: add_lib_to_openssl_search_path.patch - on MeeGo, OpenSSL library is installed under /lib (BMC#7777) remove_useless_opengl_config.patch - Qt Declarative doesn't need opengl - Update libqtnetwork4 package: add libqconnmanbearer.so file - Add Qt MeeGo graphics system helper to Qt OpenGl package (it requires GLESv2 and EGL, only available on ARM) - Remove QT_RX71_MULTITOUCH=1 configure option to use X input devices (BMC#8025) - Replace -dbus configure option by -dbus-linked to link against dbus library instead of dlopen it - Remove patches: State: new 2010-11-23T06:27:25 boudra Comment: None changes files: -------------- --- qt.changes +++ qt.changes @@ -0,0 +1,18 @@ +* Wed Nov 10 2010 Fathi Boudra <[email protected]> - 4.7.1 +- Update to Qt 4.7.1 - Enable GLES only build +- Add Qt directories to qmake macros (%{_qt_*dir}) +- Remove patches: + 10_webkit_self_injection_into_qt_configuration.patch - cherry-picked upstream + 13_connman_backend_for_bearer_management.patch - cherry-picked upstream +- Add patches: + add_lib_to_openssl_search_path.patch - on MeeGo, OpenSSL library + is installed under /lib (BMC#7777) + remove_useless_opengl_config.patch - Qt Declarative doesn't need opengl +- Update libqtnetwork4 package: add libqconnmanbearer.so file +- Add Qt MeeGo graphics system helper to Qt OpenGl package (it requires GLESv2 + and EGL, only available on ARM) +- Remove QT_RX71_MULTITOUCH=1 configure option to use X input devices + (BMC#8025) +- Replace -dbus configure option by -dbus-linked to link against dbus library + instead of dlopen it + @@ -3 +21 @@ -- Remove patches. +- Remove patches: old: ---- 10_webkit_self_injection_into_qt_configuration.patch 13_connman_backend_for_bearer_management.patch.bz2 qt-everywhere-opensource-src-4.7.0.tar.gz new: ---- add_lib_to_openssl_search_path.patch qt-everywhere-opensource-src-4.7.1.tar.gz remove_useless_opengl_config.patch spec files: ----------- --- qt.spec +++ qt.spec @@ -1,15 +1,13 @@ -# spec file for package qt (Version 4.7.0) +# spec file for package qt -%define upstream_short_version 4.7.0 +# Disable debug packages during development +# Comment before submitting to *:Testing project +%define debug_package %{nil} + +%define upstream_short_version 4.7.1 #%define upstream_extra_version rc1 %define upstream_version %{upstream_short_version} -%ifarch %{arm} -%define opengl_arg es2 -%else -%define opengl_arg desktop -%endif - %ifarch armv5tel %define arch_arg arm %endif @@ -47,10 +45,10 @@ Patch6: 07_invpremul.patch Patch7: 08_qtdebug_syslog.patch Patch8: 09_texture_enable_fix.patch -Patch9: 10_webkit_self_injection_into_qt_configuration.patch -Patch10: 11_honor_all_FreeDesktop_icon_paths.patch -Patch11: 13_connman_backend_for_bearer_management.patch.bz2 -Patch12: 16_force_cxxflags_on_arm.patch +Patch9: 11_honor_all_FreeDesktop_icon_paths.patch +Patch10: 16_force_cxxflags_on_arm.patch +Patch11: add_lib_to_openssl_search_path.patch +Patch12: remove_useless_opengl_config.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: flex @@ -61,7 +59,9 @@ BuildRequires: pam-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) @@ -88,13 +88,6 @@ BuildRequires: readline-devel BuildRequires: sharutils BuildRequires: zlib-devel -%ifarch %{arm} -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(glesv2) -%else -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) -%endif %description Qt is a cross-platform application and UI framework. Using Qt, you can write @@ -156,6 +149,9 @@ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI programming issues. +The Qt MeeGo graphics system helper provides methods for accessing +MeeGo-specific graphics system features and functionalities. + %package -n libqtscript4 Summary: Qt script module Group: System/Libraries @@ -395,13 +391,8 @@ Provides: %{name}opengl-devel = %{version}-%{release} Requires: libqt-devel = %{version}-%{release} Requires: libqtopengl4 = %{version}-%{release} -%ifarch %{arm} Requires: libEGL-devel Requires: libGLESv2-devel -%else -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel -%endif %description -n libqtopengl-devel Qt is a cross-platform application and UI framework. Using Qt, you can write @@ -552,16 +543,16 @@ %patch7 -p1 # 09_texture_enable_fix.patch %patch8 -p1 -# 10_webkit_self_injection_into_qt_configuration.patch -%patch9 -p1 # 11_honor_all_FreeDesktop_icon_paths.patch -%patch10 -p1 -# 13_connman_backend_for_bearer_management.patch.bz2 -%patch11 -p1 +%patch9 -p1 %ifarch armv7l # 16_force_cxxflags_on_arm.patch -%patch12 -p1 +%patch10 -p1 %endif +# add_lib_to_openssl_search_path.patch +%patch11 -p1 +# remove_useless_opengl_config.patch +%patch12 -p1 %build export QTDIR=`pwd` @@ -572,7 +563,7 @@ export QT_PLUGIN_PATH=$QTDIR/plugins # Generate include -rm -rf include && QTDIR="." perl bin/syncqt +#rm -rf include && QTDIR="." perl bin/syncqt ./configure -confirm-license \ -prefix "%{_prefix}" \ @@ -615,27 +606,26 @@ -system-libjpeg \ -no-rpath \ -optimized-qmake \ - -dbus \ + -dbus-linked \ -no-separate-debug-info \ -verbose \ -gtkstyle \ -no-nas-sound \ - -opengl %{opengl_arg} \ + -opengl es2 \ -arch %{arch_arg} \ -no-openvg \ -lfontconfig \ -I/usr/include/freetype2 \ - -qvfb \ - -DQT_RX71_MULTITOUCH=1 + -qvfb # Build make %{?_smp_mflags} # Build documentations -make docs +#make %{?_smp_mflags} docs # Build translations -make ts +#make %{?_smp_mflags} ts # Workaround: It's a known qmake limitation. # It can't generate install rules for files that don't exist yet like docs. -./config.status +#./config.status %install make install INSTALL_ROOT=%{buildroot} @@ -645,7 +635,7 @@ # Fix wrong path in prl files find %{buildroot}%{_libdir} -type f -name '*.prl' \ -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \; -# Install desktop anf icon files +# Install desktop and icon files for filename in assistant designer linguist qtdemo; do install -D -p -m 0644 %{_sourcedir}/${filename}.desktop \ %{buildroot}%{_datadir}/applications/${filename}.desktop; @@ -656,7 +646,7 @@ install -D -p -m 0644 %{_sourcedir}/macros.qmake \ %{buildroot}%{_sysconfdir}/rpm/macros.qmake # QTBUG-12159 workaround -rm -f %{buildroot}%{_datadir}/qt4/mkspecs/modules/qt_webkit_version.pri +#rm -f %{buildroot}%{_datadir}/qt4/mkspecs/modules/qt_webkit_version.pri # Remove unpackaged files rm -f %{buildroot}%{_libdir}/libphonon.* rm -f %{buildroot}%{_libdir}/libQt*.la @@ -672,6 +662,12 @@ -o -name .pch \ -o -name .rcc \ \) -print0 | xargs -0 rm -rf +# Fix executable permissions +find %{buildroot} -type f -executable \( -false \ + -o -name \*.cpp \ + -o -name \*.h \ + -o -name \*.png \ +\) | xargs chmod -x # Fix duplicate files %fdupes %{buildroot}%{_libdir} %fdupes %{buildroot}%{_includedir} @@ -817,6 +813,7 @@ %files -n libqtnetwork4 %defattr(-,root,root,-) %{_libdir}/libQtNetwork.so.* +%{_libdir}/qt4/plugins/bearer/libqconnmanbearer.so %{_libdir}/qt4/plugins/bearer/libqgenericbearer.so %{_libdir}/qt4/plugins/bearer/libqnmbearer.so @@ -824,6 +821,8 @@ %defattr(-,root,root,-) %{_libdir}/libQtOpenGL.so.* %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem.so +%{_libdir}/libQtMeeGoGraphicsSystemHelper.so.* +%{_libdir}/qt4/plugins/graphicssystems/libqmeegographicssystem.so %files -n libqtscript4 %defattr(-,root,root,-) @@ -1618,6 +1617,16 @@ %{_libdir}/libQtOpenGL.prl %{_libdir}/libQtOpenGL.so %{_libdir}/pkgconfig/QtOpenGL.pc +%{_includedir}/qt4/Qt/QtMeeGoGraphicsSystemHelper +%{_includedir}/qt4/Qt/qmeegographicssystemhelper.h +%{_includedir}/qt4/Qt/qmeegoliveimage.h +%{_includedir}/qt4/Qt/qmeegolivepixmap.h +%{_includedir}/qt4/Qt/qmeegooverlaywidget.h +%{_includedir}/qt4/Qt/qmeegoruntime.h +%{_includedir}/qt4/QtMeeGoGraphicsSystemHelper/ +%{_libdir}/libQtMeeGoGraphicsSystemHelper.prl +%{_libdir}/libQtMeeGoGraphicsSystemHelper.so +%{_libdir}/pkgconfig/QtMeeGoGraphicsSystemHelper.pc %files designer %defattr(-,root,root,-) other changes: -------------- ++++++ 01_configure_quilt_compat.patch --- 01_configure_quilt_compat.patch +++ 01_configure_quilt_compat.patch @@ -3,7 +3,7 @@ --- a/configure +++ b/configure -@@ -8154,7 +8154,7 @@ fi +@@ -8402,7 +8402,7 @@ fi # .projects.3 -> the rest rm -f .projects .projects.1 .projects.2 .projects.3 ++++++ 06_install_qvfb.patch --- 06_install_qvfb.patch +++ 06_install_qvfb.patch @@ -3,7 +3,7 @@ --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -41,5 +41,7 @@ embedded: SUBDIRS += makeqpf +@@ -41,6 +41,8 @@ embedded: SUBDIRS += makeqpf !wince*:!cross_compile:SUBDIRS += qdoc3 @@ -11,3 +11,4 @@ + CONFIG+=ordered QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" + ++++++ 07_invpremul.patch --- 07_invpremul.patch +++ 07_invpremul.patch @@ -3,7 +3,7 @@ --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp -@@ -2481,6 +2481,22 @@ static bool convert_RGB_to_RGB16_inplace +@@ -2504,6 +2504,22 @@ static bool convert_RGB_to_RGB16_inplace } } @@ -26,7 +26,7 @@ static void convert_ARGB_PM_to_ARGB(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) { Q_ASSERT(src->format == QImage::Format_ARGB32_Premultiplied); -@@ -2496,7 +2512,7 @@ static void convert_ARGB_PM_to_ARGB(QIma +@@ -2519,7 +2535,7 @@ static void convert_ARGB_PM_to_ARGB(QIma for (int i = 0; i < src->height; ++i) { const QRgb *end = src_data + src->width; while (src_data < end) { ++++++ 08_qtdebug_syslog.patch --- 08_qtdebug_syslog.patch +++ 08_qtdebug_syslog.patch @@ -11,16 +11,16 @@ #endif #include <stdio.h> -@@ -87,6 +88,8 @@ - +@@ -88,6 +89,8 @@ _LIT(qt_S60Filter, "Series60v?.*.sis"); - _LIT(qt_S60SystemInstallDir, "z:\\system\\install\\"); + _LIT(qt_symbianFilter, "Symbianv*.sis"); + _LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\"); +#elif defined(Q_OS_UNIX) +#include <syslog.h> #endif QT_BEGIN_NAMESPACE -@@ -2224,6 +2227,27 @@ void qt_message_output(QtMsgType msgType +@@ -2247,6 +2250,27 @@ void qt_message_output(QtMsgType msgType #else fprintf(stderr, "%s\n", buf); fflush(stderr); ++++++ 09_texture_enable_fix.patch --- 09_texture_enable_fix.patch +++ 09_texture_enable_fix.patch @@ -5,7 +5,7 @@ --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h -@@ -603,14 +603,7 @@ inline GLenum qt_gl_preferredTextureForm +@@ -614,14 +614,7 @@ inline GLenum qt_gl_preferredTextureForm inline GLenum qt_gl_preferredTextureTarget() { ++++++ add_lib_to_openssl_search_path.patch (new) --- add_lib_to_openssl_search_path.patch +++ add_lib_to_openssl_search_path.patch +Description; Add /lib to OpenSSL search path. +on MeeGo, OpenSSL library is installed under /lib. +Author: Thiago Macieira <[email protected]> +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -333,7 +333,7 @@ static QStringList findAllLibSsl() + paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")) + .split(QLatin1Char(':'), QString::SkipEmptyParts); + # endif +- paths << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib"); ++ paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib"); + + QStringList foundSsls; + foreach (const QString &path, paths) { ++++++ macros.qmake --- macros.qmake +++ macros.qmake @@ -2,6 +2,19 @@ # QMake macros # +%_qt_prefix %{_prefix} +%_qt_bindir %{_prefix}/bin +%_qt_libdir %{_prefix}/%{_lib} +%_qt_docdir %{_prefix}/share/doc/qt4 +%_qt_headerdir %{_prefix}/include/qt4 +%_qt_datadir %{_prefix}/share/qt4 +%_qt_plugindir %{_prefix}/%{_lib}/qt4/plugins +%_qt_importdir %{_prefix}/%{_lib}/qt4/imports +%_qt_translationdir %{_prefix}/share/qt4/translations +%_qt_sysconfdir %{_sysconfdir}/xdg +%_qt_demosdir %{_prefix}/%{_lib}/qt4/demos +%_qt_examplesdir %{_prefix}/%{_lib}/qt4/examples + %qmake \ qmake -makefile -nocache \\\ "QMAKE_CFLAGS_RELEASE=${CFLAGS:-%optflags}" \\\ ++++++ qt-everywhere-opensource-src-4.7.0.tar.gz -> qt-everywhere-opensource-src-4.7.1.tar.gz 1753373 lines of diff (skipped) ++++++ qtdemo.desktop --- qtdemo.desktop +++ qtdemo.desktop @@ -1,4 +1,4 @@ -[Desktop Entry] +[Desktop Entry] Categories=Qt;Development; Exec=/usr/bin/qtdemo Name=Qt 4 examples and demos ++++++ remove_useless_opengl_config.patch (new) --- remove_useless_opengl_config.patch +++ remove_useless_opengl_config.patch +--- a/src/declarative/declarative.pro ++++ b/src/declarative/declarative.pro +@@ -2,7 +2,6 @@ TARGET = QtDeclarative + QPRO_PWD = $$PWD + QT = core gui script network + contains(QT_CONFIG, svg): QT += svg +-contains(QT_CONFIG, opengl): QT += opengl + DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 + solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 ++++++ deleted files: --- 10_webkit_self_injection_into_qt_configuration.patch --- 13_connman_backend_for_bearer_management.patch.bz2 _______________________________________________ MeeGo-commits mailing list [email protected] http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
