Update package version to 4.3.0
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: libqtxdg
|
name: libqtxdg
|
||||||
description: Qt implementation of freedesktop.org xdg specs
|
description: Qt implementation of freedesktop.org xdg specs
|
||||||
version: 4.2.0
|
version: 4.3.0
|
||||||
revision: 3
|
revision: 1
|
||||||
url: https://github.com/lxqt/libqtxdg
|
url: https://github.com/lxqt/libqtxdg
|
||||||
license: LGP2.1-or-later
|
license: LGP2.1-or-later
|
||||||
architecture: any
|
architecture: any
|
||||||
@@ -16,4 +16,4 @@ downloads:
|
|||||||
- url: https://github.com/lxqt/libqtxdg/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz
|
- url: https://github.com/lxqt/libqtxdg/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz
|
||||||
extract_to: ${BPM_SOURCE}
|
extract_to: ${BPM_SOURCE}
|
||||||
extract_strip_components: 1
|
extract_strip_components: 1
|
||||||
checksum: 15925adba9deba7859557f995a57b2caa1e7425f4da4e67ce148608d65ecf6f9
|
checksum: 2a19343cffaa869d5001ef8087781beedb25b3f2ebe29f202728a9dc86aaacc8
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
From b01a024921acdfd5b0e97d5fda2933c726826e99 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jimi Huotari <[email protected]>
|
|
||||||
Date: Tue, 17 Jun 2025 08:52:44 +0300
|
|
||||||
Subject: [PATCH] cmake: fix build with Qt 6.10
|
|
||||||
|
|
||||||
The 'Qt6FooPrivate' targets have been split into separate CMake files
|
|
||||||
in Qt 6.9, and require a 'find_package(Qt6FooPrivate)' call starting
|
|
||||||
with Qt 6.10.
|
|
||||||
|
|
||||||
See also: https://bugreports.qt.io/browse/QTBUG-87776
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 4 ++++
|
|
||||||
src/qtxdg/CMakeLists.txt | 2 ++
|
|
||||||
src/xdgiconloader/CMakeLists.txt | 2 ++
|
|
||||||
src/xdgiconloader/plugin/CMakeLists.txt | 2 ++
|
|
||||||
4 files changed, 10 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 7007a121..c12afec5 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -27,6 +27,10 @@ find_package(Qt6 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets Svg Xml DBus)
|
|
||||||
find_package(GLIB ${GLIB_MINIMUM_VERSION} REQUIRED COMPONENTS gobject gio gio-unix)
|
|
||||||
find_package(XTerm)
|
|
||||||
|
|
||||||
+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
|
|
||||||
+ find_package(Qt6GuiPrivate ${QT_MINIMUM_VERSION} REQUIRED)
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
include(GNUInstallDirs) # Standard directories for installation
|
|
||||||
include(CMakePackageConfigHelpers)
|
|
||||||
include(GenerateExportHeader)
|
|
||||||
diff --git a/src/qtxdg/CMakeLists.txt b/src/qtxdg/CMakeLists.txt
|
|
||||||
index edd37416..2e8e8482 100644
|
|
||||||
--- a/src/qtxdg/CMakeLists.txt
|
|
||||||
+++ b/src/qtxdg/CMakeLists.txt
|
|
||||||
@@ -78,6 +78,8 @@ add_library(${QTXDGX_LIBRARY_NAME} SHARED
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(${QTXDGX_LIBRARY_NAME}
|
|
||||||
+ PRIVATE
|
|
||||||
+ Qt6::GuiPrivate
|
|
||||||
PUBLIC
|
|
||||||
${QTX_LIBRARIES}
|
|
||||||
${QTXDGX_ICONLOADER_LIBRARY_NAME}
|
|
||||||
diff --git a/src/xdgiconloader/CMakeLists.txt b/src/xdgiconloader/CMakeLists.txt
|
|
||||||
index fba72e98..1bcae060 100644
|
|
||||||
--- a/src/xdgiconloader/CMakeLists.txt
|
|
||||||
+++ b/src/xdgiconloader/CMakeLists.txt
|
|
||||||
@@ -50,6 +50,8 @@ target_include_directories(${QTXDGX_ICONLOADER_LIBRARY_NAME}
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(${QTXDGX_ICONLOADER_LIBRARY_NAME}
|
|
||||||
+ PRIVATE
|
|
||||||
+ Qt6::GuiPrivate
|
|
||||||
PUBLIC
|
|
||||||
Qt6::Gui
|
|
||||||
Qt6::Svg
|
|
||||||
diff --git a/src/xdgiconloader/plugin/CMakeLists.txt b/src/xdgiconloader/plugin/CMakeLists.txt
|
|
||||||
index 04564c47..1c37011c 100644
|
|
||||||
--- a/src/xdgiconloader/plugin/CMakeLists.txt
|
|
||||||
+++ b/src/xdgiconloader/plugin/CMakeLists.txt
|
|
||||||
@@ -11,6 +11,8 @@ target_compile_definitions(${QTXDGX_ICONENGINEPLUGIN_LIBRARY_NAME}
|
|
||||||
"QT_NO_KEYWORDS"
|
|
||||||
)
|
|
||||||
target_link_libraries(${QTXDGX_ICONENGINEPLUGIN_LIBRARY_NAME}
|
|
||||||
+ PRIVATE
|
|
||||||
+ Qt6::GuiPrivate
|
|
||||||
PUBLIC
|
|
||||||
Qt6::Gui
|
|
||||||
"${QTXDGX_ICONLOADER_LIBRARY_NAME}"
|
|
||||||
@@ -2,13 +2,6 @@
|
|||||||
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
||||||
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
||||||
|
|
||||||
# The prepare function is executed in the root of the temp directory
|
|
||||||
# This function is used for putting downloaded files to the correct location or applying patches
|
|
||||||
prepare() {
|
|
||||||
cd "$BPM_SOURCE"
|
|
||||||
patch -Np1 -i "$BPM_WORKDIR"/qt-6.10.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
# The build function is executed in the source directory
|
# The build function is executed in the source directory
|
||||||
# This function is used to compile the source code
|
# This function is used to compile the source code
|
||||||
build() {
|
build() {
|
||||||
|
|||||||
Reference in New Issue
Block a user