diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-25 00:45:13 -0500 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-25 00:45:13 -0500 |
commit | 2ed37ce8cf392da2379484bd4d5bf8f7eb99d593 (patch) | |
tree | 0ead6c1d58e510197acba3e0071fd4e2baa62cfc /user/tigervnc/use-intltool.patch | |
parent | a4418a8ff0218e50df62db514d05a7cbeda5550b (diff) | |
download | packages-2ed37ce8cf392da2379484bd4d5bf8f7eb99d593.tar.gz packages-2ed37ce8cf392da2379484bd4d5bf8f7eb99d593.tar.bz2 packages-2ed37ce8cf392da2379484bd4d5bf8f7eb99d593.tar.xz packages-2ed37ce8cf392da2379484bd4d5bf8f7eb99d593.zip |
user/tigervnc: bump to 1.9.0, fix for gettext-tiny
Diffstat (limited to 'user/tigervnc/use-intltool.patch')
-rw-r--r-- | user/tigervnc/use-intltool.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/user/tigervnc/use-intltool.patch b/user/tigervnc/use-intltool.patch new file mode 100644 index 000000000..930bf21eb --- /dev/null +++ b/user/tigervnc/use-intltool.patch @@ -0,0 +1,32 @@ +--- tigervnc-1.9.0/vncviewer/CMakeLists.txt.old 2018-07-16 14:08:55.000000000 +0000 ++++ tigervnc-1.9.0/vncviewer/CMakeLists.txt 2018-07-25 05:43:25.670000000 +0000 +@@ -66,14 +66,7 @@ + + configure_file(vncviewer.desktop.in.in vncviewer.desktop.in) + find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge) +- if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99) +- add_custom_command(OUTPUT vncviewer.desktop +- COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} +- --desktop --template vncviewer.desktop.in +- -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in +- ) +- elseif(INTLTOOL_MERGE_EXECUTABLE) ++ if(INTLTOOL_MERGE_EXECUTABLE) + add_custom_command(OUTPUT vncviewer.desktop + COMMAND sed -e 's/^Name/_Name/' + -e 's/^GenericName/_GenericName/' +@@ -84,6 +77,13 @@ + vncviewer.desktop.intl vncviewer.desktop + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in + ) ++ elseif("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99) ++ add_custom_command(OUTPUT vncviewer.desktop ++ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} ++ --desktop --template vncviewer.desktop.in ++ -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in ++ ) + else() + add_custom_command(OUTPUT vncviewer.desktop + COMMAND cp vncviewer.desktop.in vncviewer.desktop |