pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sddm: Minor PLIST fixes
Module Name: pkgsrc-wip
Committed By: Stepan Ipatov <st.ipatov%gmail.com@localhost>
Pushed By: st.ipatov
Date: Thu Oct 16 01:16:03 2025 +0000
Changeset: 6d8d90efc9583a596a3ddee4bbf8531ed785ac51
Modified Files:
sddm/PLIST
sddm/options.mk
Removed Files:
sddm/PLIST.qt5
Log Message:
sddm: Minor PLIST fixes
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6d8d90efc9583a596a3ddee4bbf8531ed785ac51
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sddm/PLIST | 174 ++++++++++++++++++++++++++++++++++++------------------
sddm/PLIST.qt5 | 178 --------------------------------------------------------
sddm/options.mk | 6 +-
3 files changed, 121 insertions(+), 237 deletions(-)
diffs:
diff --git a/sddm/PLIST b/sddm/PLIST
index 6a1ed9ec86..75ccaa67d0 100644
--- a/sddm/PLIST
+++ b/sddm/PLIST
@@ -1,6 +1,7 @@
@comment $NetBSD$
bin/sddm
-bin/sddm-greeter-qt6
+${PLIST.qt5}bin/sddm-greeter
+${PLIST.qt6}bin/sddm-greeter-qt6
libexec/sddm-helper
libexec/sddm-helper-start-wayland
libexec/sddm-helper-start-x11user
@@ -8,19 +9,32 @@ man/man1/sddm-greeter.1
man/man1/sddm.1
man/man5/sddm-state.conf.5
man/man5/sddm.conf.5
-qt6/qml/SddmComponents/Background.qml
-qt6/qml/SddmComponents/Button.qml
-qt6/qml/SddmComponents/Clock.qml
-qt6/qml/SddmComponents/ComboBox.qml
-qt6/qml/SddmComponents/ImageButton.qml
-qt6/qml/SddmComponents/LayoutBox.qml
-qt6/qml/SddmComponents/Menu.qml
-qt6/qml/SddmComponents/PasswordBox.qml
-qt6/qml/SddmComponents/PictureBox.qml
-qt6/qml/SddmComponents/TextBox.qml
-qt6/qml/SddmComponents/TextConstants.qml
-qt6/qml/SddmComponents/qmldir
-qt6/qml/SddmComponents/warning.png
+${PLIST.qt5}qt5/qml/SddmComponents/Background.qml
+${PLIST.qt5}qt5/qml/SddmComponents/Button.qml
+${PLIST.qt5}qt5/qml/SddmComponents/Clock.qml
+${PLIST.qt5}qt5/qml/SddmComponents/ComboBox.qml
+${PLIST.qt5}qt5/qml/SddmComponents/ImageButton.qml
+${PLIST.qt5}qt5/qml/SddmComponents/LayoutBox.qml
+${PLIST.qt5}qt5/qml/SddmComponents/Menu.qml
+${PLIST.qt5}qt5/qml/SddmComponents/PasswordBox.qml
+${PLIST.qt5}qt5/qml/SddmComponents/PictureBox.qml
+${PLIST.qt5}qt5/qml/SddmComponents/TextBox.qml
+${PLIST.qt5}qt5/qml/SddmComponents/TextConstants.qml
+${PLIST.qt5}qt5/qml/SddmComponents/qmldir
+${PLIST.qt5}qt5/qml/SddmComponents/warning.png
+${PLIST.qt6}qt6/qml/SddmComponents/Background.qml
+${PLIST.qt6}qt6/qml/SddmComponents/Button.qml
+${PLIST.qt6}qt6/qml/SddmComponents/Clock.qml
+${PLIST.qt6}qt6/qml/SddmComponents/ComboBox.qml
+${PLIST.qt6}qt6/qml/SddmComponents/ImageButton.qml
+${PLIST.qt6}qt6/qml/SddmComponents/LayoutBox.qml
+${PLIST.qt6}qt6/qml/SddmComponents/Menu.qml
+${PLIST.qt6}qt6/qml/SddmComponents/PasswordBox.qml
+${PLIST.qt6}qt6/qml/SddmComponents/PictureBox.qml
+${PLIST.qt6}qt6/qml/SddmComponents/TextBox.qml
+${PLIST.qt6}qt6/qml/SddmComponents/TextConstants.qml
+${PLIST.qt6}qt6/qml/SddmComponents/qmldir
+${PLIST.qt6}qt6/qml/SddmComponents/warning.png
share/examples/pam.d/sddm
share/examples/pam.d/sddm-autologin
share/examples/pam.d/sddm-greeter
@@ -130,49 +144,93 @@ share/sddm/themes/elarun/images/system_switch_user.png
share/sddm/themes/elarun/images/user_icon.png
share/sddm/themes/elarun/metadata.desktop
share/sddm/themes/elarun/theme.conf
-share/sddm/translations-qt6/ar.qm
-share/sddm/translations-qt6/bg.qm
-share/sddm/translations-qt6/bn.qm
-share/sddm/translations-qt6/ca.qm
-share/sddm/translations-qt6/cs.qm
-share/sddm/translations-qt6/da.qm
-share/sddm/translations-qt6/de.qm
-share/sddm/translations-qt6/es.qm
-share/sddm/translations-qt6/et.qm
-share/sddm/translations-qt6/eu.qm
-share/sddm/translations-qt6/fi.qm
-share/sddm/translations-qt6/fr.qm
-share/sddm/translations-qt6/gl.qm
-share/sddm/translations-qt6/he.qm
-share/sddm/translations-qt6/hi_IN.qm
-share/sddm/translations-qt6/hu.qm
-share/sddm/translations-qt6/ie.qm
-share/sddm/translations-qt6/is.qm
-share/sddm/translations-qt6/it.qm
-share/sddm/translations-qt6/ja.qm
-share/sddm/translations-qt6/ka.qm
-share/sddm/translations-qt6/kk.qm
-share/sddm/translations-qt6/ko.qm
-share/sddm/translations-qt6/lt.qm
-share/sddm/translations-qt6/lv.qm
-share/sddm/translations-qt6/nb.qm
-share/sddm/translations-qt6/nl.qm
-share/sddm/translations-qt6/nn.qm
-share/sddm/translations-qt6/oc.qm
-share/sddm/translations-qt6/pl.qm
-share/sddm/translations-qt6/pt_BR.qm
-share/sddm/translations-qt6/pt_PT.qm
-share/sddm/translations-qt6/ro.qm
-share/sddm/translations-qt6/ru.qm
-share/sddm/translations-qt6/sk.qm
-share/sddm/translations-qt6/sr.qm
-share/sddm/translations-qt6/sr%ijekavian.qm@localhost
-share/sddm/translations-qt6/sr%ijekavianlatin.qm@localhost
-share/sddm/translations-qt6/sr%latin.qm@localhost
-share/sddm/translations-qt6/sv.qm
-share/sddm/translations-qt6/tr.qm
-share/sddm/translations-qt6/uk.qm
-share/sddm/translations-qt6/zh_CN.qm
-share/sddm/translations-qt6/zh_TW.qm
+${PLIST.qt5}share/sddm/translations-qt5/ar.qm
+${PLIST.qt5}share/sddm/translations-qt5/bg.qm
+${PLIST.qt5}share/sddm/translations-qt5/bn.qm
+${PLIST.qt5}share/sddm/translations-qt5/ca.qm
+${PLIST.qt5}share/sddm/translations-qt5/cs.qm
+${PLIST.qt5}share/sddm/translations-qt5/da.qm
+${PLIST.qt5}share/sddm/translations-qt5/de.qm
+${PLIST.qt5}share/sddm/translations-qt5/es.qm
+${PLIST.qt5}share/sddm/translations-qt5/et.qm
+${PLIST.qt5}share/sddm/translations-qt5/eu.qm
+${PLIST.qt5}share/sddm/translations-qt5/fi.qm
+${PLIST.qt5}share/sddm/translations-qt5/fr.qm
+${PLIST.qt5}share/sddm/translations-qt5/gl.qm
+${PLIST.qt5}share/sddm/translations-qt5/he.qm
+${PLIST.qt5}share/sddm/translations-qt5/hi_IN.qm
+${PLIST.qt5}share/sddm/translations-qt5/hu.qm
+${PLIST.qt5}share/sddm/translations-qt5/ie.qm
+${PLIST.qt5}share/sddm/translations-qt5/is.qm
+${PLIST.qt5}share/sddm/translations-qt5/it.qm
+${PLIST.qt5}share/sddm/translations-qt5/ja.qm
+${PLIST.qt5}share/sddm/translations-qt5/ka.qm
+${PLIST.qt5}share/sddm/translations-qt5/kk.qm
+${PLIST.qt5}share/sddm/translations-qt5/ko.qm
+${PLIST.qt5}share/sddm/translations-qt5/lt.qm
+${PLIST.qt5}share/sddm/translations-qt5/lv.qm
+${PLIST.qt5}share/sddm/translations-qt5/nb.qm
+${PLIST.qt5}share/sddm/translations-qt5/nl.qm
+${PLIST.qt5}share/sddm/translations-qt5/nn.qm
+${PLIST.qt5}share/sddm/translations-qt5/oc.qm
+${PLIST.qt5}share/sddm/translations-qt5/pl.qm
+${PLIST.qt5}share/sddm/translations-qt5/pt_BR.qm
+${PLIST.qt5}share/sddm/translations-qt5/pt_PT.qm
+${PLIST.qt5}share/sddm/translations-qt5/ro.qm
+${PLIST.qt5}share/sddm/translations-qt5/ru.qm
+${PLIST.qt5}share/sddm/translations-qt5/sk.qm
+${PLIST.qt5}share/sddm/translations-qt5/sr.qm
+${PLIST.qt5}share/sddm/translations-qt5/sr%ijekavian.qm@localhost
+${PLIST.qt5}share/sddm/translations-qt5/sr%ijekavianlatin.qm@localhost
+${PLIST.qt5}share/sddm/translations-qt5/sr%latin.qm@localhost
+${PLIST.qt5}share/sddm/translations-qt5/sv.qm
+${PLIST.qt5}share/sddm/translations-qt5/tr.qm
+${PLIST.qt5}share/sddm/translations-qt5/uk.qm
+${PLIST.qt5}share/sddm/translations-qt5/zh_CN.qm
+${PLIST.qt5}share/sddm/translations-qt5/zh_TW.qm
+${PLIST.qt6}share/sddm/translations-qt6/ar.qm
+${PLIST.qt6}share/sddm/translations-qt6/bg.qm
+${PLIST.qt6}share/sddm/translations-qt6/bn.qm
+${PLIST.qt6}share/sddm/translations-qt6/ca.qm
+${PLIST.qt6}share/sddm/translations-qt6/cs.qm
+${PLIST.qt6}share/sddm/translations-qt6/da.qm
+${PLIST.qt6}share/sddm/translations-qt6/de.qm
+${PLIST.qt6}share/sddm/translations-qt6/es.qm
+${PLIST.qt6}share/sddm/translations-qt6/et.qm
+${PLIST.qt6}share/sddm/translations-qt6/eu.qm
+${PLIST.qt6}share/sddm/translations-qt6/fi.qm
+${PLIST.qt6}share/sddm/translations-qt6/fr.qm
+${PLIST.qt6}share/sddm/translations-qt6/gl.qm
+${PLIST.qt6}share/sddm/translations-qt6/he.qm
+${PLIST.qt6}share/sddm/translations-qt6/hi_IN.qm
+${PLIST.qt6}share/sddm/translations-qt6/hu.qm
+${PLIST.qt6}share/sddm/translations-qt6/ie.qm
+${PLIST.qt6}share/sddm/translations-qt6/is.qm
+${PLIST.qt6}share/sddm/translations-qt6/it.qm
+${PLIST.qt6}share/sddm/translations-qt6/ja.qm
+${PLIST.qt6}share/sddm/translations-qt6/ka.qm
+${PLIST.qt6}share/sddm/translations-qt6/kk.qm
+${PLIST.qt6}share/sddm/translations-qt6/ko.qm
+${PLIST.qt6}share/sddm/translations-qt6/lt.qm
+${PLIST.qt6}share/sddm/translations-qt6/lv.qm
+${PLIST.qt6}share/sddm/translations-qt6/nb.qm
+${PLIST.qt6}share/sddm/translations-qt6/nl.qm
+${PLIST.qt6}share/sddm/translations-qt6/nn.qm
+${PLIST.qt6}share/sddm/translations-qt6/oc.qm
+${PLIST.qt6}share/sddm/translations-qt6/pl.qm
+${PLIST.qt6}share/sddm/translations-qt6/pt_BR.qm
+${PLIST.qt6}share/sddm/translations-qt6/pt_PT.qm
+${PLIST.qt6}share/sddm/translations-qt6/ro.qm
+${PLIST.qt6}share/sddm/translations-qt6/ru.qm
+${PLIST.qt6}share/sddm/translations-qt6/sk.qm
+${PLIST.qt6}share/sddm/translations-qt6/sr.qm
+${PLIST.qt6}share/sddm/translations-qt6/sr%ijekavian.qm@localhost
+${PLIST.qt6}share/sddm/translations-qt6/sr%ijekavianlatin.qm@localhost
+${PLIST.qt6}share/sddm/translations-qt6/sr%latin.qm@localhost
+${PLIST.qt6}share/sddm/translations-qt6/sv.qm
+${PLIST.qt6}share/sddm/translations-qt6/tr.qm
+${PLIST.qt6}share/sddm/translations-qt6/uk.qm
+${PLIST.qt6}share/sddm/translations-qt6/zh_CN.qm
+${PLIST.qt6}share/sddm/translations-qt6/zh_TW.qm
share/xsessions/ctwm.desktop
share/xsessions/xinitrc.desktop
diff --git a/sddm/PLIST.qt5 b/sddm/PLIST.qt5
deleted file mode 100644
index 351043e48e..0000000000
--- a/sddm/PLIST.qt5
+++ /dev/null
@@ -1,178 +0,0 @@
-@comment $NetBSD$
-bin/sddm
-bin/sddm-greeter
-libexec/sddm-helper
-libexec/sddm-helper-start-wayland
-libexec/sddm-helper-start-x11user
-man/man1/sddm-greeter.1
-man/man1/sddm.1
-man/man5/sddm-state.conf.5
-man/man5/sddm.conf.5
-qt5/qml/SddmComponents/Background.qml
-qt5/qml/SddmComponents/Button.qml
-qt5/qml/SddmComponents/Clock.qml
-qt5/qml/SddmComponents/ComboBox.qml
-qt5/qml/SddmComponents/ImageButton.qml
-qt5/qml/SddmComponents/LayoutBox.qml
-qt5/qml/SddmComponents/Menu.qml
-qt5/qml/SddmComponents/PasswordBox.qml
-qt5/qml/SddmComponents/PictureBox.qml
-qt5/qml/SddmComponents/TextBox.qml
-qt5/qml/SddmComponents/TextConstants.qml
-qt5/qml/SddmComponents/qmldir
-qt5/qml/SddmComponents/warning.png
-share/examples/pam.d/sddm
-share/examples/pam.d/sddm-autologin
-share/examples/pam.d/sddm-greeter
-share/examples/sddm/org.freedesktop.DisplayManager.conf
-share/sddm/faces/.face.icon
-share/sddm/faces/root.face.icon
-share/sddm/flags/ae.png
-share/sddm/flags/am.png
-share/sddm/flags/ar.png
-share/sddm/flags/at.png
-share/sddm/flags/az.png
-share/sddm/flags/bd.png
-share/sddm/flags/be.png
-share/sddm/flags/bg.png
-share/sddm/flags/bh.png
-share/sddm/flags/br.png
-share/sddm/flags/by.png
-share/sddm/flags/ca.png
-share/sddm/flags/ch.png
-share/sddm/flags/cu.png
-share/sddm/flags/cz.png
-share/sddm/flags/de.png
-share/sddm/flags/dj.png
-share/sddm/flags/dk.png
-share/sddm/flags/dz.png
-share/sddm/flags/ee.png
-share/sddm/flags/eg.png
-share/sddm/flags/es.png
-share/sddm/flags/eu.png
-share/sddm/flags/fi.png
-share/sddm/flags/fr.png
-share/sddm/flags/gb.png
-share/sddm/flags/ge.png
-share/sddm/flags/gr.png
-share/sddm/flags/hr.png
-share/sddm/flags/hu.png
-share/sddm/flags/il.png
-share/sddm/flags/in.png
-share/sddm/flags/iq.png
-share/sddm/flags/is.png
-share/sddm/flags/it.png
-share/sddm/flags/jo.png
-share/sddm/flags/jp.png
-share/sddm/flags/km.png
-share/sddm/flags/kr.png
-share/sddm/flags/kw.png
-share/sddm/flags/la.png
-share/sddm/flags/lb.png
-share/sddm/flags/lt.png
-share/sddm/flags/lv.png
-share/sddm/flags/ly.png
-share/sddm/flags/ma.png
-share/sddm/flags/mk.png
-share/sddm/flags/mn.png
-share/sddm/flags/mx.png
-share/sddm/flags/nl.png
-share/sddm/flags/no.png
-share/sddm/flags/om.png
-share/sddm/flags/pl.png
-share/sddm/flags/ps.png
-share/sddm/flags/pt.png
-share/sddm/flags/qa.png
-share/sddm/flags/qc.png
-share/sddm/flags/ro.png
-share/sddm/flags/ru.png
-share/sddm/flags/sa.png
-share/sddm/flags/sd.png
-share/sddm/flags/se.png
-share/sddm/flags/si.png
-share/sddm/flags/sk.png
-share/sddm/flags/so.png
-share/sddm/flags/sr.png
-share/sddm/flags/sy.png
-share/sddm/flags/th.png
-share/sddm/flags/tn.png
-share/sddm/flags/tr.png
-share/sddm/flags/ua.png
-share/sddm/flags/uk.png
-share/sddm/flags/un.png
-share/sddm/flags/us.png
-share/sddm/flags/uy.png
-share/sddm/flags/vn.png
-share/sddm/flags/ye.png
-share/sddm/flags/yu.png
-share/sddm/flags/zz.png
-share/sddm/scripts/Xsession
-share/sddm/scripts/Xsetup
-share/sddm/scripts/Xstop
-share/sddm/scripts/wayland-session
-share/sddm/scripts/xinit-session
-share/sddm/themes/elarun/Main.qml
-share/sddm/themes/elarun/README
-share/sddm/themes/elarun/angle-down.png
-share/sddm/themes/elarun/elarun.jpg
-share/sddm/themes/elarun/images/background.png
-share/sddm/themes/elarun/images/lock.png
-share/sddm/themes/elarun/images/login_active.png
-share/sddm/themes/elarun/images/login_normal.png
-share/sddm/themes/elarun/images/rectangle.png
-share/sddm/themes/elarun/images/rectangle_overlay.png
-share/sddm/themes/elarun/images/session_normal.png
-share/sddm/themes/elarun/images/system_hibernate.png
-share/sddm/themes/elarun/images/system_reboot.png
-share/sddm/themes/elarun/images/system_shutdown.png
-share/sddm/themes/elarun/images/system_suspend.png
-share/sddm/themes/elarun/images/system_switch_user.png
-share/sddm/themes/elarun/images/user_icon.png
-share/sddm/themes/elarun/metadata.desktop
-share/sddm/themes/elarun/theme.conf
-share/sddm/translations-qt5/ar.qm
-share/sddm/translations-qt5/bg.qm
-share/sddm/translations-qt5/bn.qm
-share/sddm/translations-qt5/ca.qm
-share/sddm/translations-qt5/cs.qm
-share/sddm/translations-qt5/da.qm
-share/sddm/translations-qt5/de.qm
-share/sddm/translations-qt5/es.qm
-share/sddm/translations-qt5/et.qm
-share/sddm/translations-qt5/eu.qm
-share/sddm/translations-qt5/fi.qm
-share/sddm/translations-qt5/fr.qm
-share/sddm/translations-qt5/gl.qm
-share/sddm/translations-qt5/he.qm
-share/sddm/translations-qt5/hi_IN.qm
-share/sddm/translations-qt5/hu.qm
-share/sddm/translations-qt5/ie.qm
-share/sddm/translations-qt5/is.qm
-share/sddm/translations-qt5/it.qm
-share/sddm/translations-qt5/ja.qm
-share/sddm/translations-qt5/ka.qm
-share/sddm/translations-qt5/kk.qm
-share/sddm/translations-qt5/ko.qm
-share/sddm/translations-qt5/lt.qm
-share/sddm/translations-qt5/lv.qm
-share/sddm/translations-qt5/nb.qm
-share/sddm/translations-qt5/nl.qm
-share/sddm/translations-qt5/nn.qm
-share/sddm/translations-qt5/oc.qm
-share/sddm/translations-qt5/pl.qm
-share/sddm/translations-qt5/pt_BR.qm
-share/sddm/translations-qt5/pt_PT.qm
-share/sddm/translations-qt5/ro.qm
-share/sddm/translations-qt5/ru.qm
-share/sddm/translations-qt5/sk.qm
-share/sddm/translations-qt5/sr.qm
-share/sddm/translations-qt5/sr%ijekavian.qm@localhost
-share/sddm/translations-qt5/sr%ijekavianlatin.qm@localhost
-share/sddm/translations-qt5/sr%latin.qm@localhost
-share/sddm/translations-qt5/sv.qm
-share/sddm/translations-qt5/tr.qm
-share/sddm/translations-qt5/uk.qm
-share/sddm/translations-qt5/zh_CN.qm
-share/sddm/translations-qt5/zh_TW.qm
-share/xsessions/ctwm.desktop
-share/xsessions/xinitrc.desktop
diff --git a/sddm/options.mk b/sddm/options.mk
index 396a11ee39..1dbf417403 100644
--- a/sddm/options.mk
+++ b/sddm/options.mk
@@ -5,11 +5,14 @@ PKG_OPTIONS_REQUIRED_GROUPS+= gui
PKG_OPTIONS_GROUP.gui= qt5 qt6
PKG_SUGGESTED_OPTIONS+= qt6
+PLIST_VARS+= qt5
+PLIST_VARS+= qt6
+
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
.if ${PKG_OPTIONS:Mqt5}
-PLIST_SRC=PLIST.qt5
+PLIST.qt5= yes
CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=OFF
BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.17
.include "../../x11/qt5-qtbase/buildlink3.mk"
@@ -18,6 +21,7 @@ BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.17
.endif
.if ${PKG_OPTIONS:Mqt6}
+PLIST.qt6= yes
CMAKE_CONFIGURE_ARGS+= -DBUILD_WITH_QT6=ON
.include "../../x11/qt6-qtbase/buildlink3.mk"
.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index