x11/lxqt-session: update to 0.16.0

-Don't use deprecated QProcess methods.
-Don't use 0/nullptr to initialize QFlags.
-Removed Default Applications page.

5 files changed, 51 insertions, 25 deletions

diff --git a/x11/lxqt-session/Makefile b/x11/lxqt-session/Makefile
index 20343466ecc..06caa22d955 100644
--- a/x11/lxqt-session/Makefile
+++ b/x11/lxqt-session/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 13:03:40 pin Exp $
 
-DISTNAME=	lxqt-session-0.15.0
-PKGREVISION=	5
+DISTNAME=	lxqt-session-0.16.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -21,6 +20,17 @@ CMAKE_ARG_PATH=	..
 
 CMAKE_ARGS+=	-DWITH_LIBUDEV=OFF
 
+AUTOSTART_CONF=		share/examples/autostart
+OPENBOX_CONF=		share/examples/openbox
+PKG_SYSCONFSUBDIR=	xdg
+MAKE_DIRS=		${PKG_SYSCONFDIR}/autostart
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/openbox
+
+CONF_FILES+=		${AUTOSTART_CONF}/lxqt-xscreensaver-autostart.desktop \
+			${PKG_SYSCONFDIR}/autostart/lxqt-xscreensaver-autostart.desktop
+CONF_FILES+=		${OPENBOX_CONF}/lxqt-rc.xml \
+			${PKG_SYSCONFDIR}/openbox/lxqt-rc.xml
+
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing paths.
 SUBST_STAGE.prefix=	pre-configure
@@ -32,7 +42,7 @@ SUBST_SED.prefix=	-e 's,/usr/bin,${PREFIX}/bin,g'
 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+=	xdg-user-dirs-[0-9]*:../../x11/xdg-user-dirs
 
diff --git a/x11/lxqt-session/PLIST b/x11/lxqt-session/PLIST
index a77275f1d81..959531023c8 100644
--- a/x11/lxqt-session/PLIST
+++ b/x11/lxqt-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/06/02 17:40:00 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/12/07 13:03:40 pin Exp $
 bin/lxqt-config-session
 bin/lxqt-leave
 bin/lxqt-session
@@ -15,12 +15,11 @@ share/applications/lxqt-logout.desktop
 share/applications/lxqt-reboot.desktop
 share/applications/lxqt-shutdown.desktop
 share/applications/lxqt-suspend.desktop
-share/examples/lxqt/xdg/autostart/lxqt-xscreensaver-autostart.desktop
-share/examples/lxqt/xdg/lxqt.conf
-share/examples/lxqt/xdg/openbox/lxqt-rc.xml
-share/examples/lxqt/xdg/session.conf
-share/examples/lxqt/xdg/windowmanagers.conf
+share/examples/autostart/lxqt-xscreensaver-autostart.desktop
+share/examples/openbox/lxqt-rc.xml
 share/kdm/sessions/lxqt.desktop
+share/lxqt/lxqt.conf
+share/lxqt/session.conf
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_ar.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_arn.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_ast.qm
@@ -39,6 +38,7 @@ share/lxqt/translations/lxqt-config-session/lxqt-config-session_fi.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_fr.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_gl.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_he.qm
+share/lxqt/translations/lxqt-config-session/lxqt-config-session_hr.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_hu.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_ia.qm
 share/lxqt/translations/lxqt-config-session/lxqt-config-session_id.qm
@@ -81,6 +81,7 @@ share/lxqt/translations/lxqt-leave/lxqt-leave_hu.qm
 share/lxqt/translations/lxqt-leave/lxqt-leave_id.qm
 share/lxqt/translations/lxqt-leave/lxqt-leave_it.qm
 share/lxqt/translations/lxqt-leave/lxqt-leave_ja.qm
+share/lxqt/translations/lxqt-leave/lxqt-leave_ko.qm
 share/lxqt/translations/lxqt-leave/lxqt-leave_lt.qm
 share/lxqt/translations/lxqt-leave/lxqt-leave_nb_NO.qm
 share/lxqt/translations/lxqt-leave/lxqt-leave_nl.qm
@@ -138,4 +139,5 @@ share/lxqt/translations/lxqt-session/lxqt-session_tr.qm
 share/lxqt/translations/lxqt-session/lxqt-session_uk.qm
 share/lxqt/translations/lxqt-session/lxqt-session_zh_CN.qm
 share/lxqt/translations/lxqt-session/lxqt-session_zh_TW.qm
+share/lxqt/windowmanagers.conf
 share/xsessions/lxqt.desktop
diff --git a/x11/lxqt-session/distinfo b/x11/lxqt-session/distinfo
index f3f57509369..67f4e732d38 100644
--- a/x11/lxqt-session/distinfo
+++ b/x11/lxqt-session/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2020/06/01 15:04:57 pin Exp $
+$NetBSD: distinfo,v 1.5 2020/12/07 13:03:40 pin Exp $
 
-SHA1 (lxqt-session-0.15.0.tar.xz) = a96f8719d0d1af44c30bff8dd83018d0fa5ab5af
-RMD160 (lxqt-session-0.15.0.tar.xz) = 8f23904a70cdef73938b02bcdadc60cb1b450ebf
-SHA512 (lxqt-session-0.15.0.tar.xz) = 96ef9e58ca25303ac0213f1cb5faee5efddb61ac3705484ac55b39db56c9302ff646e317dbc753b213a5e2ea38818b247244a2be5219fbe6db9e419b8c638591
-Size (lxqt-session-0.15.0.tar.xz) = 181900 bytes
-SHA1 (patch-config_CMakeLists.txt) = f2e5b4b363862084fb80df22066dd978fd0ebb87
+SHA1 (lxqt-session-0.16.0.tar.xz) = d100e3b369dd23d85d8a3f1b2b3a8e4656f04ab4
+RMD160 (lxqt-session-0.16.0.tar.xz) = 2100b6ba5d3dd7fe4036876a203bd94efad77857
+SHA512 (lxqt-session-0.16.0.tar.xz) = ce15b985ac5b11c16f58ba893ee7045aeb4f47fc77c7215a4d4ac0b782ebccf8e8f726d0c463638a5ec0101915ee367cb7d714035c1ea3057c5f3d9b7f0fd3c3
+Size (lxqt-session-0.16.0.tar.xz) = 180084 bytes
+SHA1 (patch-autostart_CMakeLists.txt) = a791cc51e03e794e1bf81bf0d6f8462ba11e2e84
+SHA1 (patch-config_CMakeLists.txt) = b652c3e407388b80dfd6f15bd80fe30219ad9f13
diff --git a/x11/lxqt-session/patches/patch-autostart_CMakeLists.txt b/x11/lxqt-session/patches/patch-autostart_CMakeLists.txt
new file mode 100644
index 00000000000..b8705792b3f
--- /dev/null
+++ b/x11/lxqt-session/patches/patch-autostart_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-autostart_CMakeLists.txt,v 1.1 2020/12/07 13:03:40 pin Exp $
+
+Install config file to proper location
+
+--- autostart/CMakeLists.txt.orig	2020-10-31 08:58:17.000000000 +0000
++++ autostart/CMakeLists.txt
+@@ -10,6 +10,6 @@ add_custom_target(lxqt_sesstion_autostar
+ 
+ install(FILES
+     ${DESKTOP_FILES}
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
++    DESTINATION "share/examples/autostart"
+     COMPONENT Runtime
+ )
diff --git a/x11/lxqt-session/patches/patch-config_CMakeLists.txt b/x11/lxqt-session/patches/patch-config_CMakeLists.txt
index 2e82fcf6f79..2c2638ef85d 100644
--- a/x11/lxqt-session/patches/patch-config_CMakeLists.txt
+++ b/x11/lxqt-session/patches/patch-config_CMakeLists.txt
@@ -1,15 +1,14 @@
-$NetBSD: patch-config_CMakeLists.txt,v 1.2 2020/04/26 02:11:17 gutteridge Exp $
+$NetBSD: patch-config_CMakeLists.txt,v 1.3 2020/12/07 13:03:40 pin Exp $
 
-Install fallback .conf files to a consistent location.
+Install config file to proper location
 
---- config/CMakeLists.txt.orig	2019-02-26 01:22:39.000000000 +0000
+--- config/CMakeLists.txt.orig	2020-10-31 08:58:17.000000000 +0000
 +++ config/CMakeLists.txt
-@@ -3,7 +3,7 @@ install(FILES
-     lxqt.conf
-     session.conf
-     windowmanagers.conf
--    DESTINATION "${CMAKE_INSTALL_DATADIR}/lxqt"
-+    DESTINATION "${LXQT_ETC_XDG_DIR}"
+@@ -7,6 +7,6 @@ install(FILES
      COMPONENT Runtime
  )
  install(DIRECTORY openbox
+-    DESTINATION "${LXQT_ETC_XDG_DIR}"
++    DESTINATION "share/examples"
+     COMPONENT Runtime
+ )