I have made the following changes intended for : CE:MW:Shared / 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/7251 Thank You, Robin Burchell [This message was auto-generated] --- Request # 7251: Messages from BOSS: State: review at 2012-11-01T22:46:27 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:w00t:branches:CE:MW:Shared / meegotouch-applauncherd -> CE:MW:Shared / meegotouch-applauncherd changes files: -------------- --- meegotouch-applauncherd.changes +++ meegotouch-applauncherd.changes @@ -0,0 +1,4 @@ +* Thu Nov 1 2012 Robin Burchell <[email protected]> - 3.0.3 +- Pull lmt in to meegotouch-boostable.prf, required now we're the sole provider. + Fixes control panel build. + new: ---- 0001-pull-in-meegotouch-as-well.patch spec files: ----------- --- meegotouch-applauncherd.spec +++ meegotouch-applauncherd.spec @@ -23,6 +23,7 @@ Patch3: 0001-Use-MeeGo-stuff-even-with-Mer.patch Patch4: 0001-Do-not-hardcode-python-version-to-cmd-s.patch Patch5: 0001-Fix-invoker-infinite-loop-after-receiving-signals.patch +Patch6: 0001-pull-in-meegotouch-as-well.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) @@ -96,6 +97,8 @@ %patch4 -p1 # 0001-Fix-invoker-infinite-loop-after-receiving-signals.patch %patch5 -p1 +# 0001-pull-in-meegotouch-as-well.patch +%patch6 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-pull-in-meegotouch-as-well.patch (new) --- 0001-pull-in-meegotouch-as-well.patch +++ 0001-pull-in-meegotouch-as-well.patch @@ -0,0 +1,26 @@ +From 323cbc9c1b88826061f058aa8b0f2ab9d151db6d Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Thu, 1 Nov 2012 22:19:23 +0000 +Subject: [PATCH] pull in meegotouch as well. + +libmeegotouch also used to provide this prf, and it added include paths +etc for libmeegotouch. Now that we are the only thing providing the prf, +we must make sure to pull in libmeegotouch properly, and not just +the boostable bits. +--- + data/mkspecs/features/meegotouch-boostable.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/mkspecs/features/meegotouch-boostable.prf b/data/mkspecs/features/meegotouch-boostable.prf +index 7487b09..dabc4d8 100644 +--- a/data/mkspecs/features/meegotouch-boostable.prf ++++ b/data/mkspecs/features/meegotouch-boostable.prf +@@ -2,4 +2,4 @@ + # flags to make an application usable with applauncherd. + + CONFIG += link_pkgconfig +-PKGCONFIG += meegotouch-boostable ++PKGCONFIG += meegotouch meegotouch-boostable +-- +1.7.10.3 + ++++++ meegotouch-applauncherd.yaml --- meegotouch-applauncherd.yaml +++ meegotouch-applauncherd.yaml @@ -14,6 +14,7 @@ - 0001-Use-MeeGo-stuff-even-with-Mer.patch - 0001-Do-not-hardcode-python-version-to-cmd-s.patch - 0001-Fix-invoker-infinite-loop-after-receiving-signals.patch + - 0001-pull-in-meegotouch-as-well.patch ExtraSources: - meegotouch-applauncherd.service;%{_libdir}/systemd/user/ Description: |
