[meego-commits] 5585: Changes to Trunk:Testing/meegotouch-systemui
Kaitlin Rupert
kaitlin.rupert at intel.com
Mon Jul 12 18:32:23 UTC 2010
Hi,
I have made the following changes to meegotouch-systemui in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Kaitlin Rupert
[This message was auto-generated]
---
Request #5585:
submit: devel:nokia:trunk/meegotouch-systemui(r21) -> Trunk:Testing/meegotouch-systemui
Message:
Update to release tag 0.16.6. This update is dependent on the libmeegotouch u
pdate.
State: new 2010-07-12T06:27:23 krupert
Comment: None
changes files:
--------------
--- meegotouch-systemui.changes
+++ meegotouch-systemui.changes
@@ -0,0 +1,4 @@
+* Fri Jul 09 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.16.6
+- Update to release tag 0.16.6-1
+- This release fixes BMC #3289, BMC #3375
+
old:
----
meegotouch-systemui-0.1.1.tar.bz2
new:
----
fix_build_issues.patch
meegotouch-systemui-0.16.6.tar.bz2
spec files:
-----------
--- meegotouch-systemui.spec
+++ meegotouch-systemui.spec
@@ -1,13 +1,13 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.18
#
# >> macros
# << macros
Name: meegotouch-systemui
Summary: System UI daemon
-Version: 0.1.1
+Version: 0.16.6
Release: 1
Group: System/Desktop
License: LGPL v2.1
@@ -18,7 +18,7 @@
Source100: meegotouch-systemui.yaml
Patch0: 0001-Initial-buildable-version-against-MeeGo.patch
Patch1: systemui-fix-profile-compile.patch
-Patch2: disable_unlockConfirmed_call.patch
+Patch2: fix_build_issues.patch
BuildRequires: pkgconfig(QtCore) >= 4.6.0
BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(messageserver)
@@ -59,7 +59,7 @@
%patch0 -p1
# systemui-fix-profile-compile.patch
%patch1 -p1
-# disable_unlockConfirmed_call.patch
+# fix_build_issues.patch
%patch2 -p1
# >> setup
# << setup
@@ -113,19 +113,14 @@
%defattr(-,root,root,-)
# >> files
%config /etc/dbus-1/system.d/systemui.conf
-%config /etc/sudoers.d/usb.sudoers
%config /etc/xdg/autostart/meegotouch-systemui.desktop
-%{_bindir}/pcsuite-enable.sh
%{_bindir}/sysuid
-%{_libdir}/meegotouch/applicationextensions/libstatusindicatormenu-profile.so
%{_libdir}/qt4/mkspecs/features/system-ui.prf
%{_datadir}/applications/lock.desktop
%{_datadir}/l10n/meegotouch/systemui.qm
-%{_datadir}/meegotouch/applicationextensions/statusindicatormenu-profile.desktop
-%{_datadir}/meegotouch/notifications/eventtypes/*
-%{_datadir}/themes/base/meegotouch/sysuid/images/*
-%{_datadir}/themes/base/meegotouch/sysuid/style/*
-%{_datadir}/themes/base/meegotouch/sysuid/svg/*
+%{_datadir}/meegotouch/notifications/eventtypes
+%{_datadir}/themes/base/meegotouch/sysuid/style
+%{_datadir}/themes/base/meegotouch/sysuid/svg
%{_datadir}/themes/base/meegotouch/sysuid/sysuid.conf
# << files
other changes:
--------------
++++++ 0001-Initial-buildable-version-against-MeeGo.patch
--- 0001-Initial-buildable-version-against-MeeGo.patch
+++ 0001-Initial-buildable-version-against-MeeGo.patch
@@ -8,27 +8,15 @@
demos/plugins/profile/profileplugin.cpp | 2 +-
demos/plugins/profile/profileplugin.h | 2 +-
project.pro | 5 +-
- src/notifications/ngfadapter.cpp | 12 +++
src/notifications/ngfadapter.h | 6 +-
- src/notifications/notificationmanager.cpp | 12 +++-
- src/notifications/notificationmanager.h | 4 +
src/shutdownbusinesslogic.cpp | 14 +++-
- src/shutdownbusinesslogic.h | 7 ++
src/shutdownui.cpp | 9 ++-
- src/src.pro | 107 +++++++++++++----------------
src/statusarea/clock.cpp | 8 ++-
- src/statusarea/clock.h | 6 ++
- src/statusarea/statusarearenderer.cpp | 8 ++
- src/statusarea/statusarearenderer.h | 7 ++
- src/sysuid.cpp | 10 +++
- src/usbui.h | 3 +
- 17 files changed, 150 insertions(+), 72 deletions(-)
-diff --git a/demos/plugins/profile/profileplugin.cpp b/demos/plugins/profile/profileplugin.cpp
-index d4ab7f4..f40abeb 100644
---- a/demos/plugins/profile/profileplugin.cpp
-+++ b/demos/plugins/profile/profileplugin.cpp
-@@ -45,7 +45,7 @@ bool ProfilePlugin::initialize(const QString &)
+diff -Naur meegotouch-systemui-0.16.6/demos/plugins/profile/profileplugin.cpp meegotouch-systemui-0.16.6-new/demos/plugins/profile/profileplugin.cpp
+--- meegotouch-systemui-0.16.6/demos/plugins/profile/profileplugin.cpp 2010-07-06 13:38:35.715989860 -0700
++++ meegotouch-systemui-0.16.6-new/demos/plugins/profile/profileplugin.cpp 2010-07-06 15:27:03.387678404 -0700
+@@ -45,7 +45,7 @@
return true;
}
@@ -37,11 +25,10 @@
{
return profile;
}
-diff --git a/demos/plugins/profile/profileplugin.h b/demos/plugins/profile/profileplugin.h
-index 703c0fd..ae4caa5 100644
---- a/demos/plugins/profile/profileplugin.h
-+++ b/demos/plugins/profile/profileplugin.h
-@@ -42,7 +42,7 @@ public:
+diff -Naur meegotouch-systemui-0.16.6/demos/plugins/profile/profileplugin.h meegotouch-systemui-0.16.6-new/demos/plugins/profile/profileplugin.h
+--- meegotouch-systemui-0.16.6/demos/plugins/profile/profileplugin.h 2010-07-06 13:38:35.715989860 -0700
++++ meegotouch-systemui-0.16.6-new/demos/plugins/profile/profileplugin.h 2010-07-06 15:27:03.387678404 -0700
+@@ -42,7 +42,7 @@
// Methods derived from MApplicationExtensionInterface
virtual bool initialize(const QString &interface);
@@ -50,81 +37,28 @@
private:
MStatusIndicatorMenuInterface *statusIndicatorMenu;
-diff --git a/project.pro b/project.pro
-index 07686db..c6fb6ce 100644
---- a/project.pro
-+++ b/project.pro
-@@ -2,8 +2,9 @@ TEMPLATE = subdirs
+diff -Naur meegotouch-systemui-0.16.6/project.pro meegotouch-systemui-0.16.6-new/project.pro
+--- meegotouch-systemui-0.16.6/project.pro 2010-07-06 13:38:35.716989736 -0700
++++ meegotouch-systemui-0.16.6-new/project.pro 2010-07-06 15:27:26.705688519 -0700
+@@ -4,9 +4,9 @@
+
SUBDIRS = src \
- translations \
- themes \
-- demos \
+ translations \
+- themes \
+- demos \
- tests
-+ demos
-+
-+# tests
-
- QMAKE_CLEAN += configure-stamp build-stamp
-
-diff --git a/src/notifications/ngfadapter.cpp b/src/notifications/ngfadapter.cpp
-index bf0df22..54639a3 100644
---- a/src/notifications/ngfadapter.cpp
-+++ b/src/notifications/ngfadapter.cpp
-@@ -24,24 +24,36 @@ NGFAdapter::NGFAdapter()
- connection = dbus_bus_get(DBUS_BUS_SESSION, NULL);
- dbus_connection_setup_with_g_main(connection, NULL);
-
-+#ifdef NGF
- client = ngf_client_create(NGF_TRANSPORT_DBUS, connection);
-+#endif
- }
-
- NGFAdapter::~NGFAdapter()
- {
-+#ifdef NGF
- ngf_client_destroy(client);
-+#endif
- dbus_connection_unref(connection);
- }
-
- void NGFAdapter::play(const QString &id)
- {
-+#ifdef NGF
- if (isValid() && !id.isEmpty()) {
- NgfProplist *p = NULL;
- ngf_client_play_event (client, id.toUtf8().constData(), p);
- }
-+#else
-+ Q_UNUSED(id);
-+#endif
- }
-
- bool NGFAdapter::isValid()
- {
-+#ifdef NGF
- return client != NULL;
-+#else
-+ return false;
-+#endif
- }
-diff --git a/src/notifications/ngfadapter.h b/src/notifications/ngfadapter.h
-index ae8dcb8..bd3121f 100644
---- a/src/notifications/ngfadapter.h
-+++ b/src/notifications/ngfadapter.h
-@@ -25,8 +25,9 @@
- #include <glib.h>
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib-lowlevel.h>
-+#ifdef NGF
- #include <libngf/client.h>
--
-+#endif
-
- /*!
- * A class that provides a simple QT'ified API to the plain C API provided
-@@ -76,8 +77,9 @@ public:
++ themes
++# demos
++# tests
+
+ QMAKE_CLEAN += configure-stamp build-stamp localconfig.pri
+
+diff -Naur meegotouch-systemui-0.16.6/src/notifications/ngfadapter.h meegotouch-systemui-0.16.6-new/src/notifications/ngfadapter.h
+--- meegotouch-systemui-0.16.6/src/notifications/ngfadapter.h 2010-07-06 13:38:35.718989713 -0700
++++ meegotouch-systemui-0.16.6-new/src/notifications/ngfadapter.h 2010-07-06 15:27:03.389757594 -0700
+@@ -87,8 +87,9 @@
private:
-
+ #ifdef HAVE_LIBNGF
//! The low-level ngf client
+#ifdef NGF
NgfClient* client;
@@ -132,603 +66,23 @@
+#endif
//! The DBUS low-level connection
DBusConnection* connection;
-
-diff --git a/src/notifications/notificationmanager.cpp b/src/notifications/notificationmanager.cpp
-index ccf152b..39a0630 100644
---- a/src/notifications/notificationmanager.cpp
-+++ b/src/notifications/notificationmanager.cpp
-@@ -48,8 +48,11 @@ NotificationManager::NotificationManager(int relayInterval, uint maxWaitQueueSiz
- relayInterval(relayInterval),
- context(new ContextFrameworkContext()),
- lastUsedNotificationUserId(0),
-- persistentDataRestored(false),
-+ persistentDataRestored(false)
-+#ifdef MAEMO
-+ ,
- persistentStorage(new maemosec::storage("com.meego.core.MNotificationManager", maemosec::storage::vis_private, maemosec::storage::prot_encrypted))
-+#endif
- {
- dBusSource = new DBusInterfaceNotificationSource(*this);
-
-@@ -98,18 +101,20 @@ void NotificationManager::saveStateData()
- foreach(const NotificationGroup & group, groups) {
- stream << group;
- }
--
-+#ifdef MAEMO
- persistentStorage->put_file(STATE_DATA_FILE_NAME.toAscii(),
- (unsigned char *)buffer.data().data(),
- buffer.data().length());
-
- persistentStorage->commit();
-+#endif
- }
- }
-
-
- void NotificationManager::savePersistentNotifications()
- {
-+#ifdef MAEMO
- if (ensurePersistentDataPath()) {
- QBuffer buffer;
- buffer.open(QIODevice::WriteOnly);
-@@ -130,11 +135,13 @@ void NotificationManager::savePersistentNotifications()
-
- persistentStorage->commit();
- }
-+#endif
(566 more lines skipped)
++++++ fix_build_issues.patch (new)
--- fix_build_issues.patch
+++ fix_build_issues.patch
+From: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+Date: Fri, 09 JuL 2010
+Subject: [PATCH] Correct NGFAdapter::play() return type, add NGFAdapter::stop()
+
+declaration. NGFAdapter::play() should return a unit, not a void.
+
+Signed-off-by: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+
+diff -Naur meegotouch-systemui-0.16.6/src/notifications/ngfadapter.cpp meegotouch-systemui-0.16.6-new/src/notifications/ngfadapter.cpp
+--- meegotouch-systemui-0.16.6/src/notifications/ngfadapter.cpp 2010-07-06 13:38:35.718989713 -0700
++++ meegotouch-systemui-0.16.6-new/src/notifications/ngfadapter.cpp 2010-07-08 13:28:41.344727668 -0700
+@@ -67,7 +67,11 @@
+ {
+ }
+
+-void NGFAdapter::play(const QString &)
++uint NGFAdapter::play(const QString &)
++{
++}
++
++void NGFAdapter::stop(uint eventId)
+ {
+ }
+
++++++ meegotouch-systemui-0.1.1.tar.bz2 -> meegotouch-systemui-0.16.6.tar.bz2
33633 lines of diff (skipped)
++++++ meegotouch-systemui.yaml
--- meegotouch-systemui.yaml
+++ meegotouch-systemui.yaml
@@ -1,6 +1,6 @@
Name: meegotouch-systemui
Summary: System UI daemon
-Version: 0.1.1
+Version: 0.16.6
Release: 1
Group: System/Desktop
License: LGPL v2.1
@@ -12,7 +12,8 @@
Patches:
- 0001-Initial-buildable-version-against-MeeGo.patch
- systemui-fix-profile-compile.patch
- - disable_unlockConfirmed_call.patch
+# - disable_unlockConfirmed_call.patch
+ - fix_build_issues.patch
Description: System UI daemon
PkgBR:
More information about the MeeGo-commits
mailing list