Skip to content

Commit 7f4b314

Browse files
Needed to rename the: koi.desktop file to: local.KoiDbusInterface.desktop at install time in accordance with DBus service integration and its interfaces - Added parameter: DBusActivatable=true; added Implements=* line to specify what DBus interfaces/methods Koi provides, in the Koi.DESKTOP file. This was very tricky to get it without errors . . . !
1 parent 2fb480c commit 7f4b314

File tree

8 files changed

+28
-14
lines changed

8 files changed

+28
-14
lines changed

development/distributions/Arch_Linux/PKGBUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ build() {
2626
}
2727

2828
check() {
29-
desktop-file-validate "${srcdir}/${_pkgname}-${pkgver}/src/${_pkgname}.desktop"
29+
desktop-file-validate "${srcdir}/${_pkgname}-${pkgver}/src/local.${_pkgname}DbusInterface.desktop"
3030
fdupes -r -s "${srcdir}/"
3131
}
3232

3333
package() {
3434
cmake --install "${srcdir}/${_pkgname}-${pkgver}/build/"
3535

36-
install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/src/${_pkgname}.desktop" \
36+
install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/src/local.${_pkgname}DbusInterface.desktop" \
3737
-t "${pkgdir}/usr/share/applications/"
3838

39-
desktop-file-validate "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
39+
desktop-file-validate "${pkgdir}/usr/share/applications/local.${_pkgname}DbusInterface.desktop"
4040
fdupes -r -s "${pkgdir}/"
4141
}

development/distributions/Debian.12+Ubuntu.22.04-/debian/patches/01_QT-5-Build.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/CMakeLists.txt
22
+++ b/src/CMakeLists.txt
3-
@@ -25,10 +25,10 @@
3+
@@ -35,10 +35,10 @@
44
set(THREADS_PREFER_PTHREAD_FLAG ON)
55
find_package(Threads REQUIRED)
66

@@ -15,7 +15,7 @@
1515
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus Gui Network)
1616
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Widgets)
1717
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Xml)
18-
@@ -88,10 +88,10 @@
18+
@@ -98,10 +98,10 @@
1919
)
2020

2121
target_link_libraries(koi PUBLIC

development/distributions/Fedora/koi.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ It supports running custom Bash scripts and provides a full DBus service integra
5353
%cmake_install
5454

5555
%check
56-
desktop-file-validate "%{buildroot}/%{_datadir}/applications/%{name}.desktop"
56+
desktop-file-validate "%{buildroot}/%{_datadir}/applications/local.%{original_name}DbusInterface.desktop"
5757
%fdupes -s %{buildroot}/
5858

5959
%files
@@ -62,7 +62,7 @@ desktop-file-validate "%{buildroot}/%{_datadir}/applications/%{name}.desktop"
6262

6363
"%{_bindir}/%{name}"
6464

65-
"%{_datadir}/applications/%{name}.desktop"
65+
"%{_datadir}/applications/local.%{original_name}DbusInterface.desktop"
6666
"%{_datadir}/dbus-1/interfaces/dev.baduhai.%{original_name}.xml"
6767
%{_datadir}/icons/hicolor/scalable/apps/{%{name}.svg,%{name}_tray.svg}
6868

development/distributions/SUSE/koi.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pushd src
7474
popd
7575

7676
%check
77-
desktop-file-validate "%{buildroot}/%{_datadir}/applications/koi.desktop"
77+
desktop-file-validate "%{buildroot}/%{_datadir}/applications/local.%{original_name}DbusInterface.desktop"
7878
%fdupes -s %{buildroot}
7979

8080
%files
@@ -83,7 +83,7 @@ desktop-file-validate "%{buildroot}/%{_datadir}/applications/koi.desktop"
8383

8484
"%{_bindir}/%{name}"
8585

86-
"%{_datadir}/applications/%{name}.desktop"
86+
"%{_datadir}/applications/local.%{original_name}DbusInterface.desktop"
8787
"%{_datadir}/dbus-1/interfaces/dev.baduhai.%{original_name}.xml"
8888
%{_datadir}/icons/hicolor/scalable/apps/{%{name}.svg,%{name}_tray.svg}
8989

src/CMakeLists.txt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,24 @@ set(CMAKE_AUTOUIC ON)
1313
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
1414
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
1515
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
16+
17+
# Define Installation Data-Root Directory
18+
set(CMAKE_INSTALL_DATAROOTDIR share)
1619
# Define *SYSTEM-WIDE* DBUS_INTERFACES_INSTALL_DIR variable
1720
set(DBUS_INTERFACES_INSTALL_DIR share/dbus-1/interfaces)
21+
# Define *SYSTEM-WIDE* DBUS_SERVICES_INSTALL_DIR variable
22+
set(DBUS_SERVICES_INSTALL_DIR share/dbus-1/services)
23+
24+
# Configure DBus Service File
25+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/dbus/services/dev.baduhai.Koi.service ${CMAKE_CURRENT_BINARY_DIR}/dev.baduhai.Koi.service)
1826

1927
# Install files not being a part of INSTALL TARGETS section
20-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dev.baduhai.Koi.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
21-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dev.baduhai.Koi.desktop DESTINATION share/applications)
22-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/koi.svg DESTINATION share/icons/hicolor/scalable/apps)
23-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/koi_tray.svg DESTINATION share/icons/hicolor/scalable/apps)
28+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dev.baduhai.Koi.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
29+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/koi.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
30+
RENAME local.KoiDbusInterface.desktop)
31+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/dbus/services/dev.baduhai.Koi.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
32+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/koi.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
33+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/koi_tray.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
2434

2535
set(THREADS_PREFER_PTHREAD_FLAG ON)
2636
find_package(Threads REQUIRED)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[D-BUS Service]
2+
Name=dev.baduhai.Koi
3+
Exec=koi

src/resources/resources.qrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<RCC>
22
<qresource prefix="/resources">
3+
<file>dbus/services/dev.baduhai.Koi.service</file>
34
<file>icons/koi.svg</file>
45
<file>icons/koi_tray.svg</file>
56
<file>icons/koi_tray.png</file>
67
<file>icons/koi.png</file>
7-
<file>sunrise-library.properties</file>
88
<file>license.txt</file>
9+
<file>sunrise-library.properties</file>
910
</qresource>
1011
</RCC>

0 commit comments

Comments
 (0)