[packages/cantata] take lrelease path from cmake config
atler
atler at pld-linux.org
Thu Jan 21 20:33:55 CET 2021
commit d6c8e6d3365afab3384bc598ff3b5a2dd6ec9815
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Jan 21 20:33:12 2021 +0100
take lrelease path from cmake config
cantata-lrelease.patch | 38 ++++++++++++++++++++++++++++++++++++++
cantata.spec | 2 ++
2 files changed, 40 insertions(+)
---
diff --git a/cantata.spec b/cantata.spec
index 30aeb68..82c2ee5 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -16,6 +16,7 @@ Group: Applications/Multimedia
# https://github.com/CDrummond/cantata/releases
Source0: https://github.com/CDrummond/cantata/releases/download/v%{version}/%{name}-%{version}.tar.bz2
# Source0-md5: 83b6a2504f1fa40e88d06272aab9f512
+Patch0: %{name}-lrelease.patch
Patch101: system-qtiocompressor.patch
Patch105: icons_crash.patch
Patch106: libdir.patch
@@ -93,6 +94,7 @@ Features:
%prep
%setup -q
+%patch0 -p1
%patch101 -p1
rm -rfv 3rdparty/{qjson,qtiocompressor}
diff --git a/cantata-lrelease.patch b/cantata-lrelease.patch
new file mode 100644
index 0000000..6211adb
--- /dev/null
+++ b/cantata-lrelease.patch
@@ -0,0 +1,38 @@
+From 6546d9d7f9c2c45e49752a829f0def1930703de0 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler at pld-linux.org>
+Date: Thu, 21 Jan 2021 20:23:20 +0100
+Subject: [PATCH] Take lrelease path from cmake config instead of relying on
+ fixed paths
+
+---
+ translations/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
+index e278865c..61ab93cd 100644
+--- a/translations/CMakeLists.txt
++++ b/translations/CMakeLists.txt
+@@ -4,9 +4,9 @@ foreach (TS_FILE ${TS_FILES})
+ list(APPEND CANTATA_TRANS "${TRANS}")
+ endforeach ()
+
+-find_program(LRELEASE_EXECUTABLE lrelease PATHS /usr/lib64/qt5/bin/)
++find_package(Qt5LinguistTools ${QT_MIN_VERSION} QUIET)
+
+-if (LRELEASE_EXECUTABLE)
++if (Qt5LinguistTools_FOUND)
+ set(catalogname cantata)
+ add_custom_target(translations ALL)
+ foreach(TRANS ${CANTATA_TRANS})
+@@ -14,7 +14,7 @@ if (LRELEASE_EXECUTABLE)
+ set(CUR_TS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${TRANS}.ts)
+ set(CUR_QM_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TRANS}.qm)
+ add_custom_command(TARGET translations
+- COMMAND ${LRELEASE_EXECUTABLE} ARGS ${CUR_TS_FILE} -qm ${CUR_QM_FILE}
++ COMMAND ${Qt5_LRELEASE_EXECUTABLE} ARGS ${CUR_TS_FILE} -qm ${CUR_QM_FILE}
+ DEPENDS ${CUR_TS_FILE})
+ if (WIN32)
+ install(FILES ${CUR_QM_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/translations/)
+--
+2.30.0
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cantata.git/commitdiff/d6c8e6d3365afab3384bc598ff3b5a2dd6ec9815
More information about the pld-cvs-commit
mailing list