336a88a061
Resolves: bz#2175748 Restore "--fallbacktofreeport" option in the vncserver script Resolves: bz#2174398
52 lines
2.6 KiB
Diff
52 lines
2.6 KiB
Diff
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
|
|
index 052cfb3..c84fb0e 100644
|
|
--- a/po/CMakeLists.txt
|
|
+++ b/po/CMakeLists.txt
|
|
@@ -14,7 +14,6 @@ if (GETTEXT_XGETTEXT_EXECUTABLE)
|
|
${PROJECT_SOURCE_DIR}/vncviewer/*.h
|
|
${PROJECT_SOURCE_DIR}/vncviewer/*.cxx
|
|
${PROJECT_SOURCE_DIR}/vncviewer/*.desktop.in.in
|
|
- ${PROJECT_SOURCE_DIR}/vncviewer/*.metainfo.xml.in
|
|
)
|
|
|
|
add_custom_target(translations_update
|
|
diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt
|
|
index 15eac66..450b732 100644
|
|
--- a/vncviewer/CMakeLists.txt
|
|
+++ b/vncviewer/CMakeLists.txt
|
|
@@ -100,34 +100,6 @@ if(UNIX)
|
|
add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
|
|
|
|
- if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.19.6)
|
|
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
|
|
- COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
|
|
- --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
|
|
- -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
|
|
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
|
|
- )
|
|
- elseif(INTLTOOL_MERGE_EXECUTABLE)
|
|
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
|
|
- COMMAND sed -e 's@<name>@<_name>@\;s@</name>@</_name>@'
|
|
- -e 's@<summary>@<_summary>@\;s@</summary>@</_summary>@'
|
|
- -e 's@<caption>@<_caption>@\;s@</caption>@</_caption>@'
|
|
- -e 's@<p>@<_p>@g\;s@</p>@</_p>@g'
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in > org.tigervnc.vncviewer.metainfo.xml.intl
|
|
- COMMAND ${INTLTOOL_MERGE_EXECUTABLE}
|
|
- -x ${CMAKE_SOURCE_DIR}/po
|
|
- org.tigervnc.vncviewer.metainfo.xml.intl org.tigervnc.vncviewer.metainfo.xml
|
|
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
|
|
- )
|
|
- else()
|
|
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
|
|
- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in org.tigervnc.vncviewer.metainfo.xml
|
|
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
|
|
- )
|
|
- endif()
|
|
- add_custom_target(appstream ALL DEPENDS org.tigervnc.vncviewer.metainfo.xml)
|
|
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tigervnc.vncviewer.metainfo.xml DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo)
|
|
-
|
|
foreach(res 16 22 24 32 48 64 128)
|
|
install(FILES ../media/icons/tigervnc_${res}.png DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${res}x${res}/apps RENAME tigervnc.png)
|
|
endforeach()
|