forked from phuang/ibus
-
Notifications
You must be signed in to change notification settings - Fork 177
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
src/services: Add org.freedesktop.IBus.session.generic.service
Move bus/*.service.in & src/*.service.in into bus/services BUG=#2381
- Loading branch information
Showing
7 changed files
with
112 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # vim:set noet ts=4: | ||
| # | ||
| # ibus - The Input Bus | ||
| # | ||
| # Copyright (c) 2022 Takao Fujiwara <takao.fujiwara1@gmail.com> | ||
| # Copyright (c) 2022 Red Hat, Inc. | ||
| # | ||
| # This library is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU Lesser General Public | ||
| # License as published by the Free Software Foundation; either | ||
| # version 2.1 of the License, or (at your option) any later version. | ||
| # | ||
| # This library 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 | ||
| # Lesser General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU Lesser General Public | ||
| # License along with this library; if not, write to the Free Software | ||
| # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 | ||
| # USA | ||
|
|
||
| NULL = | ||
|
|
||
| # Originally this D-Bus service file was added for GNOME but seems not to | ||
| # be used at present. | ||
| # | ||
| # TODO: Check if flatpack uses this file and we could delete | ||
| # org.freedesktop.IBus.service file in the future. | ||
| dbusservice_in_files = org.freedesktop.IBus.service.in | ||
| dbusservice_DATA = $(dbusservice_in_files:.service.in=.service) | ||
| dbusservicedir=${datadir}/dbus-1/services | ||
|
|
||
| systemdservice_in_files = \ | ||
| org.freedesktop.IBus.session.generic.service.in \ | ||
| org.freedesktop.IBus.session.GNOME.service.in \ | ||
| $(NULL) | ||
|
|
||
| %.service: %.service.in | ||
| $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" \ | ||
| -e "s|\@xim_cli_arg\@|$(XIM_CLI_ARG)|" $< > $@.tmp && \ | ||
| mv $@.tmp $@ | ||
|
|
||
| if ENABLE_SYSTEMD | ||
| systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) | ||
| systemdservicedir = $(SYSTEMD_USER_UNIT_DIR) | ||
|
|
||
| # in install-data-hook. | ||
| install-data-hook: | ||
| $(MKDIR_P) "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants/" | ||
| ( \ | ||
| cd "$(DESTDIR)$(SYSTEMD_USER_UNIT_DIR)/gnome-session.target.wants" ; \ | ||
| $(LN_S) -f "../org.freedesktop.IBus.session.GNOME.service" .; \ | ||
| ) | ||
| $(NULL) | ||
| endif | ||
|
|
||
| EXTRA_DIST = \ | ||
| $(dbusservice_in_files) \ | ||
| $(systemdservice_in_files) \ | ||
| $(NULL) | ||
|
|
||
| CLEANFILES = \ | ||
| $(dbusservice_DATA) \ | ||
| $(systemdservice_DATA) \ | ||
| $(NULL) | ||
|
|
||
| -include $(top_srcdir)/git.mk |
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...freedesktop.IBus.session.GNOME.service.in → ...freedesktop.IBus.session.GNOME.service.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
bus/services/org.freedesktop.IBus.session.generic.service.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| [Unit] | ||
| Description=IBus Daemon for generic sessions | ||
| CollectMode=inactive-or-failed | ||
|
|
||
| # Never run in GNOME | ||
| Conflicts=gnome-session-initialized.target | ||
|
|
||
| [Service] | ||
| Type=dbus | ||
| # Only pull --xim in X11 session, it is done via Xwayland-session.d on Wayland | ||
| ExecStart=sh -c '@bindir@/ibus-daemon $IBUS_DAEMON_ARGS' | ||
| Restart=on-abnormal | ||
| BusName=org.freedesktop.IBus | ||
| TimeoutStopSec=5 | ||
| Slice=session.slice |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters