diff --git a/pkg.info b/pkg.info index 34bf164..7a99110 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: lxqt-panel description: The LXQt desktop panel -version: 2.2.2 +version: 2.3.0 revision: 1 url: https://github.com/lxqt/lxqt-panel license: LGPL2.1-or-later @@ -34,4 +34,4 @@ downloads: - url: https://github.com/lxqt/lxqt-panel/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 114af04c49de56480594b6897bfdd2fcecc5bdc5d621ffd3b5a4f2918d11a9df + checksum: ad8cc568d7d0f2eb64c507d01e469a568cc079f89a507a1346ece8ccfa9b8c0f diff --git a/source-files/qt-6.10.patch b/source-files/qt-6.10.patch deleted file mode 100644 index bb444ec..0000000 --- a/source-files/qt-6.10.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fce8cd99a1de0e637e8539c4d8ac68832a40fa6d Mon Sep 17 00:00:00 2001 -From: Chiitoo -Date: Wed, 8 Oct 2025 19:45:28 +0300 -Subject: [PATCH] cmake: fix build with Qt 6.10 (#2306) - -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 | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 241166ad4..ecb283c82 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,6 +42,11 @@ find_package(lxqt-menu-data ${LXQT_MINIMUM_VERSION} REQUIRED) - - find_package(LayerShellQt REQUIRED) - -+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0") -+ find_package(Qt6GuiPrivate REQUIRED) -+ find_package(Qt6WaylandClientPrivate REQUIRED) -+endif() -+ - # Patch Version - set(LXQT_PANEL_PATCH_VERSION 2) - set(LXQT_PANEL_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PANEL_PATCH_VERSION}) diff --git a/source.sh b/source.sh index 3dc2fca..ba9f2c1 100644 --- a/source.sh +++ b/source.sh @@ -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 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 # This function is used to compile the source code build() {