I have made the following changes intended for : CE:UX:MTF / meegotouchcp-language
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/3750 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3750: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-21T12:48:17 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:UX / meegotouchcp-language -> CE:UX:MTF / meegotouchcp-language changes files: -------------- --- meegotouchcp-language.changes +++ meegotouchcp-language.changes @@ -0,0 +1,4 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 0.11.3 +- Added meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch to + fix the linking with newer toolchain. + old: ---- Makefile new: ---- meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch spec files: ----------- --- meegotouchcp-language.spec +++ meegotouchcp-language.spec @@ -16,6 +16,7 @@ Source100: meegotouchcp-language.yaml Patch0: BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch Patch1: meegotouchcp-language-0.11.3-fix-profile-script.patch +Patch2: meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch Requires: meegotouchcp-language-l10n-engineering-english = %{version} BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(meegotouch) @@ -53,6 +54,8 @@ %patch0 -p1 # meegotouchcp-language-0.11.3-fix-profile-script.patch %patch1 -p1 +# meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch +%patch2 -p1 # >> setup # << setup other changes: -------------- ++++++ meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch (new) --- meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch +++ meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch @@ -0,0 +1,26 @@ +From b00ea926c10718f83a8baa71bc4e4f386c67685f Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 14:55:05 +0200 +Subject: [PATCH] Fix linking with newer toolchain. + +Signed-off-by: Marko Saukko <[email protected]> +--- + .../tests/ut_displaywidget/ut_displaywidget.pro | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/display/tests/ut_displaywidget/ut_displaywidget.pro b/display/tests/ut_displaywidget/ut_displaywidget.pro +index 33a761e..8a7b57e 100644 +--- a/display/tests/ut_displaywidget/ut_displaywidget.pro ++++ b/display/tests/ut_displaywidget/ut_displaywidget.pro +@@ -45,6 +45,8 @@ SOURCES += *.cpp \ + $$PKGROOT/tests/stubs/stub_qsortfilterproxymodel.cpp \ + $$TEST_SOURCES + ++LIBS += -lmeegotouchviews ++ + TARGET = ut_displaywidget + + include(../ut-tail.pri) +-- +1.7.6.4 + ++++++ meegotouchcp-language.yaml --- meegotouchcp-language.yaml +++ meegotouchcp-language.yaml @@ -7,6 +7,10 @@ URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanellanguageapplet Sources: - "%{name}-%{version}.tar.bz2" +Patches: + - BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch + - meegotouchcp-language-0.11.3-fix-profile-script.patch + - meegotouchcp-language-0.11.3-add-missing-libs-for-linking.patch Description: MeegoTouchControlPanel plugin to choose language PkgConfigBR: - QtGui @@ -14,9 +18,6 @@ - meegotouch-controlpanel Requires: - meegotouchcp-language-l10n-engineering-english = %{version} -Patches: - - BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch - - meegotouchcp-language-0.11.3-fix-profile-script.patch Configure: none Builder: qmake SetupOptions: "-q -n %{name}-%{version}" ++++++ deleted files: --- Makefile
