From 697a0d5f8d9c090efea98553d683445fea9f3ba2 Mon Sep 17 00:00:00 2001 From: zlice Date: Mon, 23 Oct 2023 11:02:09 -0400 Subject: [PATCH 1/2] qt6ct: update to 0.9. --- srcpkgs/qt6ct/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template index 731ebfa7aaf366..3b0d91b37474be 100644 --- a/srcpkgs/qt6ct/template +++ b/srcpkgs/qt6ct/template @@ -1,7 +1,7 @@ # Template file for 'qt6ct' pkgname=qt6ct -version=0.8 -revision=2 +version=0.9 +revision=1 build_style=cmake hostmakedepends="qt6-tools qt6-base" makedepends="qt6-base-devel" @@ -11,7 +11,7 @@ maintainer="Adam Pschorr " license="BSD-2-Clause" homepage="https://github.com/trialuser02/qt6ct" distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz" -checksum=ca3706770cbdbce769ee4393de9f7469be043810fe40283690612f5f6552018a +checksum=aa49c4fb51a82dd6947cd9c8dee9b3a1fdd4fbbc9f3c8c5c2d33fa1de9e8826e post_install() { vlicense COPYING From 38165fc2d1d86018b9482f01eda20d49e3c1b25b Mon Sep 17 00:00:00 2001 From: zlice Date: Sat, 9 Dec 2023 13:57:33 -0500 Subject: [PATCH 2/2] qt6ct: update to 0.9. --- srcpkgs/qt6ct/patches/lib32.patch | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/srcpkgs/qt6ct/patches/lib32.patch b/srcpkgs/qt6ct/patches/lib32.patch index cdaff4d1fa7ae4..c44bb8e2bdd055 100644 --- a/srcpkgs/qt6ct/patches/lib32.patch +++ b/srcpkgs/qt6ct/patches/lib32.patch @@ -1,21 +1,18 @@ ---- a/CMakeLists.txt 2023-03-12 12:57:50.000000000 +0100 -+++ - 2023-10-31 20:41:33.141463182 +0100 -@@ -40,17 +40,7 @@ - message(FATAL_ERROR "Could NOT find lrelease executable") +--- a/CMakeLists.txt 2023-12-09 13:53:39.723972612 -0500 ++++ b/CMakeLists.txt 2023-12-09 13:54:10.126651729 -0500 +@@ -50,14 +50,7 @@ + endif() endif() --get_filename_component(QT_QTPATHS_EXECUTABLE ${QT_LRELEASE_EXECUTABLE} DIRECTORY) --set(QT_QTPATHS_EXECUTABLE ${QT_QTPATHS_EXECUTABLE}/qtpaths) +-#execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} -query QT_INSTALL_PLUGINS OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} --plugin-dir OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE) - --if(EXISTS ${QT_QTPATHS_EXECUTABLE}) -- message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) +-if(PLUGINDIR) +- message(STATUS "Plugin path: ${PLUGINDIR}") -else() -- message(FATAL_ERROR "Could NOT find qtpaths executable") +- message(FATAL_ERROR "Could not get plugin path") -endif() -- --#execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} -query QT_INSTALL_PLUGINS OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} --plugin-dir OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE) +set(PLUGINDIR /usr/${QT6_INSTALL_PLUGINS}) - message(STATUS "Plugin path: " ${PLUGINDIR}) - message(STATUS "Generating translations ...") + if(Qt6LinguistTools_FOUND) + message(STATUS "Generating translations ...")