x11-wm/lxqt-panel: Update to 2.2.2

- Back to c++17. lxqt-panel is not ready to c++20 yet [1]

ChangeLog at:  https://github.com/lxqt/lxqt-panel/releases/tag/2.2.2
PR:		287745
Reported by:	Dean E. Weimer <dweimer __at_ dweimer.net> [1]
This commit is contained in:
Jose Alonso Cardenas Marquez 2025-06-23 10:39:07 -07:00
parent 4194739e5e
commit 8d7a5256ad
No known key found for this signature in database
GPG Key ID: 335B9246BA5E30F4
7 changed files with 36 additions and 13 deletions

View File

@ -1,6 +1,5 @@
PORTNAME= lxqt-panel
PORTVERSION= 2.2.1
PORTREVISION= 1
PORTVERSION= 2.2.2
CATEGORIES= x11-wm
MASTER_SITES= LXQT
@ -19,7 +18,7 @@ LIB_DEPENDS= libdbusmenu-lxqt.so:devel/libdbusmenu-lxqt \
BUILD_DEPENDS= lxqt-menu-data>=2.0.0:x11/lxqt-menu-data
RUN_DEPENDS= lxqt-menu-data>=2.0.0:x11/lxqt-menu-data
USES= cmake compiler:c++20-lang gettext-runtime kde:6 qt:6 gnome \
USES= cmake compiler:c++17-lang gettext-runtime kde:6 qt:6 gnome \
lxqt:2 localbase:ldflags perl5 pkgconfig tar:xz xorg
USE_PERL5= build
USE_QT= base:run tools:build svg

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1748036028
SHA256 (lxqt/lxqt-panel-2.2.1.tar.xz) = 63d7f8af2e85b1a2580441943230fb4ab6edaaf52fd29fe0e616f6d57fd05d16
SIZE (lxqt/lxqt-panel-2.2.1.tar.xz) = 717960
TIMESTAMP = 1750694736
SHA256 (lxqt/lxqt-panel-2.2.2.tar.xz) = 5d150e7a4e8818715b8f4eec7f4bb26c98f740cd56f972199b35fc7c81da1969
SIZE (lxqt/lxqt-panel-2.2.2.tar.xz) = 724996

View File

@ -0,0 +1,12 @@
--- CMakeLists.txt.orig 2025-06-22 20:12:06 UTC
+++ CMakeLists.txt
@@ -65,6 +65,9 @@ add_definitions(
-DPLUGIN_DIR=\"${PLUGIN_DIR}\"
)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
message(STATUS "CMAKE Module linker flags: ${CMAKE_MODULE_LINKER_FLAGS}")
message(STATUS "Panel plugins location: ${PLUGIN_DIR}")

View File

@ -1,6 +1,6 @@
--- panel/resources/panel.conf 2024-04-17 06:16:32.000000000 -0500
+++ panel/resources/panel.conf 2024-04-25 15:24:07.715937000 -0500
@@ -1,7 +1,7 @@
--- panel/resources/panel.conf.orig 2025-06-22 20:12:06 UTC
+++ panel/resources/panel.conf
@@ -1,7 +1,7 @@ panels=panel1
panels=panel1
[panel1]

View File

@ -1,6 +1,6 @@
--- plugin-kbindicator/src/x11/kbdlayout.cpp.orig 2020-04-24 02:39:01 UTC
--- plugin-kbindicator/src/x11/kbdlayout.cpp.orig 2025-06-22 20:12:06 UTC
+++ plugin-kbindicator/src/x11/kbdlayout.cpp
@@ -245,10 +245,10 @@ class X11Kbd: public QAbstractNativeEventFilter (priva
@@ -244,10 +244,10 @@ class X11Kbd: public QAbstractNativeEventFilter (priva
static LangInfo def{QStringLiteral("Unknown"), QStringLiteral("??"), QStringLiteral("None")};
static QHash<QString, LangInfo> names;
if (names.empty()){

View File

@ -1,6 +1,6 @@
--- plugin-sysstat/lxqtsysstat.cpp.orig 2021-05-02 21:18:35 UTC
--- plugin-sysstat/lxqtsysstat.cpp.orig 2025-06-22 20:12:06 UTC
+++ plugin-sysstat/lxqtsysstat.cpp
@@ -386,10 +386,11 @@ void LXQtSysStatContent::clearLine()
@@ -395,10 +395,11 @@ void LXQtSysStatContent::cpuLoadFrequencyUpdate(float
void LXQtSysStatContent::cpuLoadFrequencyUpdate(float user, float nice, float system, float other, float frequencyRate, uint)
{

View File

@ -106,6 +106,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_ru.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_sk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_sr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_zh_CN.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/colorpicker/colorpicker_zh_TW.qm
@ -384,6 +385,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_sr@latin.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_sr_BA.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_sr_RS.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_th_TH.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/fancymenu/fancymenu_uk.qm
@ -539,6 +541,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_sr@latin.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_sr_BA.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_sr_RS.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_th_TH.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/mainmenu/mainmenu_uk.qm
@ -592,6 +595,7 @@ share/applications/lxqt-panel.desktop
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_sr@latin.qm
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_sr_BA.qm
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_sr_RS.qm
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_sv.qm
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_th_TH.qm
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_tr.qm
%%MOUNT%%%%LXQT_TRANSLATIONS%%/lxqt-panel/mount/mount_uk.qm
@ -622,6 +626,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/qeyes/qeyes_ru.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/qeyes/qeyes_sk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/qeyes/qeyes_sr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/qeyes/qeyes_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/qeyes/qeyes_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/qeyes/qeyes_zh_CN.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_ar.qm
@ -671,6 +676,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_sr@latin.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_sr_BA.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_sr_RS.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_th_TH.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/quicklaunch/quicklaunch_uk.qm
@ -724,6 +730,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_sr@latin.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_sr_BA.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_sr_RS.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_th_TH.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/showdesktop/showdesktop_uk.qm
@ -767,6 +774,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_si.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_sk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_sr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_uk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/spacer/spacer_zh_CN.qm
@ -805,6 +813,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_ru.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_si.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_sk_SK.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_uk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/statusnotifier/statusnotifier_zh_CN.qm
@ -847,6 +856,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_ru.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_si.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_sk_SK.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_uk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/sysstat/sysstat_zh_CN.qm
@ -898,6 +908,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_sr@latin.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_sr_BA.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_sr_RS.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_th_TH.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/taskbar/taskbar_uk.qm
@ -991,6 +1002,7 @@ share/applications/lxqt-panel.desktop
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_si.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_sk_SK.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_sr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_sv.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_tr.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_uk.qm
%%LXQT_TRANSLATIONS%%/lxqt-panel/worldclock/worldclock_zh_CN.qm