indicator-session: Update to version 12.10.5+16.04.20160412

indicator-session/0001-There-is-no-help.patch

@@ -1,4 +1,4 @@
-From 751f63a327e4c3ed7036bb7e2acf253e34d6ed49 Mon Sep 17 00:00:00 2001
+From 5e90c8734bc2fc1e811eeb675eff645cb5bef905 Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Sat, 9 Aug 2014 15:17:45 -0400
 Subject: [PATCH 1/2] There is no help
@@ -9,22 +9,26 @@ Subject: [PATCH 1/2] There is no help
  2 files changed, 18 deletions(-)
 
 diff --git a/src/service.c b/src/service.c
-index d9bd8e1..b30a91c 100644
+index 3caf752..228d346 100644
 --- a/src/service.c
 +++ b/src/service.c
-@@ -417,11 +417,8 @@ static GMenuModel *
- create_admin_section (void)
+@@ -454,15 +454,12 @@ create_admin_section (IndicatorSessionService * self)
  {
    GMenu * menu;
--  gchar * help_label = g_strdup_printf(_("%s Help"), get_distro_name());
+   priv_t * p = self->priv;
+-  gchar * help_label = g_strdup_printf(_("%s Help…"), get_distro_name());
    menu = g_menu_new ();
-   g_menu_append (menu, _("About This Computer"), "indicator.about");
+   if (g_getenv ("MIR_SOCKET") != NULL) {
+       g_menu_append (menu, _("About This Device…"), "indicator.about");
+   } else {
+       g_menu_append (menu, _("About This Computer"), "indicator.about");
+   }
 -  g_menu_append (menu, help_label, "indicator.help");
 -  g_free (help_label);
-   return G_MENU_MODEL (menu);
- }
 
-@@ -888,14 +885,6 @@ on_online_accounts_activated (GSimpleAction * a      G_GNUC_UNUSED,
+   if (p->usage_mode_action && g_getenv ("MIR_SOCKET") != NULL) // only under unity8
+   {
+@@ -939,14 +936,6 @@ on_online_accounts_activated (GSimpleAction * a      G_GNUC_UNUSED,
  }
 
  static void
@@ -39,7 +43,7 @@ index d9bd8e1..b30a91c 100644
  on_settings_activated (GSimpleAction * a      G_GNUC_UNUSED,
                         GVariant      * param  G_GNUC_UNUSED,
                         gpointer        gself)
-@@ -986,7 +975,6 @@ init_gactions (IndicatorSessionService * self)
+@@ -1037,7 +1026,6 @@ init_gactions (IndicatorSessionService * self)
 
    GActionEntry entries[] = {
      { "about",                  on_about_activated           },
@@ -72,5 +76,5 @@ index 9ee7236..5885cc8 100644
    ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", NULL, NULL));
    ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-guest", NULL, NULL));
 -- 
-2.7.0
+2.8.2
 

indicator-session/0002-Remove-url-dispatcher-dependency.patch

@@ -1,12 +1,12 @@
-From dc45000c84e57e6bc375e81b65ac83237f59304a Mon Sep 17 00:00:00 2001
+From 947d947a502cdc67d7b6c9f50cd5ec025fef9f3f Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Mon, 25 Jan 2016 12:53:01 -0500
 Subject: [PATCH 2/2] Remove url-dispatcher dependency
 
 ---
  CMakeLists.txt             |  3 +--
- src/backend-dbus/actions.c | 13 +++----------
- 2 files changed, 4 insertions(+), 12 deletions(-)
+ src/backend-dbus/actions.c | 15 ++++-----------
+ 2 files changed, 5 insertions(+), 13 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 72d9a5a..3ed483b 100644
@@ -23,7 +23,7 @@ index 72d9a5a..3ed483b 100644
 
  set (CC_WARNING_ARGS " -Wall -pedantic -Wextra -Wno-missing-field-initializers")
 diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
-index 0fcdc08..10be837 100644
+index 06dd2bd..0c54e12 100644
 --- a/src/backend-dbus/actions.c
 +++ b/src/backend-dbus/actions.c
 @@ -19,7 +19,6 @@
@@ -34,7 +34,16 @@ index 0fcdc08..10be837 100644
 
  #include "dbus-end-session-dialog.h"
  #include "dbus-login1-manager.h"
-@@ -863,9 +862,7 @@ have_unity_control_center (void)
+@@ -832,7 +831,7 @@ static void
+ my_help (IndicatorSessionActions * self G_GNUC_UNUSED)
+ {
+   if (g_getenv ("MIR_SOCKET") != NULL)
+-    url_dispatch_send("http://www.askubuntu.com", NULL, NULL);
++    {}
+   else
+     run_outside_app ("yelp");
+ }
+@@ -872,9 +871,7 @@ have_unity_control_center (void)
  static void
  my_settings (IndicatorSessionActions * self G_GNUC_UNUSED)
  {
@@ -45,7 +54,7 @@ index 0fcdc08..10be837 100644
      run_outside_app ("unity-control-center");
    else
      run_outside_app ("gnome-control-center");
-@@ -874,9 +871,7 @@ my_settings (IndicatorSessionActions * self G_GNUC_UNUSED)
+@@ -883,9 +880,7 @@ my_settings (IndicatorSessionActions * self G_GNUC_UNUSED)
  static void
  my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED)
  {
@@ -56,7 +65,7 @@ index 0fcdc08..10be837 100644
      run_outside_app ("unity-control-center credentials");
    else
      run_outside_app ("gnome-control-center credentials");
-@@ -885,9 +880,7 @@ my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED)
+@@ -894,9 +889,7 @@ my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED)
  static void
  my_about (IndicatorSessionActions * self G_GNUC_UNUSED)
  {
@@ -68,5 +77,5 @@ index 0fcdc08..10be837 100644
    else
      run_outside_app ("gnome-control-center info");
 -- 
-2.7.0
+2.8.2
 

indicator-session/PKGBUILD

@@ -8,7 +8,7 @@
 
 pkgname=indicator-session
 _actual_ver=12.10.5
-_extra_ver=+15.10.20150915
+_extra_ver=+16.04.20160412
 pkgver=${_actual_ver}${_extra_ver/\+/.}
 pkgrel=1
 epoch=1
@@ -20,25 +20,24 @@ depends=(gnome-settings-daemon)
 makedepends=(cmake intltool python2)
 optdepends=('lightdm: support for lightdm')
 groups=(unity)
-install=${pkgname}.install
 source=("https://launchpad.net/ubuntu/+archive/primary/+files/indicator-session_${_actual_ver}${_extra_ver}.orig.tar.gz"
         indicator-session.service
         0001-There-is-no-help.patch
         0002-Remove-url-dispatcher-dependency.patch)
-sha512sums=('31646ca4bd58f5dd3a4b83e103e5c60df2ca687f4bfc23576941f6702c1485cc5b0e5b02e33e2601b3efa274c4eac871491c32eb8316167eabdea57849670243'
+sha512sums=('0142ab02e5dba9a543c6785ea1409fe1d95ed57b395f8ceea526fbe4c2b726088d37a927c1fac6c8a3a31125478c7aa76bc45b8687bd96b1125892f84d329529'
             '540c76c0f68b028194bb1000dd61a0c24f2f16427e79d237b94b8c65fe5e3e16eb6ea645f0fd33d734113727e25b6eb7452cb72f72399c9e8d370f74abba7511'
-            'cc5aef256129d885380a171fecde3ca2cf63332c08fb1701f05acb33c7662e3ae95b729b43ab5e3f56ce8aa7962120cb187c1d06bb10abec8613af0f3f8a50bd'
-            '71c127c6630f237624c2ba02b8ea612aef39280fc79441a0a0fb17a3eac71308104eeee79715343b4e21e10cb58c89e16161b23381808feaddbbda5051f00524')
+            'd6fb693580c921ce397124e12222aeff63734b1a2729f9e661a432613178ed8ff8da6107364e151bbd2bd58c3e70e18b71d8b96988025134f0fee8bc03868135'
+            '8ab2047eae79c01d206811f76efab57ac55161a0c3ba4f7f9e1fa37c80cc619d9571a42af0259b6e32f6597cbab6bc27fc5c5fb50965737065baae6cb546c025')
 
 prepare() {
-    cd "${pkgname}-${_actual_ver}${_extra_ver}"
+    #cd "${pkgname}-${_actual_ver}${_extra_ver}"
 
     patch -p1 -i ../0001-There-is-no-help.patch
     patch -p1 -i ../0002-Remove-url-dispatcher-dependency.patch
 }
 
 build() {
-    cd "${pkgname}-${_actual_ver}${_extra_ver}"
+    #cd "${pkgname}-${_actual_ver}${_extra_ver}"
 
     mkdir build && cd build
     cmake .. \
@@ -51,7 +50,8 @@ build() {
 }
 
 package() {
-    cd "${pkgbase}-${_actual_ver}${_extra_ver}/build"
+    #cd "${pkgbase}-${_actual_ver}${_extra_ver}/build"
+    cd build
 
     make DESTDIR="${pkgdir}/" install