Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at 2016-11-10 13:11:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-session (Old) and /work/SRC/openSUSE:Factory/.gnome-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-session" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-session/gnome-session.changes 2016-10-18 10:33:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-session.new/gnome-session.changes 2016-11-10 13:11:33.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 7 21:12:43 UTC 2016 - [email protected] + +- Update to version 3.22.2: + + Misc fixes to gnome-session-check-accelerated. + + Updated translations. +- Add pkgconfig(epoxy) BuildRequires: new verified dependency. + +------------------------------------------------------------------- Old: ---- gnome-session-3.22.1.tar.xz New: ---- gnome-session-3.22.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.ft871h/_old 2016-11-10 13:11:35.000000000 +0100 +++ /var/tmp/diff_new_pack.ft871h/_new 2016-11-10 13:11:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-session -Version: 3.22.1 +Version: 3.22.2 Release: 0 Summary: Session Tools for the GNOME Desktop License: GPL-2.0+ @@ -36,6 +36,7 @@ BuildRequires: xsltproc BuildRequires: pkgconfig(dbus-glib-1) >= 0.76 BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(gio-unix-2.0) >= 2.35.0 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glesv2) ++++++ gnome-session-3.22.1.tar.xz -> gnome-session-3.22.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/ChangeLog new/gnome-session-3.22.2/ChangeLog --- old/gnome-session-3.22.1/ChangeLog 2016-10-12 16:08:27.000000000 +0200 +++ new/gnome-session-3.22.2/ChangeLog 2016-11-07 19:59:14.000000000 +0100 @@ -1,6 +1,89 @@ # Generated by Makefile. Do not edit. -commit 09f44cc50eafa047856d483ee18ebae99f8b8352 (HEAD -> gnome-3-22, origin/gnome-3-22, github/gnome-3-22) +commit f5d6a6da547e048c0f4a5a13e5113abbed9cbcb3 (HEAD -> gnome-3-22, github/gnome-3-22) +Author: Ray Strode <[email protected]> +Date: Mon Nov 7 13:54:56 2016 -0500 + + configure: bump to 3.22.2 + +M configure.ac + +commit 086c0cf219027ee3359d1d5b3ae17f3c7b9f9e1d +Author: Ray Strode <[email protected]> +Date: Mon Nov 7 13:53:49 2016 -0500 + + NEWS: update for release + +M NEWS + +commit 7e5ca1f2c7fa096073236e990dddfbb814f6675e (origin/gnome-3-22) +Author: Bastien Nocera <[email protected]> +Date: Mon Oct 24 11:41:45 2016 +0200 + + tools: Better error checking when gdk/GL fails + + See https://bugzilla.redhat.com/show_bug.cgi?id=1387898 + + https://bugzilla.gnome.org/show_bug.cgi?id=773412 + +M tools/gnome-session-check-accelerated.c + +commit 5289093c3a72e299d8a088277c512d31dca68cd0 +Author: Bastien Nocera <[email protected]> +Date: Wed Oct 19 13:31:20 2016 +0200 + + tools: Don't read cached info about 1st GPU when 2nd one is requested + + This avoids both GPUs having the name of the first one when running the + Details settings panel under X.org. + + https://bugzilla.gnome.org/show_bug.cgi?id=773216 + +M tools/gnome-session-check-accelerated.c + +commit 5c4d826edaa07e07759b2737b4f4e598d1055e65 +Author: Bastien Nocera <[email protected]> +Date: Tue Oct 11 12:53:11 2016 +0200 + + check-accelerated: Print the renderer under Wayland as well + + Based on sample code by Matthias Clasen <[email protected]> + + We'll use this in gnome-control-center when gnome-session cannot provide + a renderer, under Wayland, as the Wayland compositor runs after + gnome-session's startup. + + If OpenGL 3 is not supported (which is required for GTK+'s GL support), + then nothing is output. + + https://bugzilla.gnome.org/show_bug.cgi?id=756914 + +M configure.ac +M tools/Makefile.am +M tools/gnome-session-check-accelerated.c + +commit dd6328cb8c4a90f99f48bffdcbbf3b5134cf4c2b +Author: Bastien Nocera <[email protected]> +Date: Tue Oct 11 12:49:42 2016 +0200 + + check-accelerated: Fix warnings on startup + + The Wayland session is now named "gnome" not "gnome-wayland", so don't + try to run the X11-specific code when under Wayland. + + https://bugzilla.gnome.org/show_bug.cgi?id=756914 + +M tools/gnome-session-check-accelerated.c + +commit ada390216687c6bb31278fcb0933301646da5148 +Author: YunQiang Su <[email protected]> +Date: Tue Oct 18 17:25:25 2016 +0800 + + Update zh_CN translation + +M po/zh_CN.po + +commit 09f44cc50eafa047856d483ee18ebae99f8b8352 (tag: 3.22.1) Author: Ray Strode <[email protected]> Date: Wed Oct 12 10:05:09 2016 -0400 @@ -15676,7 +15759,7 @@ M configure.in -commit 57061e91e301fde7df8a6b344ff634d01ea799b0 (tag: before-gnome-2-28-Patch2-xsmp-stop.patch, tag: before-gnome-2-28-#Patch1-show-lock.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch, tag: before-gnome-2-28, tag: GNOME_SESSION_2_28_0, github/gnome-2-28-#Patch1-show-lock.patch, github/gnome-2-28-#Patch0-unresponsive-timeout.patch, gnome-2-28-#Patch1-show-lock.patch, gnome-2-28-#Patch0-unresponsive-timeout.patch) +commit 57061e91e301fde7df8a6b344ff634d01ea799b0 (tag: before-rhel-6.9-xsmp-stop.patch, tag: before-rhel-6.9, tag: before-gnome-2-28-Patch2-xsmp-stop.patch, tag: before-gnome-2-28-#Patch1-show-lock.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch-xsmp-stop.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch-unresponsive-timeout.patch-xsmp-stop.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch-unresponsive-timeout.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch-show-lock.patch-xsmp-stop.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch-show-lock.patch, tag: before-gnome-2-28-#Patch0-unresponsive-timeout.patch, tag: before-gnome-2-28, tag: GNOME_SESSION_2_28_0) Author: Vincent Untz <[email protected]> Date: Mon Sep 21 18:24:12 2009 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/Makefile.in new/gnome-session-3.22.2/Makefile.in --- old/gnome-session-3.22.1/Makefile.in 2016-10-12 16:06:26.000000000 +0200 +++ new/gnome-session-3.22.2/Makefile.in 2016-11-07 19:55:40.000000000 +0100 @@ -99,7 +99,7 @@ $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -162,7 +162,7 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README compile config.guess \ - config.sub install-sh ltmain.sh missing + config.sub install-sh ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/NEWS new/gnome-session-3.22.2/NEWS --- old/gnome-session-3.22.1/NEWS 2016-10-12 16:05:57.000000000 +0200 +++ new/gnome-session-3.22.2/NEWS 2016-11-07 19:53:46.000000000 +0100 @@ -1,4 +1,10 @@ =============== +Version 3.22.2 +=============== + * misc fixes to gnome-session-check-accelerated + * Translation updates + +=============== Version 3.22.1 =============== * Fix problem when cancelling the power off dialogue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/configure new/gnome-session-3.22.2/configure --- old/gnome-session-3.22.1/configure 2016-10-12 16:06:25.000000000 +0200 +++ new/gnome-session-3.22.2/configure 2016-11-07 19:55:38.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-session 3.22.1. +# Generated by GNU Autoconf 2.69 for gnome-session 3.22.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-session' PACKAGE_TARNAME='gnome-session' -PACKAGE_VERSION='3.22.1' -PACKAGE_STRING='gnome-session 3.22.1' +PACKAGE_VERSION='3.22.2' +PACKAGE_STRING='gnome-session 3.22.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session' PACKAGE_URL='' @@ -1489,7 +1489,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-session 3.22.1 to adapt to many kinds of systems. +\`configure' configures gnome-session 3.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1559,7 +1559,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-session 3.22.1:";; + short | recursive ) echo "Configuration of gnome-session 3.22.2:";; esac cat <<\_ACEOF @@ -1755,7 +1755,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-session configure 3.22.1 +gnome-session configure 3.22.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2124,7 +2124,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-session $as_me 3.22.1, which was +It was created by gnome-session $as_me 3.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2993,7 +2993,7 @@ # Define the identity of the package. PACKAGE='gnome-session' - VERSION='3.22.1' + VERSION='3.22.2' cat >>confdefs.h <<_ACEOF @@ -13782,12 +13782,12 @@ pkg_cv_GL_TEST_CFLAGS="$GL_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite gl glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xcomposite gl glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite gl glib-2.0 epoxy\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xcomposite gl glib-2.0 epoxy") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GL_TEST_CFLAGS=`$PKG_CONFIG --cflags "xcomposite gl glib-2.0" 2>/dev/null` + pkg_cv_GL_TEST_CFLAGS=`$PKG_CONFIG --cflags "xcomposite gl glib-2.0 epoxy" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13799,12 +13799,12 @@ pkg_cv_GL_TEST_LIBS="$GL_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite gl glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xcomposite gl glib-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite gl glib-2.0 epoxy\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xcomposite gl glib-2.0 epoxy") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GL_TEST_LIBS=`$PKG_CONFIG --libs "xcomposite gl glib-2.0" 2>/dev/null` + pkg_cv_GL_TEST_LIBS=`$PKG_CONFIG --libs "xcomposite gl glib-2.0 epoxy" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13825,14 +13825,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite gl glib-2.0" 2>&1` + GL_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite gl glib-2.0 epoxy" 2>&1` else - GL_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite gl glib-2.0" 2>&1` + GL_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite gl glib-2.0 epoxy" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GL_TEST_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xcomposite gl glib-2.0) were not met: + as_fn_error $? "Package requirements (xcomposite gl glib-2.0 epoxy) were not met: $GL_TEST_PKG_ERRORS @@ -17240,7 +17240,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-session $as_me 3.22.1, which was +This file was extended by gnome-session $as_me 3.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17306,7 +17306,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-session config.status 3.22.1 +gnome-session config.status 3.22.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/configure.ac new/gnome-session-3.22.2/configure.ac --- old/gnome-session-3.22.1/configure.ac 2016-10-12 16:05:57.000000000 +0200 +++ new/gnome-session-3.22.2/configure.ac 2016-11-07 19:54:53.000000000 +0100 @@ -1,5 +1,5 @@ AC_INIT([gnome-session], - [3.22.1], + [3.22.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session]) AC_CONFIG_SRCDIR([gnome-session]) @@ -85,7 +85,7 @@ PKG_CHECK_MODULES(ICE, ice) PKG_CHECK_MODULES(XEXT, xext xau) -PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0) +PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0 epoxy) PKG_CHECK_MODULES(GLES_TEST, egl glesv2) dnl ==================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/data/Makefile.in new/gnome-session-3.22.2/data/Makefile.in --- old/gnome-session-3.22.1/data/Makefile.in 2016-10-12 16:06:26.000000000 +0200 +++ new/gnome-session-3.22.2/data/Makefile.in 2016-11-07 19:55:40.000000000 +0100 @@ -100,7 +100,7 @@ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_migration_DATA) \ $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = org.gnome.SessionManager.gschema.xml CONFIG_CLEAN_VPATH_FILES = @@ -158,7 +158,8 @@ $(ui_DATA) $(wayland_session_DATA) $(xsession_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(srcdir)/org.gnome.SessionManager.gschema.xml.in + $(srcdir)/org.gnome.SessionManager.gschema.xml.in \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/doc/Makefile.in new/gnome-session-3.22.2/doc/Makefile.in --- old/gnome-session-3.22.1/doc/Makefile.in 2016-10-12 16:06:26.000000000 +0200 +++ new/gnome-session-3.22.2/doc/Makefile.in 2016-11-07 19:55:40.000000000 +0100 @@ -97,7 +97,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -156,7 +156,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = dbus man -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/doc/dbus/Makefile.in new/gnome-session-3.22.2/doc/dbus/Makefile.in --- old/gnome-session-3.22.1/doc/dbus/Makefile.in 2016-10-12 16:06:26.000000000 +0200 +++ new/gnome-session-3.22.2/doc/dbus/Makefile.in 2016-11-07 19:55:40.000000000 +0100 @@ -97,7 +97,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gnome-session.xml CONFIG_CLEAN_VPATH_FILES = @@ -150,7 +150,8 @@ am__installdirs = "$(DESTDIR)$(htmldocdir)" DATA = $(htmldoc_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gnome-session.xml.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gnome-session.xml.in \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/doc/man/Makefile.in new/gnome-session-3.22.2/doc/man/Makefile.in --- old/gnome-session-3.22.1/doc/man/Makefile.in 2016-10-12 16:06:26.000000000 +0200 +++ new/gnome-session-3.22.2/doc/man/Makefile.in 2016-11-07 19:55:40.000000000 +0100 @@ -97,7 +97,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -152,7 +152,7 @@ NROFF = nroff MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/doc/man/gnome-session-inhibit.1 new/gnome-session-3.22.2/doc/man/gnome-session-inhibit.1 --- old/gnome-session-3.22.1/doc/man/gnome-session-inhibit.1 2016-03-03 15:49:43.000000000 +0100 +++ new/gnome-session-3.22.2/doc/man/gnome-session-inhibit.1 2016-11-07 19:59:13.000000000 +0100 @@ -2,7 +2,7 @@ .\" Title: gnome-session-inhibit .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 03/03/2016 +.\" Date: 11/07/2016 .\" Manual: User Commands .\" Source: gnome-session .\" Language: English diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/Makefile.in new/gnome-session-3.22.2/gnome-session/Makefile.in --- old/gnome-session-3.22.1/gnome-session/Makefile.in 2016-10-12 16:06:26.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/Makefile.in 2016-11-07 19:55:40.000000000 +0100 @@ -105,7 +105,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -298,7 +298,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp README +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.App.c new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.App.c --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.App.c 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.App.c 2016-11-07 19:59:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.App.h new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.App.h --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.App.h 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.App.h 2016-11-07 19:59:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Client.c new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Client.c --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Client.c 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Client.c 2016-11-07 19:59:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Client.h new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Client.h --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Client.h 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Client.h 2016-11-07 19:59:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.ClientPrivate.c new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.ClientPrivate.c --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.ClientPrivate.c 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.ClientPrivate.c 2016-11-07 19:59:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.ClientPrivate.h new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.ClientPrivate.h --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.ClientPrivate.h 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.ClientPrivate.h 2016-11-07 19:59:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Inhibitor.c new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Inhibitor.c --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Inhibitor.c 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Inhibitor.c 2016-11-07 19:59:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Inhibitor.h new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Inhibitor.h --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Inhibitor.h 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Inhibitor.h 2016-11-07 19:59:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Presence.c new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Presence.c --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Presence.c 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Presence.c 2016-11-07 19:59:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Presence.h new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Presence.h --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.Presence.h 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.Presence.h 2016-11-07 19:59:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.c new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.c --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.c 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.c 2016-11-07 19:59:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.h new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.h --- old/gnome-session-3.22.1/gnome-session/org.gnome.SessionManager.h 2016-07-22 19:32:32.000000000 +0200 +++ new/gnome-session-3.22.2/gnome-session/org.gnome.SessionManager.h 2016-11-07 19:59:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.49.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.49.6. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/mkinstalldirs new/gnome-session-3.22.2/mkinstalldirs --- old/gnome-session-3.22.1/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-session-3.22.2/mkinstalldirs 2016-11-07 19:55:40.000000000 +0100 @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2009-04-28.21; # UTC + +# Original author: Noah Friedman <[email protected]> +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' +IFS=" "" $nl" +errstatus=0 +dirmode= + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to <[email protected]>." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the 'mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because '.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +for file +do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp=$pathcomp/ + done +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/po/zh_CN.po new/gnome-session-3.22.2/po/zh_CN.po --- old/gnome-session-3.22.1/po/zh_CN.po 2016-07-22 15:50:28.000000000 +0200 +++ new/gnome-session-3.22.2/po/zh_CN.po 2016-11-07 19:51:37.000000000 +0100 @@ -20,8 +20,8 @@ "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-02-18 19:14+0000\n" -"PO-Revision-Date: 2015-03-04 17:07+0800\n" +"POT-Creation-Date: 2016-10-11 09:19+0000\n" +"PO-Revision-Date: 2016-10-18 17:25+0800\n" "Last-Translator: Tong Hui <[email protected]>\n" "Language-Team: Chinese (simplified) <[email protected]>\n" "Language: zh_CN\n" @@ -29,7 +29,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.9\n" #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" @@ -43,23 +43,18 @@ msgid "GNOME" msgstr "GNOME" -#: ../data/gnome.desktop.in.h:2 +#: ../data/gnome.desktop.in.h:2 ../data/gnome-xorg.desktop.in.h:2 msgid "This session logs you into GNOME" msgstr "此会话将您登录到 GNOME" +#: ../data/gnome-xorg.desktop.in.h:1 +msgid "GNOME on Xorg" +msgstr "运行于 Xorg 的 GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" -#: ../data/gnome-wayland.desktop.in.h:1 -#: ../data/gnome-wayland.session.desktop.in.in.h:1 -msgid "GNOME on Wayland" -msgstr "基于 Wayland 的 GNOME" - -#: ../data/gnome-wayland.desktop.in.h:2 -msgid "This session logs you into GNOME, using Wayland" -msgstr "此会话将您登录到使用 Wayland 的 GNOME" - #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "自定义会话" @@ -84,47 +79,6 @@ msgid "_Continue" msgstr "继续(_C)" -# applets/gkb/gkb.c:262 -#: ../data/session-properties.ui.h:1 -msgid "Additional startup _programs:" -msgstr "额外的启动程序(_P)：" - -# applets/gkb/gkb.c:262 -#: ../data/session-properties.ui.h:2 -msgid "Startup Programs" -msgstr "启动程序" - -#: ../data/session-properties.ui.h:3 -msgid "_Automatically remember running applications when logging out" -msgstr "注销时自动记住正在运行的应用程序(_A)" - -#: ../data/session-properties.ui.h:4 -msgid "_Remember Currently Running Applications" -msgstr "记住目前正在运行的应用程序(_R)" - -# panel/menu.c:3509 -#: ../data/session-properties.ui.h:5 -msgid "Options" -msgstr "选项" - -#: ../data/session-properties.ui.h:6 -msgid "Browse…" -msgstr "浏览..." - -# help-browser/toc-man.c:19 help-browser/toc2-man.c:21 -#: ../data/session-properties.ui.h:7 -msgid "Comm_ent:" -msgstr "注释(_E)：" - -# help-browser/toc-man.c:19 help-browser/toc2-man.c:21 -#: ../data/session-properties.ui.h:8 -msgid "Co_mmand:" -msgstr "命令(_M)：" - -#: ../data/session-properties.ui.h:9 -msgid "_Name:" -msgstr "名称(_N)：" - #: ../gnome-session/gsm-fail-whale-dialog.c:313 msgid "Oh no! Something has gone wrong." msgstr "糟糕！出错啦！" @@ -152,7 +106,7 @@ msgid "_Log Out" msgstr "注销(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:243 +#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:274 msgid "Enable debugging code" msgstr "启用调试代码" @@ -164,12 +118,12 @@ msgid "Show extension warning" msgstr "显示扩展警告" -#: ../gnome-session/gsm-manager.c:1251 ../gnome-session/gsm-manager.c:1896 +#: ../gnome-session/gsm-manager.c:1228 ../gnome-session/gsm-manager.c:1881 msgid "Not responding" msgstr "无响应" # gsm/logout.c:248 -#: ../gnome-session/gsm-util.c:381 +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "注销(_L)" @@ -196,40 +150,40 @@ msgid "Could not create ICE listening socket: %s" msgstr "无法创建 ICE 监听套接字：%s" -#: ../gnome-session/main.c:241 +#: ../gnome-session/main.c:272 msgid "Override standard autostart directories" msgstr "取代默认的自动启动目录" -#: ../gnome-session/main.c:241 +#: ../gnome-session/main.c:272 msgid "AUTOSTART_DIR" msgstr "自动启动目录" -#: ../gnome-session/main.c:242 +#: ../gnome-session/main.c:273 msgid "Session to use" msgstr "要使用的会话" -#: ../gnome-session/main.c:242 +#: ../gnome-session/main.c:273 msgid "SESSION_NAME" msgstr "会话名称" -#: ../gnome-session/main.c:244 +#: ../gnome-session/main.c:275 msgid "Do not load user-specified applications" msgstr "不装入用户指定的应用程序" -#: ../gnome-session/main.c:245 +#: ../gnome-session/main.c:276 msgid "Version of this application" msgstr "此应用程序的版本" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:247 +#: ../gnome-session/main.c:278 msgid "Show the fail whale dialog for testing" msgstr "显示用于测试的鲸鱼失败对话框" -#: ../gnome-session/main.c:248 +#: ../gnome-session/main.c:279 msgid "Disable hardware acceleration check" msgstr "禁用硬件加速检测" -#: ../gnome-session/main.c:267 +#: ../gnome-session/main.c:311 msgid " - the GNOME session manager" msgstr "- GNOME 会话管理器" @@ -300,35 +254,70 @@ msgstr "名为“%s”的会话已存在" # gsm/logout.c:248 -#: ../tools/gnome-session-quit.c:49 +#: ../tools/gnome-session-quit.c:50 msgid "Log out" msgstr "注销" -#: ../tools/gnome-session-quit.c:50 +#: ../tools/gnome-session-quit.c:51 msgid "Power off" msgstr "关机" -#: ../tools/gnome-session-quit.c:51 +#: ../tools/gnome-session-quit.c:52 msgid "Reboot" msgstr "重启" -#: ../tools/gnome-session-quit.c:52 +#: ../tools/gnome-session-quit.c:53 msgid "Ignoring any existing inhibitors" msgstr "忽略现有限制因素" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:54 msgid "Don't prompt for user confirmation" msgstr "不提示用户确认" # gsm/save-session.c:86 -#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:88 ../tools/gnome-session-quit.c:102 msgid "Could not connect to the session manager" msgstr "无法连接到会话管理器" -#: ../tools/gnome-session-quit.c:196 +#: ../tools/gnome-session-quit.c:198 msgid "Program called with conflicting options" msgstr "调用程序的选项互相冲突" +#~ msgid "This session logs you into GNOME, using Wayland" +#~ msgstr "此会话将您登录到使用 Wayland 的 GNOME" + +# applets/gkb/gkb.c:262 +#~ msgid "Additional startup _programs:" +#~ msgstr "额外的启动程序(_P)：" + +# applets/gkb/gkb.c:262 +#~ msgid "Startup Programs" +#~ msgstr "启动程序" + +#~ msgid "_Automatically remember running applications when logging out" +#~ msgstr "注销时自动记住正在运行的应用程序(_A)" + +#~ msgid "_Remember Currently Running Applications" +#~ msgstr "记住目前正在运行的应用程序(_R)" + +# panel/menu.c:3509 +#~ msgid "Options" +#~ msgstr "选项" + +#~ msgid "Browse…" +#~ msgstr "浏览..." + +# help-browser/toc-man.c:19 help-browser/toc2-man.c:21 +#~ msgid "Comm_ent:" +#~ msgstr "注释(_E)：" + +# help-browser/toc-man.c:19 help-browser/toc2-man.c:21 +#~ msgid "Co_mmand:" +#~ msgstr "命令(_M)：" + +#~ msgid "_Name:" +#~ msgstr "名称(_N)：" + # help-browser/toc-man.c:19 help-browser/toc2-man.c:21 #~ msgid "Select Command" #~ msgstr "选择命令" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/tools/Makefile.am new/gnome-session-3.22.2/tools/Makefile.am --- old/gnome-session-3.22.1/tools/Makefile.am 2016-07-22 15:50:10.000000000 +0200 +++ new/gnome-session-3.22.2/tools/Makefile.am 2016-11-07 19:51:37.000000000 +0100 @@ -77,11 +77,13 @@ gnome_session_check_accelerated_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) \ - $(GTK3_CFLAGS) + $(GTK3_CFLAGS) \ + $(GL_TEST_CFLAGS) gnome_session_check_accelerated_LDADD = \ $(GTK3_LIBS) \ - $(X11_LIBS) + $(X11_LIBS) \ + $(GL_TEST_LIBS) if BUILD_SESSION_SELECTOR gnome_session_selector_CPPFLAGS = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/tools/Makefile.in new/gnome-session-3.22.2/tools/Makefile.in --- old/gnome-session-3.22.1/tools/Makefile.in 2016-10-12 16:06:27.000000000 +0200 +++ new/gnome-session-3.22.2/tools/Makefile.in 2016-11-07 19:55:41.000000000 +0100 @@ -105,7 +105,7 @@ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_bin_SCRIPTS_DIST) \ $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -119,7 +119,7 @@ $(am_gnome_session_check_accelerated_OBJECTS) am__DEPENDENCIES_1 = gnome_session_check_accelerated_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -247,7 +247,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -515,11 +516,13 @@ gnome_session_check_accelerated_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) \ - $(GTK3_CFLAGS) + $(GTK3_CFLAGS) \ + $(GL_TEST_CFLAGS) gnome_session_check_accelerated_LDADD = \ $(GTK3_LIBS) \ - $(X11_LIBS) + $(X11_LIBS) \ + $(GL_TEST_LIBS) @BUILD_SESSION_SELECTOR_TRUE@gnome_session_selector_CPPFLAGS = \ @BUILD_SESSION_SELECTOR_TRUE@ $(AM_CPPFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-session-3.22.1/tools/gnome-session-check-accelerated.c new/gnome-session-3.22.2/tools/gnome-session-check-accelerated.c --- old/gnome-session-3.22.1/tools/gnome-session-check-accelerated.c 2016-07-22 15:50:10.000000000 +0200 +++ new/gnome-session-3.22.2/tools/gnome-session-check-accelerated.c 2016-11-07 19:51:37.000000000 +0100 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <gtk/gtk.h> +#include <epoxy/gl.h> #include <gdk/gdkx.h> #include <X11/Xatom.h> #include <sys/wait.h> @@ -91,6 +92,39 @@ return property_changed; } +static char * +get_gtk_gles_renderer (void) +{ + GtkWidget *win; + GdkGLContext *context; + char *renderer = NULL; + + win = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_realize (win); + context = gdk_window_create_gl_context (gtk_widget_get_window (win), NULL); + if (!context) + return NULL; + gdk_gl_context_make_current (context); + renderer = g_strdup ((char *) glGetString (GL_RENDERER)); + gdk_gl_context_clear_current (); + g_object_unref (context); + + return renderer; +} + +static gboolean +is_discrete_gpu_check (void) +{ + const char *dri_prime; + + dri_prime = g_getenv ("DRI_PRIME"); + if (!dri_prime) + return FALSE; + if (*dri_prime != '1') + return FALSE; + return TRUE; +} + int main (int argc, char **argv) { @@ -103,16 +137,23 @@ glong is_accelerated, is_software_rendering; GError *gl_error = NULL, *gles_error = NULL; + gtk_init (NULL, NULL); + /* gnome-session-check-accelerated gets run before X is started in the wayland * case, and it currently requires X. Until we have that working, just always - * assume wayland will work + * assume wayland will work. + * Also make sure that we don't read cached information about the first GPU + * when requesting information about the second. */ - if (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "gnome-wayland") == 0) { - return 0; + if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "x11") != 0) { + renderer_string = get_gtk_gles_renderer (); + if (renderer_string) { + g_print ("%s", renderer_string); + return 0; + } + return 1; } - gtk_init (NULL, NULL); - display = gdk_display_get_default (); rootwin = gdk_x11_get_default_root_xwindow ();
