x11/lxqt-panel: update to 1.1.0

Main changes:
-Now the legacy tray icons are shown inside Status Notifier when the System
 Tray plugin is enabled. That removes some problems of the old tray widget.
-Reset buttons are fixed in config dialogs.
-Desktop names are shown in the context menus of task buttons.
-The panel config dialog is split into 3 sections, for having a sleeker GUI.
-The clash between the main menu shortcut and the built-in shortcuts of the
 search entry is fixed.
-Added options for the button label and style of Directory Menu.
-Fixed resetting of System Statistics graph on auto-hiding panels.

4 files changed, 32 insertions, 46 deletions

diff --git a/x11/lxqt-panel/Makefile b/x11/lxqt-panel/Makefile
index b2c1cbb0df7..701f57d9923 100644
--- a/x11/lxqt-panel/Makefile
+++ b/x11/lxqt-panel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2022/04/18 19:12:23 adam Exp $
+# $NetBSD: Makefile,v 1.22 2022/04/24 15:39:00 pin Exp $
 
-DISTNAME=	lxqt-panel-1.0.0
-PKGREVISION=	3
+DISTNAME=	lxqt-panel-1.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -50,6 +49,10 @@ SUBST_SED.prefix+=	-e 's,/usr/share,${PREFIX}/share,g'
 
 CONF_FILES=	${MENU_CONF}/lxqt-applications.menu \
 		${PKG_SYSCONFDIR}/menus/lxqt-applications.menu
+CONF_FILES+=	${MENU_CONF}/lxqt-applications-compact.menu \
+		${PKG_SYSCONFDIR}/menus/lxqt-applications-compact.menu
+CONF_FILES+=	${MENU_CONF}/lxqt-applications-simple.menu \
+		${PKG_SYSCONFDIR}/menus/lxqt-applications-simple.menu
 CONF_FILES+=	${AUTOSTART_CONF}/lxqt-panel.desktop \
 		${PKG_SYSCONFDIR}/autostart/lxqt-panel.desktop
 CONF_FILES+=	${PANEL_CONF}/panel.conf \
@@ -58,7 +61,7 @@ CONF_FILES+=	${PANEL_CONF}/panel.conf \
 pre-configure:
 	${MKDIR} -p ${WRKSRC}/build
 
-TOOL_DEPENDS+=	lxqt-build-tools>=0.10.0:../../devel/lxqt-build-tools
+TOOL_DEPENDS+=	lxqt-build-tools>=0.11.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 DEPENDS+=	lxmenu-data-[0-9]*:../../sysutils/lxmenu-data
 
diff --git a/x11/lxqt-panel/PLIST b/x11/lxqt-panel/PLIST
index 588e15babc3..800d4137540 100644
--- a/x11/lxqt-panel/PLIST
+++ b/x11/lxqt-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/11/19 11:44:03 pin Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/04/24 15:39:00 pin Exp $
 bin/lxqt-panel
 include/lxqt/ilxqtpanel.h
 include/lxqt/ilxqtpanelplugin.h
@@ -15,6 +15,8 @@ share/desktop-directories/lxqt-leave.directory
 share/desktop-directories/lxqt-settings.directory
 share/examples/autostart/lxqt-panel.desktop
 share/examples/lxqt/panel.conf
+share/examples/menus/lxqt-applications-compact.menu
+share/examples/menus/lxqt-applications-simple.menu
 share/examples/menus/lxqt-applications.menu
 share/lxqt/lxqt-panel/backlight.desktop
 share/lxqt/lxqt-panel/colorpicker.desktop
@@ -31,6 +33,11 @@ share/lxqt/lxqt-panel/taskbar.desktop
 share/lxqt/lxqt-panel/tray.desktop
 share/lxqt/lxqt-panel/volume.desktop
 share/lxqt/lxqt-panel/worldclock.desktop
+share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_fr.qm
+share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_he.qm
+share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_it.qm
+share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_ko.qm
+share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_nl.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_bg.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_ca.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_cs.qm
@@ -41,10 +48,12 @@ share/lxqt/translations/lxqt-panel/customcommand/customcommand_es.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_et.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_fi.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_fr.qm
+share/lxqt/translations/lxqt-panel/customcommand/customcommand_he.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_hr.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_hu.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_it.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_ja.qm
+share/lxqt/translations/lxqt-panel/customcommand/customcommand_ko.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_lt.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_lv.qm
 share/lxqt/translations/lxqt-panel/customcommand/customcommand_nb_NO.qm
@@ -162,6 +171,7 @@ share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_hu.qm
 share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_id.qm
 share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_it.qm
 share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_ja.qm
+share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_ko.qm
 share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_lt.qm
 share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_lv.qm
 share/lxqt/translations/lxqt-panel/kbindicator/kbindicator_nb_NO.qm
@@ -388,6 +398,7 @@ share/lxqt/translations/lxqt-panel/spacer/spacer_hu.qm
 share/lxqt/translations/lxqt-panel/spacer/spacer_id.qm
 share/lxqt/translations/lxqt-panel/spacer/spacer_it.qm
 share/lxqt/translations/lxqt-panel/spacer/spacer_ja.qm
+share/lxqt/translations/lxqt-panel/spacer/spacer_ko.qm
 share/lxqt/translations/lxqt-panel/spacer/spacer_lt.qm
 share/lxqt/translations/lxqt-panel/spacer/spacer_lv.qm
 share/lxqt/translations/lxqt-panel/spacer/spacer_nb_NO.qm
@@ -416,6 +427,7 @@ share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_hr.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_hu.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_it.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_ja.qm
+share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_ko.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_lt.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_lv.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_nb_NO.qm
@@ -474,37 +486,6 @@ share/lxqt/translations/lxqt-panel/taskbar/taskbar_tr.qm
 share/lxqt/translations/lxqt-panel/taskbar/taskbar_uk.qm
 share/lxqt/translations/lxqt-panel/taskbar/taskbar_zh_CN.qm
 share/lxqt/translations/lxqt-panel/taskbar/taskbar_zh_TW.qm
-share/lxqt/translations/lxqt-panel/tray/tray_arn.qm
-share/lxqt/translations/lxqt-panel/tray/tray_ast.qm
-share/lxqt/translations/lxqt-panel/tray/tray_bg.qm
-share/lxqt/translations/lxqt-panel/tray/tray_ca.qm
-share/lxqt/translations/lxqt-panel/tray/tray_cs.qm
-share/lxqt/translations/lxqt-panel/tray/tray_cy.qm
-share/lxqt/translations/lxqt-panel/tray/tray_da.qm
-share/lxqt/translations/lxqt-panel/tray/tray_de.qm
-share/lxqt/translations/lxqt-panel/tray/tray_es.qm
-share/lxqt/translations/lxqt-panel/tray/tray_et.qm
-share/lxqt/translations/lxqt-panel/tray/tray_fr.qm
-share/lxqt/translations/lxqt-panel/tray/tray_gl.qm
-share/lxqt/translations/lxqt-panel/tray/tray_he.qm
-share/lxqt/translations/lxqt-panel/tray/tray_hr.qm
-share/lxqt/translations/lxqt-panel/tray/tray_hu.qm
-share/lxqt/translations/lxqt-panel/tray/tray_id.qm
-share/lxqt/translations/lxqt-panel/tray/tray_it.qm
-share/lxqt/translations/lxqt-panel/tray/tray_ja.qm
-share/lxqt/translations/lxqt-panel/tray/tray_lt.qm
-share/lxqt/translations/lxqt-panel/tray/tray_lv.qm
-share/lxqt/translations/lxqt-panel/tray/tray_nb_NO.qm
-share/lxqt/translations/lxqt-panel/tray/tray_nl.qm
-share/lxqt/translations/lxqt-panel/tray/tray_pl.qm
-share/lxqt/translations/lxqt-panel/tray/tray_pt.qm
-share/lxqt/translations/lxqt-panel/tray/tray_pt_BR.qm
-share/lxqt/translations/lxqt-panel/tray/tray_ru_RU.qm
-share/lxqt/translations/lxqt-panel/tray/tray_si.qm
-share/lxqt/translations/lxqt-panel/tray/tray_sk_SK.qm
-share/lxqt/translations/lxqt-panel/tray/tray_tr.qm
-share/lxqt/translations/lxqt-panel/tray/tray_uk.qm
-share/lxqt/translations/lxqt-panel/tray/tray_zh_Hans.qm
 share/lxqt/translations/lxqt-panel/volume/volume_ar.qm
 share/lxqt/translations/lxqt-panel/volume/volume_arn.qm
 share/lxqt/translations/lxqt-panel/volume/volume_ast.qm
@@ -529,6 +510,7 @@ share/lxqt/translations/lxqt-panel/volume/volume_hu.qm
 share/lxqt/translations/lxqt-panel/volume/volume_id.qm
 share/lxqt/translations/lxqt-panel/volume/volume_it.qm
 share/lxqt/translations/lxqt-panel/volume/volume_ja.qm
+share/lxqt/translations/lxqt-panel/volume/volume_ko.qm
 share/lxqt/translations/lxqt-panel/volume/volume_lt.qm
 share/lxqt/translations/lxqt-panel/volume/volume_lv.qm
 share/lxqt/translations/lxqt-panel/volume/volume_nb_NO.qm
@@ -567,6 +549,7 @@ share/lxqt/translations/lxqt-panel/worldclock/worldclock_hu.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_id.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_it.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_ja.qm
+share/lxqt/translations/lxqt-panel/worldclock/worldclock_ko.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_lt.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_lv.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_nb_NO.qm
diff --git a/x11/lxqt-panel/distinfo b/x11/lxqt-panel/distinfo
index 7978f5e018d..c27f962b367 100644
--- a/x11/lxqt-panel/distinfo
+++ b/x11/lxqt-panel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2021/11/19 11:44:03 pin Exp $
+$NetBSD: distinfo,v 1.9 2022/04/24 15:39:00 pin Exp $
 
-BLAKE2s (lxqt-panel-1.0.0.tar.xz) = 9a55d8ac29797cd5e905993a9b48ba45feb275c2c948c7b58d1c18feb8455041
-SHA512 (lxqt-panel-1.0.0.tar.xz) = 8ee7593beb5a863f71e6314f03981ef769b6f64605e4212a2b2ae147959bf30d2137415477d6f23afc2591a639c7f21651ac844d95226af18a2d8ae141f29b62
-Size (lxqt-panel-1.0.0.tar.xz) = 539116 bytes
+BLAKE2s (lxqt-panel-1.1.0.tar.xz) = a0581efefe8fa61b618275a20354e7be20583e660d1415219d67501e99458044
+SHA512 (lxqt-panel-1.1.0.tar.xz) = d112bb2a251c858f250fec34fab4392b070e5a1128155f1bb8ff1fa1d7189225624b2151b8d4beb19f12548c90b2a5892bd717ab5b8e2928271d2167c62aa053
+Size (lxqt-panel-1.1.0.tar.xz) = 555656 bytes
 SHA1 (patch-autostart_CMakeLists.txt) = 7c14eb2f2c29b2bcee8833d7d02fc4e1b5a37e57
-SHA1 (patch-menu_CMakeLists.txt) = 979454e283eb380f84da6e7f1d81d1001e477421
+SHA1 (patch-menu_CMakeLists.txt) = 7df6026d93be779d2ed05e6ac937ddbcbbaa1d8f
 SHA1 (patch-panel_CMakeLists.txt) = 15531e68fa1939a793e6abcecb7ca714488142b7
diff --git a/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt b/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt
index e095646ae70..3f0145e2fe3 100644
--- a/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt
+++ b/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt
@@ -1,13 +1,13 @@
-$NetBSD: patch-menu_CMakeLists.txt,v 1.1 2020/12/07 12:55:28 pin Exp $
+$NetBSD: patch-menu_CMakeLists.txt,v 1.2 2022/04/24 15:39:01 pin Exp $
 
 Install config file to proper location
 
---- menu/CMakeLists.txt.orig	2020-11-05 16:09:19.000000000 +0000
+--- menu/CMakeLists.txt.orig	2022-04-16 13:08:11.000000000 +0000
 +++ menu/CMakeLists.txt
-@@ -16,6 +16,6 @@ install(FILES
- 
- install(FILES
+@@ -19,6 +19,6 @@ install(FILES
      lxqt-applications.menu
+     lxqt-applications-compact.menu
+     lxqt-applications-simple.menu
 -    DESTINATION "${LXQT_ETC_XDG_DIR}/menus"
 +    DESTINATION "share/examples/menus"
      COMPONENT Runtime