Import upstream version 0.3.92

1 files changed, 98 insertions, 23 deletions

diff --git a/configure b/configure
index 32551f2..d15638c 100755
--- a/configure
+++ b/configure
@@ -613,6 +613,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+HAS_GUDEV_FALSE
+HAS_GUDEV_TRUE
 MKINSTALLDIRS
 POSUB
 POFILES
@@ -637,6 +639,8 @@ GTKLOGOUTHELPER_LIBS
 GTKLOGOUTHELPER_CFLAGS
 USE_GTK3_FALSE
 USE_GTK3_TRUE
+GUDEV_LIBS
+GUDEV_CFLAGS
 SESSIONERVICE_LIBS
 SESSIONERVICE_CFLAGS
 SESSIONSERVICE_LIBS
@@ -837,6 +841,8 @@ APPLET_CFLAGS
 APPLET_LIBS
 SESSIONSERVICE_CFLAGS
 SESSIONSERVICE_LIBS
+GUDEV_CFLAGS
+GUDEV_LIBS
 GTKLOGOUTHELPER_CFLAGS
 GTKLOGOUTHELPER_LIBS'
 
@@ -1509,6 +1515,9 @@ Some influential environment variables:
               C compiler flags for SESSIONSERVICE, overriding pkg-config
   SESSIONSERVICE_LIBS
               linker flags for SESSIONSERVICE, overriding pkg-config
+  GUDEV_CFLAGS
+              C compiler flags for GUDEV, overriding pkg-config
+  GUDEV_LIBS  linker flags for GUDEV, overriding pkg-config
   GTKLOGOUTHELPER_CFLAGS
               C compiler flags for GTKLOGOUTHELPER, overriding pkg-config
   GTKLOGOUTHELPER_LIBS
@@ -2765,7 +2774,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.3.91
+ VERSION=0.3.92
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9511,10 +9520,6 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -13381,14 +13386,12 @@ if test -n "$SESSIONSERVICE_CFLAGS"; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2") 2>&5
@@ -13398,7 +13401,6 @@ if test -n "$SESSIONSERVICE_CFLAGS"; then
   pkg_cv_SESSIONSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2" 2>/dev/null`
@@ -13416,14 +13418,12 @@ if test -n "$SESSIONSERVICE_LIBS"; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2") 2>&5
@@ -13433,7 +13433,6 @@ if test -n "$SESSIONSERVICE_LIBS"; then
   pkg_cv_SESSIONSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2" 2>/dev/null`
@@ -13460,7 +13459,6 @@ fi
 	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2" 2>&1`
@@ -13468,7 +13466,6 @@ fi
 	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2" 2>&1`
@@ -13479,7 +13476,6 @@ fi
 	as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                        dbus-glib-1
-                                       gudev-1.0
                                        gio-unix-2.0
                                        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2) were not met:
@@ -13527,14 +13523,12 @@ if test -n "$SESSIONSERVICE_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13544,7 +13538,6 @@ if test -n "$SESSIONSERVICE_CFLAGS"; then
   test $ac_status = 0; }; then
   pkg_cv_SESSIONSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13562,14 +13555,12 @@ if test -n "$SESSIONSERVICE_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
                                        packagekit-glib2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13579,7 +13570,6 @@ if test -n "$SESSIONSERVICE_LIBS"; then
   test $ac_status = 0; }; then
   pkg_cv_SESSIONSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13606,7 +13596,6 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13614,7 +13603,6 @@ fi
         else
 	        SESSIONSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13625,7 +13613,6 @@ fi
 
 	as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       gudev-1.0
                                        dbus-glib-1
                                        gio-unix-2.0
                                        indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -13668,6 +13655,80 @@ fi
 
 
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5
+$as_echo_n "checking for GUDEV... " >&6; }
+
+if test -n "$GUDEV_CFLAGS"; then
+    pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GUDEV_LIBS"; then
+    pkg_cv_GUDEV_LIBS="$GUDEV_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-1.0" 2>&1`
+        else
+	        GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GUDEV_PKG_ERRORS" >&5
+
+	has_gudev=false
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	has_gudev=false
+else
+	GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS
+	GUDEV_LIBS=$pkg_cv_GUDEV_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	has_gudev=true
+fi
+
+
+
  if test "x$with_gtk" = "x3"; then
   USE_GTK3_TRUE=
   USE_GTK3_FALSE='#'
@@ -14694,8 +14755,18 @@ $as_echo "$LINGUAS" >&6; }
 # Files
 ###########################
 
+ if test "x$has_gudev" = "xtrue"; then
+  HAS_GUDEV_TRUE=
+  HAS_GUDEV_FALSE='#'
+else
+  HAS_GUDEV_TRUE='#'
+  HAS_GUDEV_FALSE=
+fi
+
+
 ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile data/icons/16x16/status/Makefile data/icons/22x22/Makefile data/icons/22x22/actions/Makefile data/icons/22x22/status/Makefile data/icons/24x24/Makefile data/icons/24x24/actions/Makefile data/icons/24x24/status/Makefile data/icons/32x32/Makefile data/icons/32x32/actions/Makefile data/icons/32x32/status/Makefile data/icons/scalable/Makefile data/icons/scalable/actions/Makefile data/icons/scalable/status/Makefile data/extra-sessions/Makefile po/Makefile.in"
 
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -14845,6 +14916,10 @@ if test -z "${BUILD_APT_TRUE}" && test -z "${BUILD_APT_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_APT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAS_GUDEV_TRUE}" && test -z "${HAS_GUDEV_FALSE}"; then
+  as_fn_error $? "conditional \"HAS_GUDEV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0