This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 33115a4bf04adc3f5eb6a1ccfa2ebeb3238186ad Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 01:50:20 2014 +0100 xsettings: add new stub. --- Makefile | 7 ++++ x2goserver-xsettings/Makefile | 89 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/Makefile b/Makefile index 03b0484..3c78e94 100755 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ build_man2html: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ clean: -$(MAKE) -f Makefile.perl clean @@ -35,6 +36,7 @@ clean: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ distclean: -$(MAKE) -f Makefile.perl realclean @@ -45,6 +47,7 @@ distclean: $(MAKE) -C x2goserver-extensions clean $(MAKE) -C x2goserver-xsession clean $(MAKE) -C x2goserver-fmbindings clean + $(MAKE) -C x2goserver-xsettings clean build-arch: $(MAKE) -C x2goserver-common $@ @@ -54,6 +57,7 @@ build-arch: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ build-indep: $(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS) @@ -65,6 +69,7 @@ build-indep: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ install: $(MAKE) -f Makefile.perl pure_install @@ -75,11 +80,13 @@ install: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ uninstall: $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -f Makefile.perl uninstall $(MAKE) -C libx2go-server-db-perl $@ diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile new file mode 100755 index 0000000..6229b2c --- /dev/null +++ b/x2goserver-xsettings/Makefile @@ -0,0 +1,89 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR ?= +PREFIX ?= /usr/local +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +LIBDIR=$(PREFIX)/lib/x2go +MANDIR=$(PREFIX)/share/man +SHAREDIR=$(PREFIX)/share/x2go + +ETC_FILES=$(shell cd etc && echo *) +LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) + +man_pages = `cd man && find * -type f` + +MAN2HTML_BIN = $(shell which man2html) +MAN2HTML_SRC = man +MAN2HTML_DEST = .build_man2html/html + +all: clean build + +build: build-arch build-indep + +build-arch: + +build-indep: build_man2html + +build_man2html: + if [ -n "$(MAN2HTML_BIN)" ]; then \ + mkdir -p $(MAN2HTML_DEST); \ + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ + fi + +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + +install: install_scripts install_config install_man install_version + +install_scripts: + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d + $(INSTALL_PROGRAM) lib/x2go/extensions/post-start.d/* $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ + +install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_FILE) etc/xsettings.conf $(DESTDIR)$(ETCDIR)/ + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + +install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions + $(INSTALL_FILE) VERSION.x2goserver-xsettings $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsettings + +uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version + +uninstall_scripts: + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/900_xsettingsd* + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done + +uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings.conf + +uninstall_man: + for file in man/man8/*.8; do $(RM_FILE) $(DESTDIR)$(MANDIR)/$${file#man}.gz; done + $(RM_DIR) $(DESTDIR)$(MANDIR) || true + +uninstall_version: + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsettings + $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 9cac87f5c9ba557a45484ab795f7d7ce46ef0cd1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 02:55:37 2014 +0100 x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. Don't use '/' as sed replace command separator for... paths. Bad idea, who would have guessed. --- x2goserver/Makefile | 1 + x2goserver/bin/{x2gopath => x2gopath.in} | 1 + 2 files changed, 2 insertions(+) diff --git a/x2goserver/Makefile b/x2goserver/Makefile index ee1891c..3deb452 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -37,6 +37,7 @@ build: build-arch build-indep build-arch: build-indep: build_man2html + sed -e 's,@@SYSCONFDIR@@,$(ETCDIR),' bin/x2gopath.in > bin/x2gopath build_man2html: if [ -n "$(MAN2HTML_BIN)" ]; then \ diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath.in similarity index 97% rename from x2goserver/bin/x2gopath rename to x2goserver/bin/x2gopath.in index 8fb36a8..784b510 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath.in @@ -32,6 +32,7 @@ base=$(readlink -f "$base/.."); # The following section is subject to substitution by distro packaging tools. case "$1" in "base") echo -n "$base";; + "etc") echo -n "@@SYSCONFDIR@@";; "lib") echo -n "$base/lib/x2go";; "libexec") echo -n "$base/lib/x2go";; "share") echo -n "$base/share/x2go";; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 20b38968e1cef467e95badba81a6d766825c19a5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 03:47:33 2014 +0100 xsettings: add post-start hook. --- .../post-start.d/900_xsettings-xsettingsd-startup | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup new file mode 100644 index 0000000..3a8cfff --- /dev/null +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -0,0 +1,36 @@ +#!/bin/bash + +# Copyright (C) 2014 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> + +export X2GO_SESSION="${1}" + +X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")" +X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" +X2GO_CONF_DIR="$(x2gopath etc)" +XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" +XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" +XSETTINGSD_USER_CONF="${X2GO_SESSION_DIR}/xsettings.conf" +XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" + +export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" + +[ -r "${XSETTINGSD_USER_CONF}" ] && XSETTINGSD_CONF="${XSETTINGSD_USER_CONF}" || XSETTINGSD_CONF="${XSETTINGSD_DEFAULT_CONF}" + +nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit c1028eecf04b673383317e3b3332f7caf7cf9512 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 04:32:10 2014 +0100 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. --- x2goserver-xsettings/etc/xsettings.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver-xsettings/etc/xsettings.conf b/x2goserver-xsettings/etc/xsettings.conf new file mode 100644 index 0000000..7920616 --- /dev/null +++ b/x2goserver-xsettings/etc/xsettings.conf @@ -0,0 +1,2 @@ +/Gtk/MenuImages 1 +/Gtk/ButtonImages 1 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit c0ed1f68b255780ec02e2b1844f7bc4aa53b958a Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 07:36:59 2014 +0100 xsettings: add manual page. --- .../man/man8/x2goserver-xsettings.8 | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 new file mode 100644 index 0000000..5181181 --- /dev/null +++ b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 @@ -0,0 +1,39 @@ +.TH x2goserver-xsettings 8 "Nov 2014" "Version 4\&.1\&.0\&.0-preview" "X2Go Server Component" +.SH "DESCRIPTION" +\fBx2goserver-xsettings\fP is an \fBx2goserver\fP component providing support +for the \fIXSETTINGS\fP protocol\&. + +The \fIXSETTINGS\fP protocol as specified on +\fBhttp://standards\&.freedesktop\&.org/xsettings-spec/latest/\fP is a means for +desktop environments to store and apply settings globally for all applications +running in a specific context\&. + +It is designed to be lightweight and reactive with changes being propagated +instantly\&. + +This makes it a perfect fit for X2Go\&. + +Unfortunately, currently every desktop environment implements and provides its +own settings daemon\&. Settings are not being shared and changes are contained to +the very desktop environment they have been undertaken in\&. + +Thus, diverging settings for different desktop environments even on the same +system are very common\&. + +\fBx2goserver-xsettings\fP aims to provide generic solutions whenever possible\&. + +For this reason \fBxsettingsd\fP has been adopted as the tool of choice to +provide \fBXSETTINGS\fP support\&. It has no run time dependencies other than the +C++ run time it has been built against\&. Settings are read from a plain text +file\&. + +This package provides hooks for starting \fBxsettingsd\fP\&. +.SH "CONFIGURATION" +\fBxsettingsd\fP uses plain text files as configuration storage\&. A default +configuration handling issues with GTK-based applications is shipped as +\fI@@SYSCONFDIR@@/xsettings\&.conf\fP\&. Edit the file to suit your needs\&. + +More sophisticated configuration handling is scheduled to be implemented at a +later date and this documentation updated accordingly\&. +.SH "SEE ALSO" +\fIxsettingsd\fP(1) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git