mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-09 15:13:31 -04:00
2bf0a59e34
Upstream now uses CRLF for line endings, so lots of updates. Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
103 lines
4.2 KiB
Diff
103 lines
4.2 KiB
Diff
From af69af7f294aff5073cd5cbab64d2f4d0f5a0c73 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Golubev <fatzer2@gmail.com>
|
|
Date: Wed, 23 Jul 2025 20:38:29 +0300
|
|
Subject: [PATCH 3/3] Fix translation install path on *nix
|
|
|
|
On *nix translations canonically go into <prefix>/share/<project_name>
|
|
rather than <prefix>/bin.
|
|
|
|
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
|
|
---
|
|
CMakeLists.txt | 15 +++++++++------
|
|
.../sources/pdfapplicationtranslator.cpp | 4 +++-
|
|
config.h.cmake | 1 +
|
|
3 files changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a5a6961..4a26037 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -139,14 +139,19 @@ endif()
|
|
|
|
if(PDF4QT_LINUX)
|
|
set(PDF4QT_PLUGINS_DIR ${PDF4QT_INSTALL_LIB_DIR}/pdf4qt)
|
|
+ set(PDF4QT_INSTALL_TRANS_DIR ${PDF4QT_INSTALL_SHARE_DIR}/pdf4qt/translations)
|
|
else()
|
|
set(PDF4QT_PLUGINS_DIR ${PDF4QT_INSTALL_LIB_DIR}/pdfplugins)
|
|
+ set(PDF4QT_INSTALL_TRANS_DIR ${PDF4QT_INSTALL_BIN_DIR}/translations)
|
|
endif()
|
|
|
|
# Relative paths are used by the config
|
|
cmake_path(RELATIVE_PATH PDF4QT_PLUGINS_DIR
|
|
BASE_DIRECTORY "${PDF4QT_INSTALL_BIN_DIR}"
|
|
OUTPUT_VARIABLE PDF4QT_PLUGINS_RELATIVE_PATH)
|
|
+cmake_path(RELATIVE_PATH PDF4QT_INSTALL_TRANS_DIR
|
|
+ BASE_DIRECTORY "${PDF4QT_INSTALL_BIN_DIR}"
|
|
+ OUTPUT_VARIABLE PDF4QT_TRANSLATIONS_RELATIVE_PATH)
|
|
configure_file(config.h.cmake config.h)
|
|
|
|
add_subdirectory(Pdf4QtLibCore)
|
|
@@ -196,7 +201,7 @@ qt_collect_translation_source_targets(i18n_targets)
|
|
message("CMAKE_TRANSLATION_TARGETS = " ${i18n_targets})
|
|
|
|
set(PDF4QT_TRANSLATION_TS_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations)
|
|
-set(PDF4QT_TRANSLATION_QM_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PDF4QT_INSTALL_BIN_DIR}/translations)
|
|
+set(PDF4QT_TRANSLATION_QM_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PDF4QT_INSTALL_TRANS_DIR})
|
|
|
|
message("PDF4QT_TRANSLATION_TS_OUTPUT_DIRECTORY" ${PDF4QT_TRANSLATION_TS_OUTPUT_DIRECTORY})
|
|
message("PDF4QT_TRANSLATION_QM_OUTPUT_DIRECTORY" ${PDF4QT_TRANSLATION_QM_OUTPUT_DIRECTORY})
|
|
@@ -207,7 +212,7 @@ qt_add_translations(TARGETS Pdf4QtEditor Pdf4QtViewer Pdf4QtPageMaster Pdf4QtDif
|
|
LUPDATE_OPTIONS -no-obsolete
|
|
TS_OUTPUT_DIRECTORY ${PDF4QT_TRANSLATION_TS_OUTPUT_DIRECTORY}
|
|
QM_OUTPUT_DIRECTORY ${PDF4QT_TRANSLATION_QM_OUTPUT_DIRECTORY}
|
|
- QM_FILES_OUTPUT_VARIABLE pdf4qt_qm_files)
|
|
+ QM_FILES_OUTPUT_VARIABLE PDF4QT_QM_FILES)
|
|
|
|
if(WIN32)
|
|
set(PDF4QT_LUPDATE_TARGET "${PROJECT_NAME}_lupdate")
|
|
@@ -227,10 +232,8 @@ message("CMAKE_TOOLCHAIN_FILE = " ${CMAKE_TOOLCHAIN_FILE})
|
|
configure_file(version.txt.in version.txt)
|
|
|
|
if(NOT PDF4QT_BUILD_ONLY_CORE_LIBRARY)
|
|
- install(DIRECTORY ${PDF4QT_TRANSLATION_QM_OUTPUT_DIRECTORY}
|
|
- RUNTIME DESTINATION ${PDF4QT_INSTALL_BIN_DIR}
|
|
- FILES_MATCHING
|
|
- PATTERN *.qm)
|
|
+ install(FILES ${PDF4QT_QM_FILES}
|
|
+ DESTINATION ${PDF4QT_INSTALL_TRANS_DIR})
|
|
|
|
if(WIN32)
|
|
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Desktop/44x44/
|
|
diff --git a/Pdf4QtLibCore/sources/pdfapplicationtranslator.cpp b/Pdf4QtLibCore/sources/pdfapplicationtranslator.cpp
|
|
index 4f40e62..a03f39e 100644
|
|
--- a/Pdf4QtLibCore/sources/pdfapplicationtranslator.cpp
|
|
+++ b/Pdf4QtLibCore/sources/pdfapplicationtranslator.cpp
|
|
@@ -27,6 +27,8 @@
|
|
#include <QMetaEnum>
|
|
#include <QCoreApplication>
|
|
|
|
+#include "config.h"
|
|
+
|
|
namespace pdf
|
|
{
|
|
|
|
@@ -48,7 +50,7 @@ PDFApplicationTranslator::ELanguage PDFApplicationTranslator::getLanguage() cons
|
|
void PDFApplicationTranslator::installTranslator()
|
|
{
|
|
QDir applicationDirectory(QCoreApplication::applicationDirPath());
|
|
- applicationDirectory.cd("translations");
|
|
+ applicationDirectory.cd(PDF4QT_TRANSLATIONS_RELATIVE_PATH);
|
|
QString translationPath = applicationDirectory.absolutePath();
|
|
|
|
Q_ASSERT(!m_translator);
|
|
diff --git a/config.h.cmake b/config.h.cmake
|
|
index 3d68799..30325bb 100644
|
|
--- a/config.h.cmake
|
|
+++ b/config.h.cmake
|
|
@@ -1 +1,2 @@
|
|
#define PDF4QT_PLUGINS_RELATIVE_PATH "@PDF4QT_PLUGINS_RELATIVE_PATH@"
|
|
+#define PDF4QT_TRANSLATIONS_RELATIVE_PATH "@PDF4QT_TRANSLATIONS_RELATIVE_PATH@"
|
|
--
|
|
2.53.0
|
|
|