CVS commit: pkgsrc/x11/lxqt-panel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 11 16:24:46 UTC 2023

Modified Files:
        pkgsrc/x11/lxqt-panel: Makefile PLIST
Added Files:
        pkgsrc/x11/lxqt-panel: options.mk

Log Message:
lxqt-panel: rework handling of various plugins.

when a plugin's dependency is unavailable in pkgsrc, explicitly disable
it everywhere, rather than just !Linux. when the plugin is tested
as not working on NetBSD, also disable it.

enable network monitor plugin by default, it works fine on NetBSD.

make "alsa" and "pulseaudio" options. Disable pulseaudio by default
since there's also an oss engine which can control volume natively
on NetBSD. enable alsa on Linux.

should help the build on various platforms.

TODO for me: the same but for lxqt-session


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/lxqt-panel/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/lxqt-panel/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/lxqt-panel/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/lxqt-panel/Makefile
diff -u pkgsrc/x11/lxqt-panel/Makefile:1.37 pkgsrc/x11/lxqt-panel/Makefile:1.38
--- pkgsrc/x11/lxqt-panel/Makefile:1.37 Fri Aug 11 08:12:53 2023
+++ pkgsrc/x11/lxqt-panel/Makefile      Fri Aug 11 16:24:45 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2023/08/11 08:12:53 nia Exp $
+# $NetBSD: Makefile,v 1.38 2023/08/11 16:24:45 nia Exp $
 
 DISTNAME=      lxqt-panel-1.3.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -19,16 +19,15 @@ USE_LANGUAGES=      c c++
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ..
 
+# Requires libsensors, unavailable in pkgsrc
+CMAKE_ARGS+=   -DSENSORS_PLUGIN=No
+
+# Requires sysstat-qt5, unavailable in pkgsrc
 CMAKE_ARGS+=   -DSYSSTAT_PLUGIN=No
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
+# Appear non-functional on NetBSD currently.
 CMAKE_ARGS+=   -DCPULOAD_PLUGIN=No
 CMAKE_ARGS+=   -DMOUNT_PLUGIN=No
-CMAKE_ARGS+=   -DSENSORS_PLUGIN=No
-CMAKE_ARGS+=   -DNETWORKMONITOR_PLUGIN=No
-CMAKE_ARGS+=   -DVOLUME_USE_ALSA=No
-.endif
 
 MENU_CONF=             share/examples/menus
 AUTOSTART_CONF=                share/examples/autostart
@@ -66,14 +65,15 @@ TOOL_DEPENDS+=      lxqt-build-tools>=0.13.0:
 TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 DEPENDS+=      lxmenu-data-[0-9]*:../../sysutils/lxmenu-data
 
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "options.mk"
 .include "../../devel/libdbusmenu-qt5/buildlink3.mk"
+.include "../../devel/libstatgrab/buildlink3.mk"
+.include "../../sysutils/menu-cache/buildlink3.mk"
+.include "../../sysutils/solid/buildlink3.mk"
 .include "../../x11/kwindowsystem/buildlink3.mk"
 .include "../../x11/kguiaddons/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/lxqt-globalkeys/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../sysutils/menu-cache/buildlink3.mk"
-.include "../../sysutils/solid/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/lxqt-panel/PLIST
diff -u pkgsrc/x11/lxqt-panel/PLIST:1.10 pkgsrc/x11/lxqt-panel/PLIST:1.11
--- pkgsrc/x11/lxqt-panel/PLIST:1.10    Tue Apr 18 11:59:59 2023
+++ pkgsrc/x11/lxqt-panel/PLIST Fri Aug 11 16:24:45 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2023/04/18 11:59:59 pin Exp $
+@comment $NetBSD: PLIST,v 1.11 2023/08/11 16:24:45 nia Exp $
 bin/lxqt-panel
 include/lxqt/ilxqtpanel.h
 include/lxqt/ilxqtpanelplugin.h
@@ -10,6 +10,7 @@ lib/lxqt-panel/libcustomcommand.so
 lib/lxqt-panel/libdirectorymenu.so
 lib/lxqt-panel/libdom.so
 lib/lxqt-panel/libkbindicator.so
+lib/lxqt-panel/libnetworkmonitor.so
 lib/lxqt-panel/libqeyes.so
 lib/lxqt-panel/libvolume.so
 man/man1/lxqt-panel.1
@@ -28,6 +29,7 @@ share/lxqt/lxqt-panel/directorymenu.desk
 share/lxqt/lxqt-panel/dom.desktop
 share/lxqt/lxqt-panel/kbindicator.desktop
 share/lxqt/lxqt-panel/mainmenu.desktop
+share/lxqt/lxqt-panel/networkmonitor.desktop
 share/lxqt/lxqt-panel/qeyes.desktop
 share/lxqt/lxqt-panel/quicklaunch.desktop
 share/lxqt/lxqt-panel/showdesktop.desktop
@@ -385,6 +387,50 @@ share/lxqt/translations/lxqt-panel/mainm
 share/lxqt/translations/lxqt-panel/mainmenu/mainmenu_uk.qm
 share/lxqt/translations/lxqt-panel/mainmenu/mainmenu_zh_CN.qm
 share/lxqt/translations/lxqt-panel/mainmenu/mainmenu_zh_TW.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ar.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_arn.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ast.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_bg.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ca.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_cs.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_cy.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_da.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_de.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_el.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_eo.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_es.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_et.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_eu.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_fi.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_fr.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_gl.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_he.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_hi.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_hr.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_hu.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_id.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_it.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ja.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ko.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_lt.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_lv.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_nb_NO.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_nl.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_oc.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_pl.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_pt.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_pt_BR.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ro_RO.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_ru.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_si.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_sk_SK.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_sr.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_sr%ijekavian.qm@localhost
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_th_TH.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_tr.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_uk.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_zh_CN.qm
+share/lxqt/translations/lxqt-panel/networkmonitor/networkmonitor_zh_TW.qm
 share/lxqt/translations/lxqt-panel/qeyes/qeyes_fr.qm
 share/lxqt/translations/lxqt-panel/qeyes/qeyes_it.qm
 share/lxqt/translations/lxqt-panel/qeyes/qeyes_lt.qm

Added files:

Index: pkgsrc/x11/lxqt-panel/options.mk
diff -u /dev/null pkgsrc/x11/lxqt-panel/options.mk:1.1
--- /dev/null   Fri Aug 11 16:24:46 2023
+++ pkgsrc/x11/lxqt-panel/options.mk    Fri Aug 11 16:24:45 2023
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2023/08/11 16:24:45 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.lxqt-panel
+PKG_SUPPORTED_OPTIONS=         alsa pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CMAKE_ARGS+=   -DVOLUME_USE_ALSA=ON
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DVOLUME_USE_ALSA=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CMAKE_ARGS+=   -DVOLUME_USE_PULSEAUDIO=ON
+.  include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DVOLUME_USE_PULSEAUDIO=OFF
+.endif