I have made the following changes intended for : CE:UX:MTF / meegotouch-controlpanel
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/7383 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7383: Messages from BOSS: State: review at 2012-11-14T16:06:22 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:UX / meegotouch-controlpanel -> CE:UX:MTF / meegotouch-controlpanel changes files: -------------- --- meegotouch-controlpanel.changes +++ meegotouch-controlpanel.changes @@ -0,0 +1,3 @@ +* Tue Nov 13 2012 John Brooks <[email protected]> - 0.14.7.1-2 +- Remove meegotouch-boostable usage (which is no longer supported) + new: ---- remove-meegotouch-boostable-support.patch spec files: ----------- --- meegotouch-controlpanel.spec +++ meegotouch-controlpanel.spec @@ -18,13 +18,15 @@ Source1: %{name}-rpmlintrc Source100: meegotouch-controlpanel.yaml Patch0: exchange_desktop.patch -Patch1: meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch -Patch2: 0001-Remove-empty-variables-from-categories.patch -Patch3: 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch -Patch4: 0001-Detect-device-orientation-and-set-proper-rotation-fo.patch +Patch1: remove-meegotouch-boostable-support.patch +Patch2: meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch +Patch3: 0001-Remove-empty-variables-from-categories.patch +Patch4: 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch +Patch5: 0001-Detect-device-orientation-and-set-proper-rotation-fo.patch Requires: meegotouch-controlpanel-l10n-engineering-english BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(meegotouch) +BuildRequires: pkgconfig(qt-boostable) BuildRequires: pkgconfig(clean-device) BuildRequires: desktop-file-utils Provides: nemo-control-panel @@ -98,14 +100,16 @@ # exchange_desktop.patch %patch0 -p1 -# meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch +# remove-meegotouch-boostable-support.patch %patch1 -p1 -# 0001-Remove-empty-variables-from-categories.patch +# meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch %patch2 -p1 -# 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch +# 0001-Remove-empty-variables-from-categories.patch %patch3 -p1 -# 0001-Detect-device-orientation-and-set-proper-rotation-fo.patch +# 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch %patch4 -p1 +# 0001-Detect-device-orientation-and-set-proper-rotation-fo.patch +%patch5 -p1 # >> setup # << setup other changes: -------------- ++++++ meegotouch-controlpanel.yaml --- meegotouch-controlpanel.yaml +++ meegotouch-controlpanel.yaml @@ -10,6 +10,7 @@ - "%{name}-rpmlintrc" Patches: - exchange_desktop.patch + - remove-meegotouch-boostable-support.patch - meegotouch-controlpanel-0.14.2.2-libcreds3-dependency-removal.patch - 0001-Remove-empty-variables-from-categories.patch - 0002-Add-HideIfEmpty-1-to-not-used-meego-variant-categori.patch @@ -19,6 +20,7 @@ PkgConfigBR: - QtGui - meegotouch + - qt-boostable - clean-device Requires: - meegotouch-controlpanel-l10n-engineering-english ++++++ remove-meegotouch-boostable-support.patch (new) --- remove-meegotouch-boostable-support.patch +++ remove-meegotouch-boostable-support.patch @@ -0,0 +1,93 @@ +diff -ruN --exclude='*~' old/controlpanel/src/launchers/launchers.pri new/controlpanel/src/launchers/launchers.pri +--- old/controlpanel/src/launchers/launchers.pri 2012-11-13 17:27:33.901972487 +0000 ++++ new/controlpanel/src/launchers/launchers.pri 2012-11-13 17:23:08.629972486 +0000 +@@ -27,15 +27,8 @@ + } + + # this controls whether dcp is launched with applauncherd or not: +-DISABLE_LAUNCHER { +- DEFINES += DISABLE_LAUNCHER +-} else { +- PREFIX += "/usr/bin/invoker --type=m " +- +- ! meego { +- # splash screen: +- PREFIX2 += "--splash=/usr/share/themes/blanco/meegotouch/images/splash/meegotouch-settings-splash.jpg " +- } ++!DISABLE_LAUNCHER { ++ PREFIX += "/usr/bin/invoker --type=q " + } + + # make the shell scripts: +diff -ruN --exclude='*~' old/controlpanel/src/main.cpp new/controlpanel/src/main.cpp +--- old/controlpanel/src/main.cpp 2012-11-13 17:18:11.241972487 +0000 ++++ new/controlpanel/src/main.cpp 2012-11-13 17:23:25.245972487 +0000 +@@ -35,7 +35,6 @@ + #include <cstdio> + #include <sys/wait.h> + #include <unistd.h> +-#include <MComponentCache> + #include <MApplication> + #include <MLocale> + #include "syslog.h" +@@ -45,11 +44,7 @@ + static inline MApplication* createApplication (int argc, char** argv, + MApplicationService* service) + { +-#ifndef DISABLE_LAUNCHER +- return MComponentCache::mApplication(argc, argv, appIdentifier, service); +-#else // USE_LAUNCHER + return new MApplication (argc, argv, appIdentifier, service); +-#endif // USE_LAUNCHER + } + + int +diff -ruN --exclude='*~' old/controlpanel/src/page/pagefactory.cpp new/controlpanel/src/page/pagefactory.cpp +--- old/controlpanel/src/page/pagefactory.cpp 2012-11-13 17:18:11.241972487 +0000 ++++ new/controlpanel/src/page/pagefactory.cpp 2012-11-13 17:22:49.569972486 +0000 +@@ -39,7 +39,6 @@ + #include "dcpperflogger.h" + + #include <MApplication> +-#include <MComponentCache> + #include <MApplicationWindow> + #include <MPannableViewport> + #include <MSceneManager> +@@ -965,11 +964,7 @@ + m_Win = 0; + } + +-#ifndef DISABLE_LAUNCHER +- m_Win = MComponentCache::mApplicationWindow(); +-#else // DISABLE_LAUNCHER + m_Win = new MApplicationWindow(); +-#endif + + // we do not do use this to avoid the crash when MDialog::exec() runs its + // event loop and the window gets closed. +diff -ruN --exclude='*~' old/controlpanel/src/src.pro new/controlpanel/src/src.pro +--- old/controlpanel/src/src.pro 2012-11-13 17:18:11.241972487 +0000 ++++ new/controlpanel/src/src.pro 2012-11-13 17:44:46.205972486 +0000 +@@ -30,11 +30,9 @@ + + CONFIG += build_all warn_on debug + +-DISABLE_LAUNCHER { +- CONFIG += meegotouch +-} else { +- CONFIG += meegotouch-boostable +-} ++CONFIG += meegotouch ++ ++!DISABLE_LAUNCHER:CONFIG += qt-boostable + + QT += network dbus + LIBS += -lduicontrolpanel +@@ -73,6 +71,7 @@ + DEFINES += QT_USE_FAST_OPERATOR_PLUS + + MT_VERSION = $$system(pkg-config --modversion meegotouch) ++ + message ("Version of libmeegotouch:" $$MT_VERSION) + greaterThan (MT_VERSION, 0.23.1) { + DEFINES += SHEET_ORIENTATION_FIX
