From c14084f442e9b36da0de133278d6ace93a9cf448 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 9 Oct 2023 20:45:02 +0300 Subject: [PATCH] qt6ct-0.9 --- .../qt6ct/files/alpine/find_lrelease.patch | 25 +++++++++---------- desktop/toolkit/qt6/qt6ct/pspec.xml | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch b/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch index 9e823adcb3..25d2c563e0 100644 --- a/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch +++ b/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch @@ -1,13 +1,12 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe21597..1dd3266 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,7 +25,7 @@ ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DUSE_WIDGETS) - find_package(Qt6 COMPONENTS BuildInternals Widgets LinguistTools REQUIRED) - - #get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION) --get_target_property(QT_LRELEASE_EXECUTABLE Qt6::lrelease IMPORTED_LOCATION) -+set(QT_LRELEASE_EXECUTABLE /usr/lib/qt6/bin/lrelease) - - #if(QT_QTPATHS_EXECUTABLE) - # message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) +diff -Nuar a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2023-09-26 20:01:48.000000000 +0300 ++++ b/CMakeLists.txt 2023-10-09 20:42:41.404813883 +0300 +@@ -29,7 +29,7 @@ + get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION) + + if(Qt6LinguistTools_FOUND) +- get_target_property(QT_LRELEASE_EXECUTABLE Qt6::lrelease IMPORTED_LOCATION) ++ set(QT_LRELEASE_EXECUTABLE /usr/lib/qt6/bin/lrelease) + if(NOT QT_QTPATHS_EXECUTABLE AND QT_LRELEASE_EXECUTABLE) + get_filename_component(QT_LRELEASE_PATH ${QT_LRELEASE_EXECUTABLE} DIRECTORY) + set(QT_QTPATHS_EXECUTABLE ${QT_LRELEASE_PATH}/qtpaths) diff --git a/desktop/toolkit/qt6/qt6ct/pspec.xml b/desktop/toolkit/qt6/qt6ct/pspec.xml index 989586ca87..6a90515d3c 100644 --- a/desktop/toolkit/qt6/qt6ct/pspec.xml +++ b/desktop/toolkit/qt6/qt6ct/pspec.xml @@ -24,7 +24,7 @@ - + alpine/find_lrelease.patch