diff --git a/CMakeLists.txt b/CMakeLists.txt index c7697fb4..8dcd7091 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,5 +38,10 @@ plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel) plasma_install_package(shell org.kde.satellite.phone shells) install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers") +configure_file(${CMAKE_SOURCE_DIR}/bin/plasma-phone.cmake ${CMAKE_BINARY_DIR}/plasma-phone) +install(FILES ${CMAKE_BINARY_DIR}/plasma-phone + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ GROUP_EXECUTE GROUP_READ + DESTINATION ${BIN_INSTALL_DIR}) + add_subdirectory(qmlcomponents) diff --git a/bin/plasma-phone.cmake b/bin/plasma-phone.cmake new file mode 100644 index 00000000..0e081fef --- /dev/null +++ b/bin/plasma-phone.cmake @@ -0,0 +1,16 @@ +#!/bin/sh +# +# Script that starts the Plasma phone UI. +# +# Copyright (C) 2014 Pier Luigi Fiorini +# +# This program 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. +# + +@CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv +@CMAKE_INSTALL_FULL_BINDIR@/kbuildsycoca5 +LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper +@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.satellite.phone -n diff --git a/packaging/plasma-phone-components.spec b/packaging/plasma-phone-components.spec index f0f63a59..6b223359 100644 --- a/packaging/plasma-phone-components.spec +++ b/packaging/plasma-phone-components.spec @@ -68,15 +68,6 @@ rm -rf %{buildroot} # >> install post # Script that runs the UI -mkdir -p %{buildroot}%{_bindir} -cat > %{buildroot}%{_bindir}/plasma-phone << EOF -#!/bin/sh -/usr/bin/kded5 & -sleep 2 -/usr/bin/plasmashell -p org.kde.satellite.phone -n -EOF -chmod 755 %{buildroot}%{_bindir}/plasma-phone - # File with environment variables, used by compositor systemd unit mkdir -p %{buildroot}%{_sharedstatedir}/environment/greenisland cat > %{buildroot}%{_sharedstatedir}/environment/greenisland/greenisland.conf <