I have made the following changes intended for : CE:UX:MTF / meegotouch-compositor
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/3749 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3749: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-21T12:40:27 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 / meegotouch-compositor -> CE:UX:MTF / meegotouch-compositor changes files: -------------- --- meegotouch-compositor.changes +++ meegotouch-compositor.changes @@ -0,0 +1,7 @@ +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 1.1.31-1 +- Added: meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch + to fix the linking with newer toolchain. + +* Thu Dec 15 2011 Marko Saukko <[email protected]> - 1.1.31-1 +- Updated to version 1.1.31-1 + old: ---- meegotouch-compositor-1.1.27-1.tar.gz new: ---- meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch meegotouch-meegotouch-compositor-1.1.31-1.tar.gz spec files: ----------- --- meegotouch-compositor.spec +++ meegotouch-compositor.spec @@ -7,12 +7,12 @@ Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager -Version: 1.1.27 +Version: 1.1.31 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-compositor -Source0: %{name}-%{version}-1.tar.gz +Source0: meegotouch-%{name}-%{version}-1.tar.gz Source1: mdecorator.desktop Source100: meegotouch-compositor.yaml Patch0: BMC_14207_double_xterm_thumbnail.patch @@ -25,6 +25,7 @@ Patch7: BMC_22845_move-var-run-to-home.patch Patch8: fix_animations_for_gestures_plugin.patch Patch9: fix_tfp_on_lenovo.patch +Patch10: meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtDBus) @@ -78,7 +79,7 @@ %prep -%setup -q -n %{name}-%{version}-1 +%setup -q -n meegotouch-%{name} # BMC_14207_double_xterm_thumbnail.patch %patch0 -p1 @@ -100,6 +101,8 @@ %patch8 -p1 # fix_tfp_on_lenovo.patch %patch9 -p1 +# meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch +%patch10 -p1 # >> setup # << setup other changes: -------------- ++++++ meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch (new) --- meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch +++ meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch @@ -0,0 +1,138 @@ +From 0ffc47839ff2bbc2622f5ab68a559906b762dbb8 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 21 Dec 2011 13:58:09 +0200 +Subject: [PATCH] Newer toolchain requires explicit libs for linking. + +Signed-off-by: Marko Saukko <[email protected]> +--- + decorators/mdecorator/mdecorator.pro | 2 +- + tests/unit/ut_anim/ut_anim.pro | 2 +- + tests/unit/ut_closeapp/ut_closeapp.pro | 2 +- + tests/unit/ut_compositing/ut_compositing.pro | 2 +- + tests/unit/ut_lockscreen/ut_lockscreen.pro | 2 +- + tests/unit/ut_netClientList/ut_netClientList.pro | 2 +- + tests/unit/ut_splashscreen/ut_splashscreen.pro | 2 +- + tests/unit/ut_stacking/ut_stacking.pro | 2 +- + tests/windowstack/windowstack.pro | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/decorators/mdecorator/mdecorator.pro b/decorators/mdecorator/mdecorator.pro +index ee86d78..7e9f919 100644 +--- a/decorators/mdecorator/mdecorator.pro ++++ b/decorators/mdecorator/mdecorator.pro +@@ -5,7 +5,7 @@ INCLUDEPATH += ../libdecorator + CONFIG += meegotouch release + QT += opengl dbus + +-LIBS += ../libdecorator/libdecorator.so ++LIBS += ../libdecorator/libdecorator.so -lX11 -lXfixes + + SOURCES += main.cpp mdecoratorwindow.cpp + HEADERS += mdecoratorwindow.h +diff --git a/tests/unit/ut_anim/ut_anim.pro b/tests/unit/ut_anim/ut_anim.pro +index ef1d8e2..2ff2558 100644 +--- a/tests/unit/ut_anim/ut_anim.pro ++++ b/tests/unit/ut_anim/ut_anim.pro +@@ -25,7 +25,7 @@ INCLUDEPATH += ../../../src + + DEFINES += TESTS + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + # Input + HEADERS += ut_anim.h +diff --git a/tests/unit/ut_closeapp/ut_closeapp.pro b/tests/unit/ut_closeapp/ut_closeapp.pro +index bdf82a2..9723815 100644 +--- a/tests/unit/ut_closeapp/ut_closeapp.pro ++++ b/tests/unit/ut_closeapp/ut_closeapp.pro +@@ -25,7 +25,7 @@ INCLUDEPATH += ../../../src + + DEFINES += TESTS + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + # Input + HEADERS += ut_closeapp.h +diff --git a/tests/unit/ut_compositing/ut_compositing.pro b/tests/unit/ut_compositing/ut_compositing.pro +index cd5a306..5bb3ff2 100644 +--- a/tests/unit/ut_compositing/ut_compositing.pro ++++ b/tests/unit/ut_compositing/ut_compositing.pro +@@ -21,7 +21,7 @@ contains(QT_CONFIG, opengles2) { + } + } + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + # Input + HEADERS += ut_compositing.h +diff --git a/tests/unit/ut_lockscreen/ut_lockscreen.pro b/tests/unit/ut_lockscreen/ut_lockscreen.pro +index 817de67..23cc4f6 100644 +--- a/tests/unit/ut_lockscreen/ut_lockscreen.pro ++++ b/tests/unit/ut_lockscreen/ut_lockscreen.pro +@@ -25,7 +25,7 @@ INCLUDEPATH += ../../../src + + DEFINES += TESTS + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + # Input + HEADERS += ut_lockscreen.h +diff --git a/tests/unit/ut_netClientList/ut_netClientList.pro b/tests/unit/ut_netClientList/ut_netClientList.pro +index 9639d10..a9cfa27 100644 +--- a/tests/unit/ut_netClientList/ut_netClientList.pro ++++ b/tests/unit/ut_netClientList/ut_netClientList.pro +@@ -21,7 +21,7 @@ contains(QT_CONFIG, opengles2) { + } + } + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + # Input + HEADERS += ut_netClientList.h +diff --git a/tests/unit/ut_splashscreen/ut_splashscreen.pro b/tests/unit/ut_splashscreen/ut_splashscreen.pro +index c13ec14..550f672 100644 +--- a/tests/unit/ut_splashscreen/ut_splashscreen.pro ++++ b/tests/unit/ut_splashscreen/ut_splashscreen.pro +@@ -25,7 +25,7 @@ INCLUDEPATH += ../../../src + + DEFINES += TESTS + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + CONFIG += link_pkgconfig + PKGCONFIG += contextsubscriber-1.0 +diff --git a/tests/unit/ut_stacking/ut_stacking.pro b/tests/unit/ut_stacking/ut_stacking.pro +index d5cff3a..d5164c6 100644 +--- a/tests/unit/ut_stacking/ut_stacking.pro ++++ b/tests/unit/ut_stacking/ut_stacking.pro +@@ -8,7 +8,7 @@ INCLUDEPATH += ../../../src + + DEFINES += TESTS + +-LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so ++LIBS += ../../../decorators/libdecorator/libdecorator.so ../../../src/libmcompositor.so -lX11 + + # Input + HEADERS += ut_stacking.h +diff --git a/tests/windowstack/windowstack.pro b/tests/windowstack/windowstack.pro +index 442e611..0d47154 100644 +--- a/tests/windowstack/windowstack.pro ++++ b/tests/windowstack/windowstack.pro +@@ -6,7 +6,7 @@ target.path=/usr/bin + DEPENDPATH += . + INCLUDEPATH += . + +-LIBS += -lXcomposite ++LIBS += -lXcomposite -lX11 + SOURCES += windowstack.cpp + + INSTALLS += target +-- +1.7.6.4 + ++++++ meegotouch-compositor.yaml --- meegotouch-compositor.yaml +++ meegotouch-compositor.yaml @@ -1,12 +1,12 @@ Name: meegotouch-compositor Summary: MeeGo UI Compositing Window Manager -Version: 1.1.27 +Version: 1.1.31 Release: 1 Group: System/Desktop License: LGPLv2.1 URL: http://meego.gitorious.org/meegotouch/meegotouch-compositor Sources: - - "%{name}-%{version}-1.tar.gz" + - "meegotouch-%{name}-%{version}-1.tar.gz" ExtraSources: - mdecorator.desktop;%{_sysconfdir}/xdg/autostart Patches: @@ -20,6 +20,7 @@ - BMC_22845_move-var-run-to-home.patch - fix_animations_for_gestures_plugin.patch - fix_tfp_on_lenovo.patch + - meegotouch-compositor-1.1.31-1-add-missing-libs-for-linking.patch Description: | This package contains the Direct UI compositing window manager. PkgConfigBR: ++++++ meegotouch-meegotouch-compositor-1.1.31-1.tar.gz (new) ++++++ new_test_definitions.patch --- new_test_definitions.patch +++ new_test_definitions.patch @@ -12,18 +12,6 @@ SuiteDescription="Sometime goes here" diff --git a/tests/gen-tests-xml.sh b/tests/gen-tests-xml.sh -index f6f2114..ba4a216 100755 ---- a/tests/gen-tests-xml.sh -+++ b/tests/gen-tests-xml.sh -@@ -2,7 +2,7 @@ - - DOMAIN="Application Framework" - FEATURE="MCompositor" --TYPE="Functional" -+TYPE="Functional positive" - LEVEL="Component" - - UT_TESTCASES="" index 651eb2e..20e387e 100644 --- a/tests/unit/unit.pro +++ b/tests/unit/unit.pro ++++++ deleted files: --- meegotouch-compositor-1.1.27-1.tar.gz
