Hello community,
here is the log from the commit of package emacs for openSUSE:Factory checked
in at 2016-03-09 15:15:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/emacs (Old)
and /work/SRC/openSUSE:Factory/.emacs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2016-02-28
02:25:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2016-03-09
15:15:25.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 26 12:51:56 UTC 2016 - wer...@suse.de
+
+- Add small shell extension in emacs wrapper script to disable the
+ AT bridge if not available
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.wcZWBB/_old 2016-03-09 15:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.wcZWBB/_new 2016-03-09 15:15:28.000000000 +0100
@@ -339,7 +339,6 @@
cflags -fno-optimize-sibling-calls CFLAGS
cflags -fno-PIE CFLAGS
cflags -Wl,-O2 LDFLAGS
- cflags -Wl,--hash-size=65521 LDFLAGS
%ifarch ia64
CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g')
%endif
++++++ emacs.sh ++++++
--- /var/tmp/diff_new_pack.wcZWBB/_old 2016-03-09 15:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.wcZWBB/_new 2016-03-09 15:15:28.000000000 +0100
@@ -30,13 +30,13 @@
fi
arg0=$0
argv=("$@")
-if test -e ${arg0}-${EMACS_TOOLKIT}
+if test -x ${arg0}-${EMACS_TOOLKIT}
then
set -- ${arg0}-${EMACS_TOOLKIT}
-elif test -e ${arg0}-x11
+elif test -x ${arg0}-x11
then
set -- ${arg0}-x11
-elif test -e ${arg0}-nox
+elif test -x ${arg0}-nox
then
set -- ${arg0}-nox
else
@@ -44,8 +44,6 @@
exit 1
fi
dbusdaemon=$(type -p dbus-daemon 2>/dev/null)
-dbuslaunch=$(type -p dbus-launch 2>/dev/null)
-dbusession=$(type -p dbus-run-session 2>/dev/null)
#
# Now check for valid dbus, e.g. after su/sudo/slogin
#
@@ -94,6 +92,8 @@
unset mid guid suid dadd
# Oops ... no dbus-daemon then launch a new session
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+ dbuslaunch=$(type -p dbus-launch 2>/dev/null)
+ dbusession=$(type -p dbus-run-session 2>/dev/null)
if test -z "$dbusession" -a -n "$dbuslaunch" ; then
set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session
${1+"$@"}
arg0=$dbuslaunch
@@ -106,4 +106,16 @@
fi
unset dbuslaunch dbusdaemon
fi
+#
+# Disable AT bridge if not accessible
+#
+if test -z "NO_AT_BRIDGE" ; then
+ gsettings=$(gsettings get org.gnome.desktop.interface
toolkit-accessibility 2>/dev/null)
+ if test -z "$gsettings" -o "$gsettings" = false ; then
+ NO_AT_BRIDGE=1
+ export NO_AT_BRIDGE
+ fi
+ unset gsettings
+fi
+unset G_MESSAGES_DEBUG G_DEBUG G_MESSAGES_PREFIXED
exec -a $arg0 ${1+"$@"} "${argv[@]}"
