I have made the following changes intended for : CE:MW:MTF / libmeegotouch CE:MW:MTF / libcontentaction CE:MW:MTF / meegotouch-applauncherd
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/3747 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3747: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-21T09:14:55 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:MW / libmeegotouch -> CE:MW:MTF / libmeegotouch changes files: -------------- --- libmeegotouch.changes +++ libmeegotouch.changes @@ -0,0 +1,3 @@ +* Tue Dec 20 2011 Marko Saukko <[email protected]> - 0.24.7 +- Added libmeegotouch-0.24.7-link-with-librt.patch to fix linking with newer toolchain. + old: ---- Makefile boss.conf new: ---- libmeegotouch-0.24.7-link-with-missing-libs.patch spec files: ----------- --- libmeegotouch.spec +++ libmeegotouch.spec @@ -13,8 +13,9 @@ License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/libmeegotouch Source0: %{name}-%{version}.tar.bz2 -Source1: libmeegotouch.sh -Source2: mthemedaemon.desktop +Source1: BMC_22746_navigation_bar_style.patch +Source2: libmeegotouch.sh +Source3: mthemedaemon.desktop Source100: libmeegotouch.yaml Patch0: arm_egl_visibility.patch Patch1: BMC_8268_show_statusbar_on_n900.patch @@ -23,6 +24,7 @@ Patch4: revert-MPanRecognizerTouch-usage-on-arm.patch Patch5: fix_operators.patch Patch6: allow-cursor-control-env.patch +Patch7: libmeegotouch-0.24.7-link-with-missing-libs.patch Requires: meegotouch-theme >= 0.20.79 Requires: libmeegotouch-l10n-en Requires(post): /sbin/ldconfig @@ -196,6 +198,8 @@ %patch5 -p1 # allow-cursor-control-env.patch %patch6 -p1 +# libmeegotouch-0.24.7-link-with-missing-libs.patch +%patch7 -p1 # >> setup # << setup @@ -233,9 +237,9 @@ %qmake_install # << install pre mkdir -p %{buildroot}%{_sysconfdir}/profile.d -cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d +cp -a %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart -cp -a %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart +cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/xdg/autostart # >> install post other changes: -------------- ++++++ libmeegotouch-0.24.7-link-with-missing-libs.patch (new) --- libmeegotouch-0.24.7-link-with-missing-libs.patch +++ libmeegotouch-0.24.7-link-with-missing-libs.patch @@ -0,0 +1,315 @@ +From 75d38adc00ff79603891d7fbd6cac824bb0ee5ac Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Tue, 20 Dec 2011 17:14:18 +0200 +Subject: [PATCH] Added missing libs to linking. + +--- + .../pt_mcomponentdata2/pt_mcomponentdata2.pro | 2 ++ + benchmarks/pt_mlocale/pt_mlocale.pro | 2 ++ + demos/widgetsgallery/widgetsgallery.pro | 3 ++- + imgcachegen/imgcachegen.pro | 2 ++ + mthemedaemon/mthemedaemon.pro | 2 ++ + src/corelib/core/core.pri | 1 + + src/corelib/theme/theme.pri | 2 ++ + src/corelib/widgets/widgets.pri | 1 + + tests/ft_locales/ft_locales.pro | 2 ++ + tests/ut_mapplication/ut_mapplication.pro | 2 ++ + tests/ut_mcommonpixmaps/ut_mcommonpixmaps.pro | 2 ++ + tests/ut_mcomponentcache/ut_mcomponentcache.pro | 2 ++ + .../ut_mextensionhandleview.pro | 2 ++ + tests/ut_mextensionrunner/ut_mextensionrunner.pro | 2 ++ + tests/ut_mimagedirectory/ut_mimagedirectory.pro | 2 ++ + .../ut_mlocalthemedaemon/ut_mlocalthemedaemon.pro | 2 ++ + .../ut_mlocationdatabase/ut_mlocationdatabase.pro | 2 ++ + .../ut_morientationtracker.pro | 2 ++ + tests/ut_mscenemanager/ut_mscenemanager.pro | 2 ++ + tests/ut_msheet/ut_msheet.pro | 2 ++ + tests/ut_mstatusbarview/ut_mstatusbarview.pro | 2 ++ + tests/ut_mwindow/ut_mwindow.pro | 2 ++ + 22 files changed, 42 insertions(+), 1 deletions(-) + +diff --git a/benchmarks/pt_mcomponentdata2/pt_mcomponentdata2.pro b/benchmarks/pt_mcomponentdata2/pt_mcomponentdata2.pro +index b008b52..f761cea 100644 +--- a/benchmarks/pt_mcomponentdata2/pt_mcomponentdata2.pro ++++ b/benchmarks/pt_mcomponentdata2/pt_mcomponentdata2.pro +@@ -3,6 +3,8 @@ include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf) + + DEFINES+=M_VERSION + ++LIBS += -lXfixes ++ + QT += network + contains(DEFINES, HAVE_MEEGOGRAPHICSSYSTEM) { + QT += meegographicssystemhelper +diff --git a/benchmarks/pt_mlocale/pt_mlocale.pro b/benchmarks/pt_mlocale/pt_mlocale.pro +index ee165bf..0aa2e7f 100644 +--- a/benchmarks/pt_mlocale/pt_mlocale.pro ++++ b/benchmarks/pt_mlocale/pt_mlocale.pro +@@ -3,5 +3,7 @@ INCLUDEPATH += $$MSRCDIR/include $$MSRCDIR/corelib/theme + DEPENDPATH += $$INCLUDEPATH + TARGET = pt_mlocale + ++LIBS += -licuuc ++ + HEADERS += pt_mlocale.h + SOURCES += pt_mlocale.cpp +diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro +index 3b1743e..b4be477 100644 +--- a/demos/widgetsgallery/widgetsgallery.pro ++++ b/demos/widgetsgallery/widgetsgallery.pro +@@ -15,7 +15,8 @@ QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden + QMAKE_LFLAGS += -pie -rdynamic + + LIBS += $$mAddLibrary(meegotouchcore) \ +- $$mAddLibrary(meegotouchviews) ++ $$mAddLibrary(meegotouchviews) \ ++ -licuuc -ldbus-glib-1 -ldl + + !macx:LIBS += $$mAddLibrary(meegotouchsettings) \ + $$mAddLibrary(meegotouchextensions) +diff --git a/imgcachegen/imgcachegen.pro b/imgcachegen/imgcachegen.pro +index aab6a20..9377d0c 100644 +--- a/imgcachegen/imgcachegen.pro ++++ b/imgcachegen/imgcachegen.pro +@@ -4,6 +4,8 @@ INCLUDEPATH += ../src/include \ + ../src/corelib/theme \ + ../src/corelib/core + ++LIBS += -lX11 -lrt ++ + TEMPLATE = app + TARGET = imgcachegen + +diff --git a/mthemedaemon/mthemedaemon.pro b/mthemedaemon/mthemedaemon.pro +index 6f30de9..bf9852a 100644 +--- a/mthemedaemon/mthemedaemon.pro ++++ b/mthemedaemon/mthemedaemon.pro +@@ -13,6 +13,8 @@ DEPENDPATH += . + + QT += svg network + ++LIBS += -lrt ++ + contains(DEFINES, HAVE_MEEGOGRAPHICSSYSTEM) { + QT += meegographicssystemhelper + } +diff --git a/src/corelib/core/core.pri b/src/corelib/core/core.pri +index 325d2a8..8a81648 100644 +--- a/src/corelib/core/core.pri ++++ b/src/corelib/core/core.pri +@@ -5,6 +5,7 @@ + ############################################################################### + CORE_SRC_DIR=./core + INCLUDEPATH+=./core ++LIBS += -lrt -lX11 + + PUBLIC_HEADERS += \ + $$CORE_SRC_DIR/mapplication.h \ +diff --git a/src/corelib/theme/theme.pri b/src/corelib/theme/theme.pri +index a3598ab..2af5481 100644 +--- a/src/corelib/theme/theme.pri ++++ b/src/corelib/theme/theme.pri +@@ -4,6 +4,8 @@ + ############################################################################### + THEME_SRC_DIR=./theme + INCLUDEPATH+=./theme ++LIBS += -lX11 ++ + PUBLIC_HEADERS += \ + $$THEME_SRC_DIR/mtheme.h \ + $$THEME_SRC_DIR/mdefaultfonts.h \ +diff --git a/src/corelib/widgets/widgets.pri b/src/corelib/widgets/widgets.pri +index e8211c7..611285c 100644 +--- a/src/corelib/widgets/widgets.pri ++++ b/src/corelib/widgets/widgets.pri +@@ -5,6 +5,7 @@ + + WIDGETS_SRC_DIR=./widgets + INCLUDEPATH+=./widgets ++LIBS += -lX11 + + include(core/core.pri) + +diff --git a/tests/ft_locales/ft_locales.pro b/tests/ft_locales/ft_locales.pro +index 8f3b541..2dfb6e1 100644 +--- a/tests/ft_locales/ft_locales.pro ++++ b/tests/ft_locales/ft_locales.pro +@@ -4,6 +4,8 @@ CONFIG += link_pkgconfig + TARGET = ft_locales + PKGCONFIG += gconf-2.0 + ++LIBS += -licuuc ++ + # unit + TEST_SOURCES = \ + # $$MSRCDIR/mlocale.cpp \ +diff --git a/tests/ut_mapplication/ut_mapplication.pro b/tests/ut_mapplication/ut_mapplication.pro +index 67ca2ee..413fdce 100644 +--- a/tests/ut_mapplication/ut_mapplication.pro ++++ b/tests/ut_mapplication/ut_mapplication.pro +@@ -34,4 +34,6 @@ SOURCES += \ + SOURCES += \ + $$STUBSDIR/stubbase.cpp \ + ++LIBS += -lX11 -lXdamage ++ + include(../common_bot.pri) +diff --git a/tests/ut_mcommonpixmaps/ut_mcommonpixmaps.pro b/tests/ut_mcommonpixmaps/ut_mcommonpixmaps.pro +index 6b63d04..e773465 100644 +--- a/tests/ut_mcommonpixmaps/ut_mcommonpixmaps.pro ++++ b/tests/ut_mcommonpixmaps/ut_mcommonpixmaps.pro +@@ -6,6 +6,8 @@ contains(DEFINES, HAVE_MEEGOGRAPHICSSYSTEM) { + QT += meegographicssystemhelper + } + ++LIBS += -lX11 -lrt ++ + INCLUDEPATH += $$MSRCDIR/corelib/theme + INCLUDEPATH += $$MSRCDIR/corelib/core + +diff --git a/tests/ut_mcomponentcache/ut_mcomponentcache.pro b/tests/ut_mcomponentcache/ut_mcomponentcache.pro +index 2c5b117..efcee0d 100644 +--- a/tests/ut_mcomponentcache/ut_mcomponentcache.pro ++++ b/tests/ut_mcomponentcache/ut_mcomponentcache.pro +@@ -7,6 +7,8 @@ include(../common_top.pri) + TARGET = ut_mcomponentcache + DEPENDPATH += . + ++LIBS += -lX11 -lrt ++ + QT+=opengl + contains(DEFINES, HAVE_MEEGOGRAPHICSSYSTEM) { + QT += meegographicssystemhelper +diff --git a/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro b/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro +index 4b939d0..6a7b107 100644 +--- a/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro ++++ b/tests/ut_mextensionhandleview/ut_mextensionhandleview.pro +@@ -1,6 +1,8 @@ + include(../common_top.pri) + include(../common_mextensions.pri) + ++LIBS += -lX11 ++ + INCLUDEPATH += \ + $$MSRCDIR/corelib/widgets \ + $$MSRCDIR/corelib/widgets/core \ +diff --git a/tests/ut_mextensionrunner/ut_mextensionrunner.pro b/tests/ut_mextensionrunner/ut_mextensionrunner.pro +index 7f5facf..78dabf1 100644 +--- a/tests/ut_mextensionrunner/ut_mextensionrunner.pro ++++ b/tests/ut_mextensionrunner/ut_mextensionrunner.pro (116 more lines skipped) ++++++ libmeegotouch.yaml --- libmeegotouch.yaml +++ libmeegotouch.yaml @@ -7,6 +7,8 @@ URL: http://meego.gitorious.org/meegotouch/libmeegotouch Sources: - "%{name}-%{version}.tar.bz2" + # Should be in patches. + - BMC_22746_navigation_bar_style.patch Patches: - arm_egl_visibility.patch - BMC_8268_show_statusbar_on_n900.patch @@ -15,6 +17,7 @@ - revert-MPanRecognizerTouch-usage-on-arm.patch - fix_operators.patch - allow-cursor-control-env.patch + - libmeegotouch-0.24.7-link-with-missing-libs.patch Description: | Qt based MeeGo Touch Framework for developing touch based user interfaces. Requires: ++++++ deleted files: --- Makefile --- boss.conf submit: Project:MTF:MW / libcontentaction -> CE:MW:MTF / libcontentaction changes files: -------------- --- libcontentaction.changes +++ libcontentaction.changes @@ -0,0 +1,7 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 0.1.71 +- Added libcontentaction-0.1.71-add-missing-libs-for-linking.patch + to fix linking with newer toolchain. + +* Thu Dec 15 2011 Marko Saukko <[email protected]> - 0.1.71 +- Updated to version 0.1.71 + old: ---- 0002-Fix-doc-install-path.patch Makefile libcontentaction-0.1.70.tar.bz2 new: ---- libcontentaction-0.1.71-add-missing-libs-for-linking.patch maemo-af-libcontentaction-0.1.71.tar.gz spec files: ----------- --- libcontentaction.spec +++ libcontentaction.spec @@ -7,14 +7,16 @@ Name: libcontentaction Summary: Library for associating content with actions -Version: 0.1.70 +Version: 0.1.71 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://maemo.gitorious.org/maemo-af/libcontentaction -Source0: %{name}-%{version}.tar.bz2 +Source0: maemo-af-libcontentaction-%{version}.tar.gz +Source1: %{name}.rpmlintrc Source100: libcontentaction.yaml Patch0: 0001-Fix-python-version-for-tests.patch +Patch1: libcontentaction-0.1.71-add-missing-libs-for-linking.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(glib-2.0) >= 2.12.0 @@ -57,10 +59,12 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n maemo-af-%{name} # 0001-Fix-python-version-for-tests.patch %patch0 -p1 +# libcontentaction-0.1.71-add-missing-libs-for-linking.patch +%patch1 -p1 # >> setup # << setup other changes: -------------- ++++++ libcontentaction-0.1.71-add-missing-libs-for-linking.patch (new) --- libcontentaction-0.1.71-add-missing-libs-for-linking.patch +++ libcontentaction-0.1.71-add-missing-libs-for-linking.patch @@ -0,0 +1,27 @@ +From ebff7d2c07c483130004d9ffa6099a66d513ea4e Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 10:15:31 +0200 +Subject: [PATCH] Fix linking with newer toolchain by adding the missing libs. + +Signed-off-by: Marko Saukko <[email protected]> +--- + t/Makefile.am | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/t/Makefile.am b/t/Makefile.am +index 3beb7c2..52ff70c 100644 +--- a/t/Makefile.am ++++ b/t/Makefile.am +@@ -8,7 +8,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src + LIBS += \ + ../src/libcontentaction.la \ +- $(QtTest_LIBS) ++ $(QtTest_LIBS) \ ++ -lstdc++ + + .cpp.moc: + $(MOC) -o "$@" "$<" +-- +1.7.6.4 + ++++++ libcontentaction.yaml --- libcontentaction.yaml +++ libcontentaction.yaml @@ -1,14 +1,16 @@ Name: libcontentaction Summary: Library for associating content with actions -Version: 0.1.70 +Version: 0.1.71 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://maemo.gitorious.org/maemo-af/libcontentaction Sources: - - "%{name}-%{version}.tar.bz2" + - "maemo-af-libcontentaction-%{version}.tar.gz" + - "%{name}.rpmlintrc" Patches: - 0001-Fix-python-version-for-tests.patch + - libcontentaction-0.1.71-add-missing-libs-for-linking.patch Description: | libcontentaction is a library for associating content with actions. PkgConfigBR: ++++++ maemo-af-libcontentaction-0.1.71.tar.gz (new) ++++++ deleted files: --- 0002-Fix-doc-install-path.patch --- Makefile --- libcontentaction-0.1.70.tar.bz2 submit: Project:MTF:MW / meegotouch-applauncherd -> CE:MW:MTF / meegotouch-applauncherd changes files: -------------- --- meegotouch-applauncherd.changes +++ meegotouch-applauncherd.changes @@ -0,0 +1,7 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 2.0.14 +- Added meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch + to fix linking with newer toolchain. + +* Thu Dec 15 2011 Marko Saukko <[email protected]> - 2.0.14 +- Updated to version 2.0.14. + old: ---- meegotouch-applauncherd-2.0.13.tar.gz new: ---- meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch meegotouch-meegotouch-applauncherd-released_2.0.14.tar.gz spec files: ----------- --- meegotouch-applauncherd.spec +++ meegotouch-applauncherd.spec @@ -7,15 +7,16 @@ Name: meegotouch-applauncherd Summary: Application launcher for fast startup -Version: 2.0.13 +Version: 2.0.14 Release: 1 Group: System/Daemons License: LGPLv2+ URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd -Source0: %{name}-%{version}.tar.gz +Source0: meegotouch-%{name}-released_%{version}.tar.gz Source100: meegotouch-applauncherd.yaml Patch0: 0001-BMC22845-Move-var-run-to-home.patch Patch1: 0002-Remove-calls-to-non-standard-Qt-API.patch +Patch2: meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) @@ -77,12 +78,14 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n meegotouch-%{name} # 0001-BMC22845-Move-var-run-to-home.patch %patch0 -p1 # 0002-Remove-calls-to-non-standard-Qt-API.patch %patch1 -p1 +# meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch +%patch2 -p1 # >> setup # << setup other changes: -------------- ++++++ meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch (new) --- meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch +++ meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch @@ -0,0 +1,208 @@ +From 9675314101355b69e90d81790a85d6000e67e6a1 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 10:56:06 +0200 +Subject: [PATCH] Fix build with newer toolchains by adding the missing libs + to linking. + +Signed-off-by: Marko Saukko <[email protected]> +--- + .../testapps/fala_qml_helloworld/CMakeLists.txt | 2 +- + tests/common/testapps/xsendevent/CMakeLists.txt | 2 +- + tests/common/unittests/ut_appdata/CMakeLists.txt | 2 +- + tests/common/unittests/ut_booster/CMakeLists.txt | 2 +- + .../unittests/ut_boosterfactory/CMakeLists.txt | 2 +- + .../ut_boosterpluginregistry/CMakeLists.txt | 2 +- + .../common/unittests/ut_connection/CMakeLists.txt | 2 +- + tests/common/unittests/ut_daemon/CMakeLists.txt | 2 +- + tests/common/unittests/ut_dbooster/CMakeLists.txt | 2 +- + tests/common/unittests/ut_ebooster/CMakeLists.txt | 2 +- + tests/common/unittests/ut_logger/CMakeLists.txt | 2 +- + tests/common/unittests/ut_mbooster/CMakeLists.txt | 2 +- + tests/common/unittests/ut_qtbooster/CMakeLists.txt | 2 +- + .../unittests/ut_singleinstance/CMakeLists.txt | 2 +- + 14 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt b/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt +index 18d1afb..cddf2e9 100644 +--- a/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt ++++ b/tests/common/testapps/fala_qml_helloworld/CMakeLists.txt +@@ -28,7 +28,7 @@ QT4_ADD_RESOURCES(RESOURCE_SRC main.qrc) + # Enable Qt-support + include(${QT_USE_FILE}) + +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster ${booster_libs}") ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster ${booster_libs}") + add_executable(fala_qml ${SRC} ${RESOURCE_SRC}) + + # Install +diff --git a/tests/common/testapps/xsendevent/CMakeLists.txt b/tests/common/testapps/xsendevent/CMakeLists.txt +index a9e22ec..d5834dd 100644 +--- a/tests/common/testapps/xsendevent/CMakeLists.txt ++++ b/tests/common/testapps/xsendevent/CMakeLists.txt +@@ -1,6 +1,6 @@ + # Set sources + set(SRC main.cpp) +-link_libraries(${MEEGOTOUCH_LIBRARIES}) ++link_libraries(${MEEGOTOUCH_LIBRARIES} -lX11) + + add_executable(xsendevent ${SRC}) + +diff --git a/tests/common/unittests/ut_appdata/CMakeLists.txt b/tests/common/unittests/ut_appdata/CMakeLists.txt +index 9c83b31..a9805fd 100644 +--- a/tests/common/unittests/ut_appdata/CMakeLists.txt ++++ b/tests/common/unittests/ut_appdata/CMakeLists.txt +@@ -18,7 +18,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER} ${PROTOCOL}) + +-link_libraries(${QT_QTTEST_LIBRARY}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_booster/CMakeLists.txt b/tests/common/unittests/ut_booster/CMakeLists.txt +index e204927..176b565 100644 +--- a/tests/common/unittests/ut_booster/CMakeLists.txt ++++ b/tests/common/unittests/ut_booster/CMakeLists.txt +@@ -16,7 +16,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER}) + +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_boosterfactory/CMakeLists.txt b/tests/common/unittests/ut_boosterfactory/CMakeLists.txt +index a859098..5b63056 100644 +--- a/tests/common/unittests/ut_boosterfactory/CMakeLists.txt ++++ b/tests/common/unittests/ut_boosterfactory/CMakeLists.txt +@@ -18,7 +18,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER}) + +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt b/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt +index aaf0c8d..77606fc 100644 +--- a/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt ++++ b/tests/common/unittests/ut_boosterpluginregistry/CMakeLists.txt +@@ -21,7 +21,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER}) + +-link_libraries(${QT_QTTEST_LIBRARY}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_connection/CMakeLists.txt b/tests/common/unittests/ut_connection/CMakeLists.txt +index 20f9b9b..463dc98 100644 +--- a/tests/common/unittests/ut_connection/CMakeLists.txt ++++ b/tests/common/unittests/ut_connection/CMakeLists.txt +@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE) + + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER}) +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_daemon/CMakeLists.txt b/tests/common/unittests/ut_daemon/CMakeLists.txt +index d5838c6..e4382fd 100644 +--- a/tests/common/unittests/ut_daemon/CMakeLists.txt ++++ b/tests/common/unittests/ut_daemon/CMakeLists.txt +@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE) + + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER}) +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${X11_LIBRARIES} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_dbooster/CMakeLists.txt b/tests/common/unittests/ut_dbooster/CMakeLists.txt +index c6d8548..eb14bd5 100644 +--- a/tests/common/unittests/ut_dbooster/CMakeLists.txt ++++ b/tests/common/unittests/ut_dbooster/CMakeLists.txt +@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${DBOOSTER}) + +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster -lmdeclarativecache") ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} "-L${CMAKE_SOURCE_DIR}/src/qdeclarativebooster -lmdeclarativecache" -ldl -lX11) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_ebooster/CMakeLists.txt b/tests/common/unittests/ut_ebooster/CMakeLists.txt +index 75d335a..56db085 100644 +--- a/tests/common/unittests/ut_ebooster/CMakeLists.txt ++++ b/tests/common/unittests/ut_ebooster/CMakeLists.txt +@@ -20,7 +20,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${EBOOSTER}) + +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} ${X11_LIBRARIES} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_logger/CMakeLists.txt b/tests/common/unittests/ut_logger/CMakeLists.txt +index 3d27f22..e02cf5d 100644 +--- a/tests/common/unittests/ut_logger/CMakeLists.txt ++++ b/tests/common/unittests/ut_logger/CMakeLists.txt +@@ -17,7 +17,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER} ${COMMON}) + +-link_libraries(${QT_QTTEST_LIBRARY}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_mbooster/CMakeLists.txt b/tests/common/unittests/ut_mbooster/CMakeLists.txt +index 9592726..8e82bc9 100644 +--- a/tests/common/unittests/ut_mbooster/CMakeLists.txt ++++ b/tests/common/unittests/ut_mbooster/CMakeLists.txt +@@ -21,7 +21,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${MBOOSTER}) + +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${MEEGOTOUCH_LIBRARIES} ${LIBCREDS} -ldl -lX11) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_qtbooster/CMakeLists.txt b/tests/common/unittests/ut_qtbooster/CMakeLists.txt +index 56540b3..c17af5b 100644 +--- a/tests/common/unittests/ut_qtbooster/CMakeLists.txt ++++ b/tests/common/unittests/ut_qtbooster/CMakeLists.txt +@@ -17,7 +17,7 @@ set(QT_USE_QTTEST TRUE) + + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/src/common ${LAUNCHER} ${QTBOOSTER}) +-link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES}) ++link_libraries(${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBCREDS} ${X11_LIBRARIES} -ldl) + + # Enable Qt (may not be needed, because already defined on higher level) + include(${QT_USE_FILE}) +diff --git a/tests/common/unittests/ut_singleinstance/CMakeLists.txt b/tests/common/unittests/ut_singleinstance/CMakeLists.txt +index 484cc3f..d262612 100644 +--- a/tests/common/unittests/ut_singleinstance/CMakeLists.txt ++++ b/tests/common/unittests/ut_singleinstance/CMakeLists.txt +@@ -19,7 +19,7 @@ set(QT_USE_QTTEST TRUE) + # Set include paths + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${LAUNCHER}) (9 more lines skipped) ++++++ meegotouch-applauncherd.yaml --- meegotouch-applauncherd.yaml +++ meegotouch-applauncherd.yaml @@ -1,15 +1,16 @@ Name: meegotouch-applauncherd Summary: Application launcher for fast startup -Version: 2.0.13 +Version: 2.0.14 Release: 1 Group: System/Daemons License: LGPLv2+ URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd Sources: - - "%{name}-%{version}.tar.gz" + - "meegotouch-%{name}-released_%{version}.tar.gz" Patches: - 0001-BMC22845-Move-var-run-to-home.patch - 0002-Remove-calls-to-non-standard-Qt-API.patch + - meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch Description: | Application invoker and launcher daemon that speed up application startup time and share memory. Provides also ++++++ meegotouch-meegotouch-applauncherd-released_2.0.14.tar.gz (new) ++++++ deleted files: --- meegotouch-applauncherd-2.0.13.tar.gz
