pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 366849 from editors

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/366849
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2016-03-09 14:15:23 +00:00 committed by Git OBS Bridge
commit c860f03a43
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emacs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 26 12:51:56 UTC 2016 - werner@suse.de
- Add small shell extension in emacs wrapper script to disable the
AT bridge if not available
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 2 14:18:51 UTC 2016 - normand@linux.vnet.ibm.com Tue Feb 2 14:18:51 UTC 2016 - normand@linux.vnet.ibm.com

22
emacs.sh
View File

@ -30,13 +30,13 @@ if test "$EMACS_TOOLKIT" = gtk; then
fi fi
arg0=$0 arg0=$0
argv=("$@") argv=("$@")
if test -e ${arg0}-${EMACS_TOOLKIT} if test -x ${arg0}-${EMACS_TOOLKIT}
then then
set -- ${arg0}-${EMACS_TOOLKIT} set -- ${arg0}-${EMACS_TOOLKIT}
elif test -e ${arg0}-x11 elif test -x ${arg0}-x11
then then
set -- ${arg0}-x11 set -- ${arg0}-x11
elif test -e ${arg0}-nox elif test -x ${arg0}-nox
then then
set -- ${arg0}-nox set -- ${arg0}-nox
else else
@ -44,8 +44,6 @@ else
exit 1 exit 1
fi fi
dbusdaemon=$(type -p dbus-daemon 2>/dev/null) 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 # Now check for valid dbus, e.g. after su/sudo/slogin
# #
@ -94,6 +92,8 @@ if test -n "$dbusdaemon" ; then
unset mid guid suid dadd unset mid guid suid dadd
# Oops ... no dbus-daemon then launch a new session # Oops ... no dbus-daemon then launch a new session
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then 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 if test -z "$dbusession" -a -n "$dbuslaunch" ; then
set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session ${1+"$@"} set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session ${1+"$@"}
arg0=$dbuslaunch arg0=$dbuslaunch
@ -106,4 +106,16 @@ if test -n "$dbusdaemon" ; then
fi fi
unset dbuslaunch dbusdaemon unset dbuslaunch dbusdaemon
fi 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[@]}" exec -a $arg0 ${1+"$@"} "${argv[@]}"

1
emacs.spec
View File

@ -339,7 +339,6 @@ LDFLAGS=
cflags -fno-optimize-sibling-calls CFLAGS cflags -fno-optimize-sibling-calls CFLAGS
cflags -fno-PIE CFLAGS cflags -fno-PIE CFLAGS
cflags -Wl,-O2 LDFLAGS cflags -Wl,-O2 LDFLAGS
cflags -Wl,--hash-size=65521 LDFLAGS
%ifarch ia64 %ifarch ia64
CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g') CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g')
%endif %endif