I have made the following changes intended for : 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/4159 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4159: Messages from BOSS: State: review at 2012-01-20T13:22:06 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: Project:MTF:MW / meegotouch-applauncherd -> CE:MW:MTF / meegotouch-applauncherd changes files: -------------- --- meegotouch-applauncherd.changes +++ meegotouch-applauncherd.changes @@ -0,0 +1,3 @@ +* Fri Jan 20 2012 Marko Saukko <[email protected]> - 2.0.16 +- Added 0001-Use-MeeGo-stuff-even-with-Mer.patch to fix build with /etc/mer-release. + new: ---- 0001-Use-MeeGo-stuff-even-with-Mer.patch spec files: ----------- --- meegotouch-applauncherd.spec +++ meegotouch-applauncherd.spec @@ -17,6 +17,7 @@ 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 +Patch3: 0001-Use-MeeGo-stuff-even-with-Mer.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) @@ -86,6 +87,8 @@ %patch1 -p1 # meegotouch-applauncherd-2.0.14-add-missing-libs-for-linking.patch %patch2 -p1 +# 0001-Use-MeeGo-stuff-even-with-Mer.patch +%patch3 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-Use-MeeGo-stuff-even-with-Mer.patch (new) --- 0001-Use-MeeGo-stuff-even-with-Mer.patch +++ 0001-Use-MeeGo-stuff-even-with-Mer.patch @@ -0,0 +1,22 @@ +From 8bccb2f75cc1c7e233530901a6bc895c0899a5ea Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Fri, 20 Jan 2012 15:17:27 +0200 +Subject: [PATCH] Use MeeGo stuff even with Mer. + + +diff --git a/scripts/library-helper.py b/scripts/library-helper.py +index 597ee5e..1ce04f5 100755 +--- a/scripts/library-helper.py ++++ b/scripts/library-helper.py +@@ -196,7 +196,7 @@ libraries_nokia = [ + # Choose library list based on build environment + libraries = libraries_nokia + try: +- if "MeeGo" in file("/etc/meego-release").read(): ++ if "MeeGo" in file("/etc/meego-release").read() or "Mer" in file("/etc/mer-release").read(): + import libraries_meego + libraries=libraries_meego.libraries + except: pass +-- +1.7.6.5 + ++++++ meegotouch-applauncherd.yaml --- meegotouch-applauncherd.yaml +++ meegotouch-applauncherd.yaml @@ -11,6 +11,7 @@ - 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 + - 0001-Use-MeeGo-stuff-even-with-Mer.patch Description: | Application invoker and launcher daemon that speed up application startup time and share memory. Provides also
