Browse Source

Revert trying to make jack auto-start for 14.04

KDE + 14.04 it's the only one with the issue, all other distros  are fine
tags/v0.9.0
falkTX 9 years ago
parent
commit
b987dc955c
3 changed files with 1 additions and 16 deletions
  1. +1
    -3
      Makefile
  2. +0
    -5
      data/99cadence-session-start
  3. +0
    -8
      data/autostart/cadence-session-start.desktop

+ 1
- 3
Makefile View File

@@ -87,7 +87,6 @@ install:
# Create directories
install -d $(DESTDIR)$(PREFIX)/bin/
install -d $(DESTDIR)$(PREFIX)/share/applications/
install -d $(DESTDIR)$(PREFIX)/share/autostart/
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
@@ -118,8 +117,7 @@ install:
$(DESTDIR)$(PREFIX)/bin/

# Install desktop files
install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/
install -m 644 data/autostart/*.desktop $(DESTDIR)$(PREFIX)/share/autostart/
install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/

# Install icons, 16x16
install -m 644 resources/16x16/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/


+ 0
- 5
data/99cadence-session-start View File

@@ -1,14 +1,9 @@
# Cadence Session Startup
# Part 2 - Start JACK (or not), according to user settings

# Do not use this for KDE
if [ ! -z "$KDEDIRS" ]; then

INSTALL_PREFIX="X-PREFIX-X"

CADENCE_SESSION="$INSTALL_PREFIX/bin/cadence-session-start --system-start"
exec $CADENCE_SESSION &

unset INSTALL_PREFIX

fi

+ 0
- 8
data/autostart/cadence-session-start.desktop View File

@@ -1,8 +0,0 @@
[Desktop Entry]
Type=Service
Icon=cadence
Exec=cadence-session-start --system-start
X-KDE-StartupNotify=false
OnlyShowIn=KDE;
Name=Cadence session startup
Hidden=false

Loading…
Cancel
Save