I have made the following changes intended for : CE:MW:Shared / maliit-framework
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3780 Thank You, araujo [This message was auto-generated] --- Request # 3780: Messages from BOSS: WARNING check_package_built_at_source (maliit-framework) failed: Build status is 'disabled' for Mer_Core_armv6l/armv7el (against CE:MW:Shared/Mer_Core_armv6l/armv7el). State: review at 2011-12-24T02:07:43 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:araujo:branches:CE:MW:Shared / maliit-framework -> CE:MW:Shared / maliit-framework changes files: -------------- --- maliit-framework.changes +++ maliit-framework.changes @@ -0,0 +1,6 @@ +* Fri Dec 23 2011 Luis Araujo <[email protected]> - 0.81.2.1 +- Update to new release tag 0.81.2.1 +- Remove maliit-config-default-plugin.patch (added upstream) +- Remove maliit-VKB-opens-NemoBug14.patch (added upstream) +- Remove maliit-framework-rpmlintrc (it works fine now) + old: ---- maliit-VKB-opens-NemoBug14.patch maliit-config-default-plugin.patch maliit-framework-0.81.1.1.tar.bz2 maliit-framework-rpmlintrc new: ---- maliit-framework-0.81.2.1.tar.bz2 spec files: ----------- --- maliit-framework.spec +++ maliit-framework.spec @@ -7,19 +7,16 @@ Name: maliit-framework Summary: Core libraries of Maliit and server -Version: 0.81.1.1 +Version: 0.81.2.1 Release: 1 Group: System/Libraries License: LGPLv2.1 URL: http://gitorious.org/maliit/maliit-framework Source0: %{name}-%{version}.tar.bz2 Source1: boss.conf -Source2: %{name}-rpmlintrc -Source3: maliit-server.desktop -Source4: maliit-server.sh +Source2: maliit-server.desktop +Source3: maliit-server.sh Source100: maliit-framework.yaml -Patch0: maliit-config-default-plugin.patch -Patch1: maliit-VKB-opens-NemoBug14.patch Requires(pre): GConf2 Requires(preun): GConf2 Requires(post): GConf2 @@ -135,10 +132,6 @@ %prep %setup -q -n %{name}-%{version} -# maliit-config-default-plugin.patch -%patch0 -p1 -# maliit-VKB-opens-NemoBug14.patch -%patch1 -p1 # >> setup # << setup @@ -161,9 +154,9 @@ # << install pre %qmake_install mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart -cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/xdg/autostart +cp -a %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart mkdir -p %{buildroot}%{_sysconfdir}/profile.d -cp -a %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d +cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d # >> install post other changes: -------------- ++++++ maliit-framework-0.81.1.1.tar.bz2 -> maliit-framework-0.81.2.1.tar.bz2 --- NEWS +++ NEWS @@ -1,3 +1,21 @@ +0.81.2 +====== + +CHANGES SINCE 0.81.1 +* M_IM_DEFAULT[_HW]_PLUGIN configuration variables available to set default + plugins (and also plugin subview) at configure time. See qmake HELP=1 for + more. + +BUG FIXES +* Fixes: Add missing header to plainqt example application for Qt 4.8 +* Fixes: SDK creation fails if libmaliit is not installed +* Fixes: Docs/SDK installed to wrong location if destination directory exists +* Fixes: SDK example applications fails in legacy-mode +* Fixes: NEMO#14 - VKB opens even if HWKB is already open +* Fixes: Crash happening during initiated hide in Gtk+ app. +* Fixes: enforce-install-prefix for legacy mode +* Fixes: Copy/paste error in GTK+ 2 im cache update for Fedora + 0.81.1 ====== --- VERSION +++ VERSION @@ -0,0 +1 @@ +0.81.2.1 --- config.pri +++ config.pri @@ -1,4 +1,5 @@ -MALIIT_VERSION = 0.81.1.1 +MALIIT_VERSION = $$system(cat $$IN_PWD/VERSION) + MALIIT_INTERFACE_VERSION = 1.0 MALIIT_PLUGINS_INTERFACE_VERSION = 0.80 MALIIT_PLUGINS_QUICK_INTERFACE_VERSION = 0.80 @@ -66,12 +67,28 @@ MALIIT_EXTENSIONS_DIR = $$DATADIR/$$MALIIT_ATTRIBUTE_EXTENSIONS/ DEFINES += MALIIT_EXTENSIONS_DIR=\\\"$$MALIIT_EXTENSIONS_DIR\\\" +isEmpty(M_IM_DEFAULT_HW_PLUGIN) { +enable-legacy { + M_IM_DEFAULT_HW_PLUGIN = libmeego-keyboard.so +} else { + M_IM_DEFAULT_HW_PLUGIN = libmaliit-keyboard-plugin.so +} +} + +isEmpty(M_IM_DEFAULT_PLUGIN) { enable-legacy { M_IM_DEFAULT_PLUGIN = libmeego-keyboard.so +} else { + M_IM_DEFAULT_PLUGIN = libmaliit-keyboard-plugin.so +} +} + +isEmpty(M_IM_DEFAULT_SUBVIEW) { +enable-legacy { M_IM_DEFAULT_SUBVIEW = en_gb.xml } else { - M_IM_DEFAULT_PLUGIN = libmaliit-keyboard.so - M_IM_DEFAULT_SUBVIEW = + M_IM_DEFAULT_SUBVIEW = en_gb +} } MALIIT_TEST_DATADIR = $$DATADIR/$$MALIIT_TEST_SUITE @@ -134,6 +151,7 @@ M_IM_FACTORY_PLUGINS_DIR \ M_IM_VERSION \ M_IM_ENABLE_MULTITOUCH \ + M_IM_DEFAULT_HW_PLUGIN \ M_IM_DEFAULT_PLUGIN \ M_IM_DEFAULT_SUBVIEW \ M_IM_QUICK_FEATURE \ --- doc/doc.pro +++ doc/doc.pro @@ -10,10 +10,15 @@ DOXYGEN = . +HTML_BUILD_DIR = $${OUT_PWD}/html/ +# qmake creates wrong install rules for directories +# that do not exist at qmake time, so we hack it here +system(mkdir -p $$HTML_BUILD_DIR) + doc.name = doc doc.CONFIG += target_predeps no_link -doc.output = html -doc.clean_commands = rm -rf html +doc.output = $$HTML_BUILD_DIR/index.html +doc.clean_commands = rm -rf $$HTML_BUILD_DIR/* doc.clean = doxygen.log doxygen.log.xml doc.input = DOXYGEN @@ -21,14 +26,13 @@ doc.commands = @echo "Unable to detect doxygen in PATH" } else { # Build docs - doc.commands += mkdir -p $${OUT_PWD}/html ; - doc.commands += ( $${DOXYGEN_BIN} $${OUT_PWD}/mdoxy.cfg ); - doc.commands += cp $${IN_PWD}/src/images/* $${OUT_PWD}/html ; - doc.commands += cp $${IN_PWD}/src/*.html $${OUT_PWD}/html ; - doc.commands += ( $${IN_PWD}/xmlize.pl ); + doc.commands += $${DOXYGEN_BIN} $${OUT_PWD}/mdoxy.cfg; + doc.commands += cp $${IN_PWD}/src/images/* $$HTML_BUILD_DIR ; + doc.commands += cp $${IN_PWD}/src/*.html $$HTML_BUILD_DIR ; + doc.commands += $${IN_PWD}/xmlize.pl; # Install rules - htmldocs.files = $${OUT_PWD}/html/ + htmldocs.files = $$HTML_BUILD_DIR htmldocs.path = $$M_IM_INSTALL_DOCS/$$MALIIT_PACKAGENAME htmldocs.CONFIG += no_check_exist directory INSTALLS += htmldocs --- examples/apps/plainqt/plainqt.cpp +++ examples/apps/plainqt/plainqt.cpp @@ -17,6 +17,9 @@ #include "mainwindow.h" #include <QApplication> +#if defined(Q_WS_QPA) && (QT_VERSION < 0x050000) +#include <QInputContextFactory> +#endif #include <cstdlib> --- examples/apps/plainqt/plainqt.pro +++ examples/apps/plainqt/plainqt.pro @@ -8,7 +8,7 @@ BUILD_TYPE = unittest -contains(BUILD_TYPE, skeleton) { +contains(BUILD_TYPE, skeleton)|contains(BUILD_TYPE, skeleton-legacy) { CONFIG += link_pkgconfig PKGCONFIG += maliit-1.0 INCLUDEPATH += $$system(pkg-config --cflags maliit-1.0 | tr \' \' \'\\n\' | grep ^-I | cut -d I -f 2-) --- examples/apps/twofields/twofields.pro +++ examples/apps/twofields/twofields.pro @@ -8,7 +8,7 @@ BUILD_TYPE = unittest -contains(BUILD_TYPE, skeleton) { +contains(BUILD_TYPE, skeleton)|contains(BUILD_TYPE, skeleton-legacy) { CONFIG += link_pkgconfig PKGCONFIG += maliit-1.0 INCLUDEPATH += $$system(pkg-config --cflags maliit-1.0 | tr \' \' \'\\n\' | grep ^-I | cut -d I -f 2-) --- examples/apps/widgetproperties/widgetproperties.pro +++ examples/apps/widgetproperties/widgetproperties.pro @@ -8,7 +8,7 @@ BUILD_TYPE = unittest -contains(BUILD_TYPE, skeleton) { +contains(BUILD_TYPE, skeleton)|contains(BUILD_TYPE, skeleton-legacy) { CONFIG += link_pkgconfig PKGCONFIG += maliit-1.0 INCLUDEPATH += $$system(pkg-config --cflags maliit-1.0 | tr \' \' \'\\n\' | grep ^-I | cut -d I -f 2-) --- gtk-input-context/client-gtk/client-gtk.pro +++ gtk-input-context/client-gtk/client-gtk.pro @@ -25,6 +25,11 @@ PKGCONFIG += glib-2.0 gthread-2.0 dbus-glib-1 gio-2.0 GTK2_IM_LIBDIR = $$system(pkg-config --variable=libdir gtk+-2.0) +GTK2_PREFIX = $$system(pkg-config --variable prefix gtk+-2.0) +enforce-install-prefix { + GTK2_IM_LIBDIR = $$replace(GTK2_IM_LIBDIR, $$GTK2_PREFIX, $$M_IM_PREFIX) +} + GTK2_BINARY_VERSION = $$system(pkg-config --variable=gtk_binary_version gtk+-2.0) GTK2_DIR = $$GTK2_IM_LIBDIR/gtk-2.0/$$GTK2_BINARY_VERSION GTK2_IM_MODULEDIR = $$GTK2_DIR/immodules @@ -45,7 +50,7 @@ HOST = $$system(pkg-config --variable gtk_host gtk+-2.0) system(test -e /etc/fedora-release) { - update-im-cache.path = $$GTK3_DIR/ + update-im-cache.path = $$GTK2_DIR/ update-im-cache.extra = update-gtk-immodules $$HOST update-im-cache.uninstall = update-gtk-immodules $$HOST --- gtk-input-context/client-gtk/client-imcontext-gtk.c +++ gtk-input-context/client-gtk/client-imcontext-gtk.c @@ -433,7 +433,7 @@ gpointer user_data = NULL; GtkWidget* parent_widget = NULL; - gdk_window_get_user_data (focused_imcontext->client_window, user_data); + gdk_window_get_user_data (focused_imcontext->client_window, &user_data); parent_widget = GTK_WIDGET (user_data); --- gtk-input-context/client-gtk3/client-gtk3.pro +++ gtk-input-context/client-gtk3/client-gtk3.pro @@ -24,7 +24,13 @@ LIBS += ../src/libmaliit-gtk-im-common.a PKGCONFIG += glib-2.0 gthread-2.0 dbus-glib-1 gio-2.0 + GTK3_IM_LIBDIR = $$system(pkg-config --variable=libdir gtk+-3.0) +GTK3_PREFIX = $$system(pkg-config --variable prefix gtk+-3.0) +enforce-install-prefix { + GTK3_IM_LIBDIR = $$replace(GTK3_IM_LIBDIR, $$GTK3_PREFIX, $$M_IM_PREFIX) +} + GTK3_BINARY_VERSION = $$system(pkg-config --variable=gtk_binary_version gtk+-3.0) GTK3_DIR = $$GTK3_IM_LIBDIR/gtk-3.0/$$GTK3_BINARY_VERSION GTK3_IM_MODULEDIR = $$GTK3_DIR/immodules @@ -37,8 +43,8 @@ DISTRO = $$system(lsb_release -s -i) isEqual(DISTRO, Ubuntu) { update-im-cache.path = $$GTK3_DIR/ - update-im-cache.extra = gtk-query-immodules-3.0 > $$GTK3_DIR/immodules.cache - update-im-cache.uninstall = gtk-query-immodules-3.0 > $$GTK3_DIR/immodules.cache + update-im-cache.extra = gtk-query-immodules-3.0 --update-cache + update-im-cache.uninstall = gtk-query-immodules-3.0 --update-cache INSTALLS *= update-im-cache } @@ -47,11 +53,11 @@ update-im-cache.path = $$GTK3_DIR/ 64bit = $$find(GTK3_IM_LIBDIR, lib64) !isEmpty(64bit) { - update-im-cache.extra = gtk-query-immodules-3.0-64 > $$GTK3_DIR/immodules.cache - update-im-cache.uninstall = gtk-query-immodules-3.0-64 > $$GTK3_DIR/immodules.cache + update-im-cache.extra = gtk-query-immodules-3.0-64 --update-cache + update-im-cache.uninstall = gtk-query-immodules-3.0-64 --update-cache } else { - update-im-cache.extra = gtk-query-immodules-3.0-32 > $$GTK3_DIR/immodules.cache - update-im-cache.uninstall = gtk-query-immodules-3.0-32 > $$GTK3_DIR/immodules.cache + update-im-cache.extra = gtk-query-immodules-3.0-32 --update-cache + update-im-cache.uninstall = gtk-query-immodules-3.0-32 --update-cache } INSTALLS *= update-im-cache --- input-context/input-context.pro +++ input-context/input-context.pro @@ -49,7 +49,12 @@ QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda -target.path += $$[QT_INSTALL_PLUGINS]/inputmethods +QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods +QT_PREFIX = $$[QT_INSTALL_PREFIX] +enforce-install-prefix { + QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$M_IM_PREFIX) +} +target.path += $$QT_IM_PLUGIN_PATH INSTALLS += target \ QMAKE_EXTRA_TARGETS += check-xml --- maliit-framework.pro +++ maliit-framework.pro @@ -6,22 +6,28 @@ Important build options: \ \\n\\t M_IM_PREFIX : Install prefix (default: /usr) \ \\n\\t M_IM_INSTALL_{BIN,LIBS,HEADERS,SCHEMAS,DOCS} : Install prefix for specific types of files \ + \\n\\t M_IM_DEFAULT_PLUGIN : Default onscreen (virtual) keyboard plugin \ + \\n\\t M_IM_DEFAULT_HW_PLUGIN : Default hardware keyboard plugin \ + \\n\\t M_IM_DEFAULT_SUBVIEW : Default onscreen (software) subview name \ \\n\\t MALIIT_SERVER_ARGUMENTS : Arguments to use for starting maliit-server by D-Bus activation \ \\nRecognised CONFIG flags: \ \\n\\t enable-legacy : Build in legacy mode (for meego-im ABI/API compatability) \ - \\n\\t enable-meegotouch : Link input context to libmeegotouch for a MApplicationPage hack \ \\n\\t enable-contextkit : Build contextkit support (for monitoring hardware keyboard status) \ \\n\\t notests : Do not build tests \ \\n\\t nosdk : Do not build Maliit SDK \ \\n\\t nodoc : Do not build documentation (also disables SDK) \ \\n\\t only-libmaliit : Only build libmaliit \ \\n\\t external-libmaliit : Use external libmaliit (do not build libmaliit) \ - \\n\\t disable-gtk-cache-update : Do not update GTK2/3 input method caches \ + \\n\\t disable-gtk-cache-update : Do not update GTK2/3 input method caches (used for packaging) \ + \\n\\t enforce-install-prefix : Always use M_IM_PREFIX instead of prefix reported by GTK+, Qt, DBus etc. (used for testing) \ \\nInfluential environment variables: \ \\n\\t GCONF_CONFIG_SOURCE : Specify custom gconf source2 \ + \\n\\t GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL : Don't register gconf schemas (used for packaging) \ + \\n\\t PKG_CONFIG_PATH : Override standard directories to look for pkg-config information \ \\nExamples: \ \\n\\t qmake \ \\n\\t qmake M_IM_PREFIX=/usr M_IM_INSTALL_LIBS=/usr/lib64 CONFIG+=enable-legacy CONFIG+=notests \ + \\n\\t qmake M_IM_PREFIX=/usr M_IM_DEFAULT_PLUGIN=libmykeyboard.so M_IM_DEFAULT_SUBVIEW=en.xml !build_pass:system(echo -e \"$$help_string\") } else { @@ -86,6 +92,7 @@ # Creates a tarball QMAKE_EXTRA_TARGETS += dist dist.target = dist -dist.commands += git archive HEAD --prefix=$$DIST_NAME/ | bzip2 > $$TARBALL_PATH +dist.commands += git archive HEAD --prefix=$$DIST_NAME/ | bzip2 > $$TARBALL_PATH; +dist.commands += md5sum $$TARBALL_PATH | cut -d \' \' -f 1 > $$DIST_PATH\\.md5 OTHER_FILES += NEWS README --- maliit-plugins-quick/input-method/input-method.pro +++ maliit-plugins-quick/input-method/input-method.pro @@ -50,7 +50,13 @@ outputFiles(meegoimquick.prf) } -install_prf.path = $$[QT_INSTALL_DATA]/mkspecs/features +QT_PRF_DIR = $$[QT_INSTALL_DATA]/mkspecs/features +QT_PREFIX = $$[QT_INSTALL_PREFIX] +enforce-install-prefix { + QT_PRF_DIR = $$replace(QT_PRF_DIR, $$QT_PREFIX, $$M_IM_PREFIX) +} + +install_prf.path = $$QT_PRF_DIR install_prf.files = $$OUT_PWD/meegoimquick.prf install_pkgconfig.path = $${M_IM_INSTALL_LIBS}/pkgconfig --- maliit-plugins-quick/input-method/minputmethodquick.cpp +++ maliit-plugins-quick/input-method/minputmethodquick.cpp @@ -307,6 +307,7 @@ } if (state.contains(MInputMethod::OnScreen)) { + d->activeState = MInputMethod::OnScreen; if (d->sipRequested && !d->sipIsInhibited) { show(); // Force reparent of client widgets. } @@ -315,6 +316,7 @@ // Allow client to make use of InputMethodArea const QRegion r; d->handleInputMethodAreaUpdate(inputMethodHost(), r); + d->activeState = *state.begin(); } } --- passthroughserver/passthroughserver.pro +++ passthroughserver/passthroughserver.pro @@ -51,6 +51,11 @@ servicefilegenerator.CONFIG = target_predeps no_link QMAKE_EXTRA_COMPILERS += servicefilegenerator -servicefiles.path = $$system(pkg-config --variable session_bus_services_dir dbus-1) +DBUS_SERVICES_DIR = $$system(pkg-config --variable session_bus_services_dir dbus-1) +DBUS_SERVICES_PREFIX = $$system(pkg-config --variable prefix dbus-1) +enforce-install-prefix { + DBUS_SERVICES_DIR = $$replace(DBUS_SERVICES_DIR, $$DBUS_SERVICES_PREFIX, $$M_IM_PREFIX) +} +servicefiles.path = $$DBUS_SERVICES_DIR servicefiles.files = minputmethodserver.service servicefiles.CONFIG += no_check_exist --- sdk/maliit-sdk-create.sh +++ sdk/maliit-sdk-create.sh @@ -4,6 +4,18 @@ EXPECTED_ARGS=4 ERROR_BADARGS=65 +QMAKE_EXEC=qmake + +# Find proper qmake binary, cmake style ... +for binary in qmake qmake4 qmake-qt4 qmake-mac +do + which ${binary} + if [ $? -eq "0" ] + then + QMAKE_EXEC=${binary} + break + fi +done if [ $# -ne $EXPECTED_ARGS ] then @@ -44,10 +56,15 @@ cp -r $EXAMPLES_PATH $SDK_OUT_PATH/ cd $SDK_OUT_PATH/examples sed -i -e s/"^BUILD_TYPE.*=.*"/"BUILD_TYPE = $BUILD_TYPE"/ `grep -r --files-with-matches BUILD_TYPE ./ | tr "\n" " "` -# Clean examples -make clean &> /dev/null -find ./ -name Makefile -exec rm {} \; -find ./ -type d \( -name ".obj" -o -name ".moc" \) -print0 | xargs -0 /bin/rmdir +# Clean examples if built in-tree +if [ -f Makefile ] +then + ${QMAKE_EXEC} -r || exit 1 + make clean -j2 || exit 1 + find ./ -name Makefile -exec rm {} \; + find ./ -type d \( -name ".obj" -o -name ".moc" \) -print0 | xargs -0 /bin/rmdir +fi + rm README cd - --- sdk/sdk.pro +++ sdk/sdk.pro @@ -19,17 +19,26 @@ DUMMY = maliit-sdk +SDK_BUILD_DIR = $$OUT_PWD/build/maliit-sdk/ +# qmake creates wrong install rules for directories +# that do not exist at qmake time, so we hack it here +system(mkdir -p $$SDK_BUILD_DIR) + +# When creating the SDK, qmake will complain (and fail on newer Qt) +# if the referenced pkg-config IDs cannot be found +PKG_CONFIG_PATH = $$OUT_PWD/../maliit/:$$OUT_PWD/../src/:$$OUT_PWD/../common/:$$OUT_PWD/../maliit-plugins-quick/input-method + sdk.name = create_sdk sdk.CONFIG += target_predeps no_link -sdk.commands += $$IN_PWD/maliit-sdk-create.sh $$IN_PWD/.. $$OUT_PWD/build $$MALIIT_VERSION $$MODE -sdk.output = build -sdk.clean_commands = rm -rf build +sdk.commands += PKG_CONFIG_PATH=$$PKG_CONFIG_PATH $$IN_PWD/maliit-sdk-create.sh $$IN_PWD/.. $$OUT_PWD/build $$MALIIT_VERSION $$MODE +sdk.output = $$SDK_BUILD_DIR/examples +sdk.clean_commands = rm -rf $$SDK_BUILD_DIR/examples sdk.input = DUMMY QMAKE_EXTRA_COMPILERS += sdk # Install -sdk_install.files = $$OUT_PWD/build/maliit-sdk/ +sdk_install.files = $$SDK_BUILD_DIR sdk_install.path = $$M_IM_INSTALL_DOCS/$$MALIIT_PACKAGENAME sdk_install.CONFIG += no_check_exist directory sdk_install.depends += build --- src/maliit-framework.schemas.in +++ src/maliit-framework.schemas.in @@ -6,7 +6,7 @@ <applyto>/maliit/plugins/hardware</applyto> <owner>meegotouch</owner> <type>string</type> - <default>@M_IM_DEFAULT_PLUGIN@</default> + <default>@M_IM_DEFAULT_HW_PLUGIN@</default> <locale name="C"> <short>Plugin name for hardware keyboard</short> <long>Plugin name for hardware keyboard</long> --- src/meego-im-framework.schemas.in +++ src/meego-im-framework.schemas.in @@ -6,7 +6,7 @@ <applyto>/meegotouch/inputmethods/plugins/hardware</applyto> <owner>meegotouch</owner> <type>string</type> - <default>@M_IM_DEFAULT_PLUGIN@</default> + <default>@M_IM_DEFAULT_HW_PLUGIN@</default> <locale name="C"> <short>Plugin name for hardware keyboard</short> <long>Plugin name for hardware keyboard</long> --- src/src.pro +++ src/src.pro @@ -168,7 +168,13 @@ install_pkgconfig.path = $${M_IM_INSTALL_LIBS}/pkgconfig install_pkgconfig.files = $$OUT_PWD/MeegoImFramework.pc $$OUT_PWD/maliit-plugins-$${MALIIT_PLUGINS_INTERFACE_VERSION}.pc -install_prf.path = $$[QT_INSTALL_DATA]/mkspecs/features +QT_PRF_DIR = $$[QT_INSTALL_DATA]/mkspecs/features +QT_PREFIX = $$[QT_INSTALL_PREFIX] +enforce-install-prefix { + QT_PRF_DIR = $$replace(QT_PRF_DIR, $$QT_PREFIX, $$M_IM_PREFIX) +} + +install_prf.path = $$QT_PRF_DIR install_prf.files = $$OUT_PWD/meegoimframework.prf !enable-legacy { @@ -179,7 +185,13 @@ install_schemas.path = $$M_IM_INSTALL_SCHEMAS !enable-legacy { - install_services.path = $$system(pkg-config --variable session_bus_services_dir dbus-1) + DBUS_SERVICES_DIR = $$system(pkg-config --variable session_bus_services_dir dbus-1) + DBUS_SERVICES_PREFIX = $$system(pkg-config --variable prefix dbus-1) + enforce-install-prefix { + DBUS_SERVICES_DIR = $$replace(DBUS_SERVICES_DIR, $$DBUS_SERVICES_PREFIX, $$M_IM_PREFIX) + } + + install_services.path = $$DBUS_SERVICES_DIR install_services.files = org.maliit.server.service } --- tests/ut_maliit_inputmethod/ut_maliit_inputmethod.cpp +++ tests/ut_maliit_inputmethod/ut_maliit_inputmethod.cpp @@ -187,6 +187,10 @@ void Ut_Maliit_InputMethod::testRequestInputMethodPanel() { +#if QT_VERSION >= 0x050000 + QSKIP("Does not apply to Qt5", QTest::SkipSingle); +#endif + EventSpyInputContext<QEvent::Type> *spy = new EventSpyInputContext<QEvent::Type>(std::mem_fun(&QEvent::type)); qApp->setInputContext(spy); @@ -198,6 +202,10 @@ void Ut_Maliit_InputMethod::testCloseInputMethodPanel() { +#if QT_VERSION >= 0x050000 + QSKIP("Does not apply to Qt5", QTest::SkipSingle); +#endif + EventSpyInputContext<QEvent::Type> *spy = new EventSpyInputContext<QEvent::Type>(std::mem_fun(&QEvent::type)); qApp->setInputContext(spy); --- tests/ut_mimpluginmanager/ut_mimpluginmanager.cpp +++ tests/ut_mimpluginmanager/ut_mimpluginmanager.cpp @@ -936,6 +936,7 @@ void Ut_MIMPluginManager::handleMessages() { + QTest::qWait(100); while (app->hasPendingEvents()) { app->processEvents(); } ++++++ maliit-framework.yaml --- maliit-framework.yaml +++ maliit-framework.yaml @@ -1,6 +1,6 @@ Name: maliit-framework Summary: Core libraries of Maliit and server -Version: 0.81.1.1 +Version: 0.81.2.1 Release: 1 Group: System/Libraries License: LGPLv2.1 @@ -8,15 +8,11 @@ Sources: - "%{name}-%{version}.tar.bz2" - boss.conf - - "%{name}-rpmlintrc" ExtraSources: - maliit-server.desktop;%{_sysconfdir}/xdg/autostart - maliit-server.sh;%{_sysconfdir}/profile.d Description: | Core libraries of Maliit and server -Patches: - - maliit-config-default-plugin.patch - - maliit-VKB-opens-NemoBug14.patch PkgConfigBR: - QtCore >= 4.6.0 - dbus-glib-1 ++++++ deleted files: --- maliit-VKB-opens-NemoBug14.patch --- maliit-config-default-plugin.patch --- maliit-framework-rpmlintrc
