1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From 91eb5f54f130dd5b397f4db483bce2de5547cb78 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Dec 2024 19:01:44 +0100
Subject: [PATCH 13/13] CMakeLists.txt: Fix click review issues
- desktop file paths to icons must be relative
- content-hub path in the manifest must exist
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
CMakeLists.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 389384f5..5c44dfcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,11 +56,12 @@ if(CLICK_MODE)
set(CLICK_MODE_ENABLED 1)
set(APP_HARDCODE "${PROJECT_NAME}")
set(DATA_DIR "${CMAKE_INSTALL_PREFIX}")
- set(ICON "${DATA_DIR}/assets/${ICON_FILE}")
- set(SPLASH "${DATA_DIR}/assets/${SPLASH_FILE}")
+ set(ICON "assets/${ICON_FILE}") # relative path for click
+ set(SPLASH "assets/${SPLASH_FILE}") # relative path for click
set(DESKTOP_DIR "${DATA_DIR}")
set(URLS_DIR "${DATA_DIR}")
set(CONTENTHUB_DIR "${DATA_DIR}")
+ set(CONTENTHUB_NAME "${APP_HARDCODE}.content-hub")
set(LOCALE_DIR "${DATA_DIR}/share/locale")
set(PUSH_DIR "${DATA_DIR}/push")
set(PUSH_EXEC "push")
@@ -73,6 +74,7 @@ else(CLICK_MODE)
set(DESKTOP_DIR "${CMAKE_INSTALL_FULL_DATADIR}/applications")
set(URLS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/lomiri-url-dispatcher/urls")
set(CONTENTHUB_DIR "${CMAKE_INSTALL_FULL_DATADIR}/lomiri-content-hub/peers/")
+ set(CONTENTHUB_NAME "${APP_HARDCODE}")
set(LOCALE_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
set(PUSH_DIR "${CMAKE_INSTALL_LIBDIR}/lomiri-push-service/legacy-helpers")
set(PUSH_EXEC "${APP_HARDCODE}")
@@ -121,7 +123,7 @@ if(CLICK_MODE)
install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})
endif(CLICK_MODE)
install(FILES ${PROJECT_NAME}.content-hub
- RENAME ${APP_HARDCODE}
+ RENAME ${CONTENTHUB_NAME}
DESTINATION ${CONTENTHUB_DIR})
install(FILES ${PROJECT_NAME}.url-dispatcher
RENAME ${APP_HARDCODE}.url-dispatcher
--
2.39.5
|
