x11/lxqt-panel: update to 0.16.1

0.16.1
-Fixed compilation with Qt 5.12 and Qt 5.13.

0.16.0
-Use a stylesheet for progress-bars of Sensors plugin.
-Implemented auto-hiding for Status Notifier.
-Added option to task button for moving the window to next monitor.
-Added option to place task buttons of new windows next to the existing ones
of same class when task buttons are ungrouped.
-Removed incorrect and redundant explanation of milliseconds from World Clock.
-Don't call non-const member functions on temporaries.
-Prevent possible C++11 range loop container detachment.
-Fixed the sizes and alignments of some plugins at startup.
-Added right-click menu to main menu items.
-Address deprecation warnings/errors.
-Added XF86Eject button action.

6 files changed, 64 insertions, 19 deletions

diff --git a/x11/lxqt-panel/Makefile b/x11/lxqt-panel/Makefile
index 28c622df2b2..fdba618c3e7 100644
--- a/x11/lxqt-panel/Makefile
+++ b/x11/lxqt-panel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/12/04 04:56:19 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2020/12/07 12:55:28 pin Exp $
 
-DISTNAME=	lxqt-panel-0.15.1
-PKGREVISION=	5
+DISTNAME=	lxqt-panel-0.16.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -31,11 +30,13 @@ CMAKE_ARGS+=	-DVOLUME_USE_ALSA=No
 CMAKE_ARGS+=	-DBACKLIGHT_PLUGIN=No
 .endif
 
-MENU_CONF=		share/examples/lxqt/xdg/menus
-AUTOSTART_CONF=		share/examples/lxqt/xdg/autostart
+MENU_CONF=		share/examples/menus
+AUTOSTART_CONF=		share/examples/autostart
+PANEL_CONF=		share/examples/lxqt
 PKG_SYSCONFSUBDIR=	xdg
 MAKE_DIRS=		${PKG_SYSCONFDIR}/menus
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/autostart
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/lxqt
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing paths.
@@ -51,11 +52,13 @@ CONF_FILES=	${MENU_CONF}/lxqt-applications.menu \
 		${PKG_SYSCONFDIR}/menus/lxqt-applications.menu
 CONF_FILES+=	${AUTOSTART_CONF}/lxqt-panel.desktop \
 		${PKG_SYSCONFDIR}/autostart/lxqt-panel.desktop
+CONF_FILES+=	${PANEL_CONF}/panel.conf \
+		${PKG_SYSCONFDIR}/lxqt/panel.conf
 
 pre-configure:
 	${MKDIR} -p ${WRKSRC}/build
 
-TOOL_DEPENDS+=	lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools
+TOOL_DEPENDS+=	lxqt-build-tools>=0.8:../../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 78061bd5cb7..4f9c4cdc27c 100644
--- a/x11/lxqt-panel/PLIST
+++ b/x11/lxqt-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/06/01 12:24:06 pin Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/12/07 12:55:28 pin Exp $
 bin/lxqt-panel
 include/lxqt/ilxqtpanel.h
 include/lxqt/ilxqtpanelplugin.h
@@ -10,9 +10,9 @@ lib/lxqt-panel/libvolume.so
 man/man1/lxqt-panel.1
 share/desktop-directories/lxqt-leave.directory
 share/desktop-directories/lxqt-settings.directory
-share/examples/lxqt/xdg/autostart/lxqt-panel.desktop
-share/examples/lxqt/xdg/lxqt/panel.conf
-share/examples/lxqt/xdg/menus/lxqt-applications.menu
+share/examples/autostart/lxqt-panel.desktop
+share/examples/lxqt/panel.conf
+share/examples/menus/lxqt-applications.menu
 share/lxqt/lxqt-panel/colorpicker.desktop
 share/lxqt/lxqt-panel/desktopswitch.desktop
 share/lxqt/lxqt-panel/directorymenu.desktop
@@ -36,6 +36,7 @@ share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_gl.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_hu.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_ja.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_nb_NO.qm
+share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_nl.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_pl.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_pt_BR.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_ru.qm
@@ -221,6 +222,8 @@ share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_eu.qm
 share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_fi.qm
 share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_fr.qm
 share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_gl.qm
+share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_he.qm
+share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_hr.qm
 share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_hu.qm
 share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_ia.qm
 share/lxqt/translations/lxqt-panel/quicklaunch/quicklaunch_id.qm
@@ -324,9 +327,12 @@ share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_cy.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_da.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_de.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_gl.qm
+share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_he.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_nb_NO.qm
+share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_nl.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_pl.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_sk_SK.qm
 share/lxqt/translations/lxqt-panel/statusnotifier/statusnotifier_tr.qm
@@ -381,10 +387,14 @@ 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_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_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_BR.qm
 share/lxqt/translations/lxqt-panel/tray/tray_ru_RU.qm
@@ -407,6 +417,7 @@ share/lxqt/translations/lxqt-panel/volume/volume_fi.qm
 share/lxqt/translations/lxqt-panel/volume/volume_fr.qm
 share/lxqt/translations/lxqt-panel/volume/volume_gl.qm
 share/lxqt/translations/lxqt-panel/volume/volume_he.qm
+share/lxqt/translations/lxqt-panel/volume/volume_hr.qm
 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
@@ -441,6 +452,7 @@ share/lxqt/translations/lxqt-panel/worldclock/worldclock_es.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_fr.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_gl.qm
 share/lxqt/translations/lxqt-panel/worldclock/worldclock_he.qm
+share/lxqt/translations/lxqt-panel/worldclock/worldclock_hr.qm
 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
diff --git a/x11/lxqt-panel/distinfo b/x11/lxqt-panel/distinfo
index 57ca131c242..f15932d8d6e 100644
--- a/x11/lxqt-panel/distinfo
+++ b/x11/lxqt-panel/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2020/06/01 12:24:06 pin Exp $
+$NetBSD: distinfo,v 1.4 2020/12/07 12:55:28 pin Exp $
 
-SHA1 (lxqt-panel-0.15.1.tar.xz) = 7eab6a7d8c09524a776a34498167ce0c77468082
-RMD160 (lxqt-panel-0.15.1.tar.xz) = e70367893df26d6d6020faf95630b790d4d88890
-SHA512 (lxqt-panel-0.15.1.tar.xz) = 8eb9856faa2ce56c56df7514772d3ae6d31339a10d16e1ed659be0a2affc57fd16e01e05cb67c4205dfb773234ca9b8a69f414f742ccc30495bf4e2acfa0513f
-Size (lxqt-panel-0.15.1.tar.xz) = 473356 bytes
-SHA1 (patch-panel_CMakeLists.txt) = 503d92f919776787cf797ef40ab4f054a2709ed3
+SHA1 (lxqt-panel-0.16.1.tar.xz) = 114c4b0416a04e51697af74bf68a960e2490a626
+RMD160 (lxqt-panel-0.16.1.tar.xz) = 637f95edf1f7ab2797e77a87f4f5a3a4fdce75cc
+SHA512 (lxqt-panel-0.16.1.tar.xz) = 2db8c4b5d8ddf42b72ffd5863242774277b4bf2fd1ec4393908851ce3224c970de5f12ae61be3dd7008407ea5df7b0b59990b03982e2725ee9a0ce2e3cce48f5
+Size (lxqt-panel-0.16.1.tar.xz) = 473632 bytes
+SHA1 (patch-autostart_CMakeLists.txt) = 7c14eb2f2c29b2bcee8833d7d02fc4e1b5a37e57
+SHA1 (patch-menu_CMakeLists.txt) = 979454e283eb380f84da6e7f1d81d1001e477421
+SHA1 (patch-panel_CMakeLists.txt) = 15531e68fa1939a793e6abcecb7ca714488142b7
diff --git a/x11/lxqt-panel/patches/patch-autostart_CMakeLists.txt b/x11/lxqt-panel/patches/patch-autostart_CMakeLists.txt
new file mode 100644
index 00000000000..c95a207a17c
--- /dev/null
+++ b/x11/lxqt-panel/patches/patch-autostart_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-autostart_CMakeLists.txt,v 1.1 2020/12/07 12:55:28 pin Exp $
+
+Install config file to proper location
+
+--- autostart/CMakeLists.txt.orig	2020-11-05 16:09:19.000000000 +0000
++++ autostart/CMakeLists.txt
+@@ -10,6 +10,6 @@ add_custom_target(lxqt_panel_autostart_d
+ 
+ install(FILES
+     ${DESKTOP_FILES}
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
++    DESTINATION "share/examples/autostart"
+     COMPONENT Runtime
+ )
diff --git a/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt b/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt
new file mode 100644
index 00000000000..e095646ae70
--- /dev/null
+++ b/x11/lxqt-panel/patches/patch-menu_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-menu_CMakeLists.txt,v 1.1 2020/12/07 12:55:28 pin Exp $
+
+Install config file to proper location
+
+--- menu/CMakeLists.txt.orig	2020-11-05 16:09:19.000000000 +0000
++++ menu/CMakeLists.txt
+@@ -16,6 +16,6 @@ install(FILES
+ 
+ install(FILES
+     lxqt-applications.menu
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/menus"
++    DESTINATION "share/examples/menus"
+     COMPONENT Runtime
+ )
diff --git a/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt b/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt
index e57f5e2a8a1..6272bbf1591 100644
--- a/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt
+++ b/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-panel_CMakeLists.txt,v 1.2 2020/04/26 03:05:51 gutteridge Exp $
+$NetBSD: patch-panel_CMakeLists.txt,v 1.3 2020/12/07 12:55:28 pin Exp $
 
 Work around undefined symbol issue (which would cause the panel to fail
 to run if the volume plugin was enabled), as discussed in:
@@ -6,7 +6,7 @@ https://github.com/lxqt/lxqt/issues/1075
 
 Install fallback .conf files to a consistent location.
 
---- panel/CMakeLists.txt.orig	2019-02-25 22:16:30.000000000 +0000
+--- panel/CMakeLists.txt.orig	2020-11-05 16:09:19.000000000 +0000
 +++ panel/CMakeLists.txt
 @@ -55,6 +55,8 @@ set(LIBRARIES
      lxqt
@@ -22,7 +22,7 @@ Install fallback .conf files to a consistent location.
  
  install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
 -install(FILES ${CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/lxqt)
-+install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
++install(FILES ${CONFIG_FILES} DESTINATION share/examples/lxqt)
  install(FILES ${PUB_HEADERS} DESTINATION include/lxqt)
  install(FILES
      man/lxqt-panel.1