diff options
author | Robert Tari | 2019-03-04 06:09:27 +0100 |
---|---|---|
committer | Robert Tari | 2019-03-04 06:09:27 +0100 |
commit | e9425fbcb6c0f02c6e9b0f71a4e326d882cafe48 (patch) | |
tree | 5d1a1e8dc20053acd530ecce684e2f24645b87d2 /0001-Make-systemd-optional.-If-systemd-is-not-available-a.patch | |
download | aur-e9425fbcb6c0f02c6e9b0f71a4e326d882cafe48.tar.gz |
Initial commit
Diffstat (limited to '0001-Make-systemd-optional.-If-systemd-is-not-available-a.patch')
-rw-r--r-- | 0001-Make-systemd-optional.-If-systemd-is-not-available-a.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/0001-Make-systemd-optional.-If-systemd-is-not-available-a.patch b/0001-Make-systemd-optional.-If-systemd-is-not-available-a.patch new file mode 100644 index 000000000000..18521f204b05 --- /dev/null +++ b/0001-Make-systemd-optional.-If-systemd-is-not-available-a.patch @@ -0,0 +1,58 @@ +From 2c6c3adc1871735f72eb48bda3fdf600d79b6d0a Mon Sep 17 00:00:00 2001 +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Date: Fri, 6 Oct 2017 11:53:45 +0200 +Subject: [PATCH 1/2] Make systemd optional. If systemd is not available at + build-time, the creation of the .service file is omitted. + +--- + configure.ac | 14 ++++++++++++-- + data/Makefile.am | 4 +++- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6bbb300..ac4b7c4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -50,8 +50,18 @@ PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) + PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) + +-SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` +-AC_SUBST(SYSTEMD_USERDIR) ++######################### ++# Check for systemd ++######################### ++PKG_CHECK_MODULES(SYSTEMD, systemd, ++ [has_systemd=yes], ++ [] ++) ++if test "x$has_systemd" = "xyes"; then ++ SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` ++ AC_SUBST(SYSTEMD_USERDIR) ++ AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicator-application.service for systemd]) ++fi + + ########################### + # gcov coverage reporting +diff --git a/data/Makefile.am b/data/Makefile.am +index f7cc652..96abc17 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -16,11 +16,13 @@ xdg_autostart_DATA = ayatana-indicator-application.desktop + overridedir = $(pkgdatadir) + override_DATA = ordering-override.keyfile + ++#if defined(HAVE_SYSTEMD) + %.service: %.service.in + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +- ++ + systemddir = $(SYSTEMD_USERDIR) + systemd_DATA = ayatana-indicator-application.service ++#endif + + upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart + upstartsystemdoverride_DATA = ayatana-indicator-application.override +-- +2.11.0 + |