In this email, I have attached a preliminary diff for upgrading Lumina
from version 1.4.0-p1 to version 1.6.2 [1]. I refer to it as a
preliminary version because it still requires refinement. Although this
desktop environment appears to build correctly, the package installation
does not place the files in the appropriate directories.
I have definitively resolved the issue with file installation; the port now
builds and installs correctly. Previously, I thought I had fixed it, but I
hadn't. However, I have not yet tested whether it functions properly when
executed.
In this email, I have attached the updated diff.
OKs? Comments?
not ok, it's not ready yet. (not that there's much you can do with
an ok yourself anyway..)
Thanks for taking the time to review my diff! In this email I have
attached a new diff with your corrections.
: Index: ports/x11/lumina/Makefile
: ===================================================================
: RCS file: /cvs/ports/x11/lumina/Makefile,v
: diff -u -p -u -r1.40 Makefile
: --- ports/x11/lumina/Makefile 24 Jan 2025 09:20:59 -0000 1.40
: +++ ports/x11/lumina/Makefile 8 Mar 2025 01:20:42 -0000
: @@ -1,17 +1,14 @@
: COMMENT= Lumina Desktop Environment
:
: -GH_ACCOUNT= trueos
: +GH_ACCOUNT= lumina-desktop
: GH_PROJECT= lumina
: -GH_TAGNAME= v1.4.0-p1
: -PKGNAME= lumina-1.4.0pl1
: -REVISION= 8
: +GH_TAGNAME= v1.6.2
: +PKGNAME= lumina-1.6.2
PKGNAME can just be dropped here, the default is ok. (it was needed
before for -p1 -> pl1).
(make show=PKGNAMES to confirm)
Corrected.
: CATEGORIES= x11
:
: HOMEPAGE= https://lumina-desktop.org/
:
: -MAINTAINER= Bryan C. Everly <br...@bceassociates.com>
: -
dropping maintainer should be discussed first before just putting
it in a diff.
Corrected.
: MAKE_FLAGS= LIBLuminaUtils_VERSION=${LIBLuminaUtils_VERSION}
: -FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}/
: +FAKE_FLAGS= INSTALL_ROOT=${WRKINST}/usr/local/
INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
(not quite sure why INSTALL_ROOT=${PREFIX} doesn't work though)
Corrected.
: - mv ${WRKINST}/etc/luminaDesktop.conf.dist \
: + mv ${WRKINST}/usr/local/etc/luminaDesktop.conf.dist \
mv ${PREFIX}/etc/luminaDesktop.conf.dist [...]
Corrected.
: - gunzip ${PREFIX}/man/man{1,8}/*.gz
: + gunzip ${WRKINST}/usr/local/man/man{1,8}/*.gz
those expand to the same thing here but ${PREFIX} is more correct
Corrected.
: -lib/qt5/plugins/platformthemes/liblthemeengine.so
: -lib/qt5/plugins/styles/
: -lib/qt5/plugins/styles/liblthemeengine-style.so
...
: +usr/
: +usr/local/
: +usr/local/lib/
: +usr/local/lib/qt5/
: +usr/local/lib/qt5/plugins/
: +usr/local/lib/qt5/plugins/platformthemes/
: +@so usr/local/lib/qt5/plugins/platformthemes/liblthemeengine.so
: +usr/local/lib/qt5/plugins/styles/
: +@so usr/local/lib/qt5/plugins/styles/liblthemeengine-style.so
that (i.e. /usr/local/usr/local/lib/qt5/plugins) is definitely wrong
Corrected.
: +etc/
that shouldn't be in the package
Corrected.
: share/examples/lumina/
: share/examples/lumina/luminaDesktop.conf
: @sample ${SYSCONFDIR}/luminaDesktop.conf
: +@tag gtk-update-icon-cache %D/share/icons/material-design-dark
: +@tag gtk-update-icon-cache %D/share/icons/material-design-light
: +@tag update-desktop-database
please collect all the @tag together at the bottom
Corrected.
: -share/pixmaps/Lumina-DE.png
: share/xsessions/
: share/xsessions/Lumina-DE.desktop
: -@tag gtk-update-icon-cache %D/share/icons/material-design-dark
: -@tag gtk-update-icon-cache %D/share/icons/material-design-light
: -@tag update-desktop-database
: +@tag gtk-update-icon-cache %D/share/icons/lumina-icons
: +@tag gtk-update-icon-cache %D/share/icons/hicolor
: Index: ports/x11/lumina/pkg/DESCR
: ===================================================================
: RCS file: /cvs/ports/x11/lumina/pkg/DESCR,v
: diff -u -p -u -r1.3 DESCR
: --- ports/x11/lumina/pkg/DESCR 31 Oct 2016 17:49:30 -0000 1.3
: +++ ports/x11/lumina/pkg/DESCR 8 Mar 2025 01:21:42 -0000
: @@ -1 +1,6 @@
: -Lumina-DE is a lightweight, BSD licensed desktop environment.
: +The Lumina Desktop Environment is a lightweight system interface that is
: +designed for use on any Unix-like operating system. It takes a plugin-based
: +approach, allowing the entire interface to be assembled/arranged by each
: +individual user as desired, with a system-wide default layout which can be
: +setup by the system administrator. This allows every system (or user session)
: +to be designed to maximize the individual user's productivity.
stray whitespace at the end of each line except the last
I don't see any stray whitespace at the end of the last line.
:
: }else : openbsd-*{
: +- isEmpty(PREFIX){ PREFIX=/usr/local }
: ++ isEmpty(L_ETCDIR){ L_ETCDIR=!!SYSCONFDIR!! }
: OS = OpenBSD
: - LIBS += -L/usr/local/lib -L/usr/lib
: + LIBS += -L!!LOCALBASE!!/lib -L/usr/lib
: -+ isEmpty(L_ETCDIR){ L_ETCDIR=!!SYSCONFDIR!! }
: #Use the defaults for everything else
this doesn't feel right, looks like a mis-merge by patch?
I think the patch is correct, you can look at the source code for
yourself [1], there is nothing in it that looks wrong.
References:
[1]:
https://github.com/lumina-desktop/lumina/blob/v1.6.2/src-qt5/OS-detect.priIndex: ports/x11/lumina/Makefile
===================================================================
RCS file: /cvs/ports/x11/lumina/Makefile,v
diff -u -p -u -r1.40 Makefile
--- ports/x11/lumina/Makefile 24 Jan 2025 09:20:59 -0000 1.40
+++ ports/x11/lumina/Makefile 9 Mar 2025 08:05:28 -0000
@@ -1,10 +1,8 @@
COMMENT= Lumina Desktop Environment
-GH_ACCOUNT= trueos
+GH_ACCOUNT= lumina-desktop
GH_PROJECT= lumina
-GH_TAGNAME= v1.4.0-p1
-PKGNAME= lumina-1.4.0pl1
-REVISION= 8
+GH_TAGNAME= v1.6.2
CATEGORIES= x11
@@ -20,7 +18,7 @@ WANTLIB += GL Qt5Concurrent Qt5Core Qt5D
WANTLIB += Qt5MultimediaWidgets Qt5Network Qt5PrintSupport Qt5Svg
WANTLIB += Qt5Widgets Qt5X11Extras Xdamage c glib-2.0 intl m
WANTLIB += poppler-qt5 pulse pulse-mainloop-glib xcb xcb-composite
-WANTLIB += xcb-damage xcb-ewmh xcb-icccm xcb-image xcb-util
+WANTLIB += xcb-damage xcb-ewmh xcb-icccm xcb-image xcb-util Xcursor
MODULES= x11/qt5
@@ -39,7 +37,7 @@ LIB_DEPENDS= print/poppler,-qt5 \
x11/qt5/qtx11extras
MAKE_FLAGS= LIBLuminaUtils_VERSION=${LIBLuminaUtils_VERSION}
-FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}/
+FAKE_FLAGS= INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
NO_TEST= Yes
@@ -54,7 +52,7 @@ do-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lumina
- mv ${WRKINST}/etc/luminaDesktop.conf.dist \
+ mv ${PREFIX}/etc/luminaDesktop.conf.dist \
${PREFIX}/share/examples/lumina/luminaDesktop.conf
gunzip ${PREFIX}/man/man{1,8}/*.gz
Index: ports/x11/lumina/distinfo
===================================================================
RCS file: /cvs/ports/x11/lumina/distinfo,v
diff -u -p -u -r1.18 distinfo
--- ports/x11/lumina/distinfo 14 Dec 2017 17:22:26 -0000 1.18
+++ ports/x11/lumina/distinfo 9 Mar 2025 08:05:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (lumina-1.4.0-p1.tar.gz) = ayAvTrS8y7GzTXGcIRo5+9GDdTT21hHz+5F6vJmU5y8=
-SIZE (lumina-1.4.0-p1.tar.gz) = 22489599
+SHA256 (lumina-1.6.2.tar.gz) = AsykXmVXJzYJkNuKnjk1vlTMT7sBsznRzUBtKA7N864=
+SIZE (lumina-1.6.2.tar.gz) = 20818383
Index: ports/x11/lumina/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/lumina/pkg/PLIST,v
diff -u -p -u -r1.19 PLIST
--- ports/x11/lumina/pkg/PLIST 11 Mar 2022 20:16:38 -0000 1.19
+++ ports/x11/lumina/pkg/PLIST 9 Mar 2025 08:05:52 -0000
@@ -2,28 +2,23 @@
@pkgpath x11/lumina/lumina
bin/lte
@bin bin/lthemeengine
+@bin bin/lthemeengine-sstest
@bin bin/lumina-archiver
-@bin bin/lumina-calculator
@bin bin/lumina-config
@bin bin/lumina-desktop
@bin bin/lumina-fileinfo
@bin bin/lumina-fm
@bin bin/lumina-info
@bin bin/lumina-mediaplayer
-@bin bin/lumina-notify
@bin bin/lumina-open
-@bin bin/lumina-pdf
+@bin bin/lumina-photo
+@bin bin/lumina-pingcursor
@bin bin/lumina-screenshot
@bin bin/lumina-search
@bin bin/lumina-textedit
@bin bin/lumina-xconfig
-@bin bin/lumina-xdg-entry
@bin bin/start-lumina-desktop
-lib/qt5/plugins/platformthemes/liblthemeengine.so
-lib/qt5/plugins/styles/
-lib/qt5/plugins/styles/liblthemeengine-style.so
@man man/man1/lumina-archiver.1
-@man man/man1/lumina-calculator.1
@man man/man1/lumina-config.1
@man man/man1/lumina-desktop.1
@man man/man1/lumina-fileinfo.1
@@ -31,30 +26,72 @@ lib/qt5/plugins/styles/liblthemeengine-s
@man man/man1/lumina-info.1
@man man/man1/lumina-mediaplayer.1
@man man/man1/lumina-open.1
+@man man/man1/lumina-photo.1
@man man/man1/lumina-screenshot.1
@man man/man1/lumina-search.1
@man man/man1/lumina-textedit.1
@man man/man1/lumina-xconfig.1
-@man man/man1/lumina-xdg-entry.1
@man man/man8/start-lumina-desktop.8
share/applications/lthemeengine.desktop
share/applications/lumina-archiver.desktop
-share/applications/lumina-calculator.desktop
share/applications/lumina-config.desktop
share/applications/lumina-fileinfo.desktop
share/applications/lumina-fm.desktop
share/applications/lumina-info.desktop
+share/applications/lumina-mediaplayer-pandora.desktop
share/applications/lumina-mediaplayer.desktop
-share/applications/lumina-pdf.desktop
+share/applications/lumina-photo.desktop
share/applications/lumina-screenshot.desktop
share/applications/lumina-search.desktop
share/applications/lumina-support.desktop
share/applications/lumina-textedit.desktop
share/applications/lumina-xconfig.desktop
-share/applications/lumina-xdg-entry.desktop
share/examples/lumina/
share/examples/lumina/luminaDesktop.conf
@sample ${SYSCONFDIR}/luminaDesktop.conf
+share/icons/hicolor/scalable/apps/Insight-FileManager.svg
+share/icons/hicolor/scalable/apps/Lumina-DE.svg
+share/icons/lumina-icons/
+share/icons/lumina-icons/LICENSE
+share/icons/lumina-icons/actions/
+share/icons/lumina-icons/actions/symbolic/
+share/icons/lumina-icons/actions/symbolic/application.svg
+share/icons/lumina-icons/actions/symbolic/apps.svg
+share/icons/lumina-icons/actions/symbolic/arrow-down-double.svg
+share/icons/lumina-icons/actions/symbolic/arrow-down.svg
+share/icons/lumina-icons/actions/symbolic/arrow-up.svg
+share/icons/lumina-icons/actions/symbolic/audio-volume-high.svg
+share/icons/lumina-icons/actions/symbolic/audio-volume-low.svg
+share/icons/lumina-icons/actions/symbolic/audio-volume-medium.svg
+share/icons/lumina-icons/actions/symbolic/audio-volume-off.svg
+share/icons/lumina-icons/actions/symbolic/audio-volume.svg
+share/icons/lumina-icons/actions/symbolic/bookmark-new-list.svg
+share/icons/lumina-icons/actions/symbolic/bookmark-new.svg
+share/icons/lumina-icons/actions/symbolic/bookmark-remove-list.svg
+share/icons/lumina-icons/actions/symbolic/bookmark-remove.svg
+share/icons/lumina-icons/actions/symbolic/bookmark-toolbar.svg
+share/icons/lumina-icons/actions/symbolic/camera-off.svg
+share/icons/lumina-icons/actions/symbolic/camera-photo.svg
+share/icons/lumina-icons/actions/symbolic/camera-video-off.svg
+share/icons/lumina-icons/actions/symbolic/camera-video.svg
+share/icons/lumina-icons/actions/symbolic/camera-web.svg
+share/icons/lumina-icons/actions/symbolic/clock.svg
+share/icons/lumina-icons/actions/symbolic/git-gui.svg
+share/icons/lumina-icons/actions/symbolic/lock.svg
+share/icons/lumina-icons/actions/symbolic/system-cancel.svg
+share/icons/lumina-icons/actions/symbolic/system-error.svg
+share/icons/lumina-icons/actions/symbolic/system-help.svg
+share/icons/lumina-icons/actions/symbolic/system-lock-screen.svg
+share/icons/lumina-icons/actions/symbolic/system-log-out.svg
+share/icons/lumina-icons/actions/symbolic/system-reboot.svg
+share/icons/lumina-icons/actions/symbolic/system-save-session.svg
+share/icons/lumina-icons/actions/symbolic/system-search.svg
+share/icons/lumina-icons/actions/symbolic/system-shutdown.svg
+share/icons/lumina-icons/actions/symbolic/system-suspend-hibernate.svg
+share/icons/lumina-icons/actions/symbolic/system-suspend.svg
+share/icons/lumina-icons/actions/symbolic/system-switch-user.svg
+share/icons/lumina-icons/actions/symbolic/system-users.svg
+share/icons/lumina-icons/index.theme
share/icons/material-design-dark/
share/icons/material-design-dark/LICENSE
share/icons/material-design-dark/index.theme
@@ -178,6 +215,8 @@ share/icons/material-design-dark/scalabl
share/icons/material-design-dark/scalable/actions/contact-mail.svg
share/icons/material-design-dark/scalable/actions/contact-new.svg
share/icons/material-design-dark/scalable/actions/contact-phone.svg
+share/icons/material-design-dark/scalable/actions/cursor-pointer.svg
+share/icons/material-design-dark/scalable/actions/cursor-text.svg
share/icons/material-design-dark/scalable/actions/dashboard-show.svg
share/icons/material-design-dark/scalable/actions/dialog-cancel.svg
share/icons/material-design-dark/scalable/actions/dialog-close.svg
@@ -213,7 +252,9 @@ share/icons/material-design-dark/scalabl
share/icons/material-design-dark/scalable/actions/edit-copy.svg
share/icons/material-design-dark/scalable/actions/edit-cut.svg
share/icons/material-design-dark/scalable/actions/edit-delete.svg
+share/icons/material-design-dark/scalable/actions/edit-find-next.svg
share/icons/material-design-dark/scalable/actions/edit-find-page.svg
+share/icons/material-design-dark/scalable/actions/edit-find-prev.svg
share/icons/material-design-dark/scalable/actions/edit-find-replace.svg
share/icons/material-design-dark/scalable/actions/edit-find.svg
share/icons/material-design-dark/scalable/actions/edit-location.svg
@@ -319,6 +360,7 @@ share/icons/material-design-dark/scalabl
share/icons/material-design-dark/scalable/actions/media-playback-slow.svg
share/icons/material-design-dark/scalable/actions/media-playback-start-circled.svg
share/icons/material-design-dark/scalable/actions/media-playback-start.svg
+share/icons/material-design-dark/scalable/actions/media-playback-stop-circled.svg
share/icons/material-design-dark/scalable/actions/media-playback-stop.svg
share/icons/material-design-dark/scalable/actions/media-record.svg
share/icons/material-design-dark/scalable/actions/media-seek-backward.svg
@@ -343,6 +385,7 @@ share/icons/material-design-dark/scalabl
share/icons/material-design-dark/scalable/actions/object-flip-vertical.svg
share/icons/material-design-dark/scalable/actions/object-rotate-left.svg
share/icons/material-design-dark/scalable/actions/object-rotate-right.svg
+share/icons/material-design-dark/scalable/actions/presentation-play.svg
share/icons/material-design-dark/scalable/actions/process-stop.svg
share/icons/material-design-dark/scalable/actions/quickopen-file.svg
share/icons/material-design-dark/scalable/actions/quickopen.svg
@@ -1004,6 +1047,8 @@ share/icons/material-design-light/scalab
share/icons/material-design-light/scalable/actions/contact-mail.svg
share/icons/material-design-light/scalable/actions/contact-new.svg
share/icons/material-design-light/scalable/actions/contact-phone.svg
+share/icons/material-design-light/scalable/actions/cursor-pointer.svg
+share/icons/material-design-light/scalable/actions/cursor-text.svg
share/icons/material-design-light/scalable/actions/dashboard-show.svg
share/icons/material-design-light/scalable/actions/dialog-cancel.svg
share/icons/material-design-light/scalable/actions/dialog-close.svg
@@ -1039,7 +1084,9 @@ share/icons/material-design-light/scalab
share/icons/material-design-light/scalable/actions/edit-copy.svg
share/icons/material-design-light/scalable/actions/edit-cut.svg
share/icons/material-design-light/scalable/actions/edit-delete.svg
+share/icons/material-design-light/scalable/actions/edit-find-next.svg
share/icons/material-design-light/scalable/actions/edit-find-page.svg
+share/icons/material-design-light/scalable/actions/edit-find-prev.svg
share/icons/material-design-light/scalable/actions/edit-find-replace.svg
share/icons/material-design-light/scalable/actions/edit-find.svg
share/icons/material-design-light/scalable/actions/edit-location.svg
@@ -1145,6 +1192,7 @@ share/icons/material-design-light/scalab
share/icons/material-design-light/scalable/actions/media-playback-slow.svg
share/icons/material-design-light/scalable/actions/media-playback-start-circled.svg
share/icons/material-design-light/scalable/actions/media-playback-start.svg
+share/icons/material-design-light/scalable/actions/media-playback-stop-circled.svg
share/icons/material-design-light/scalable/actions/media-playback-stop.svg
share/icons/material-design-light/scalable/actions/media-record.svg
share/icons/material-design-light/scalable/actions/media-seek-backward.svg
@@ -1169,6 +1217,7 @@ share/icons/material-design-light/scalab
share/icons/material-design-light/scalable/actions/object-flip-vertical.svg
share/icons/material-design-light/scalable/actions/object-rotate-left.svg
share/icons/material-design-light/scalable/actions/object-rotate-right.svg
+share/icons/material-design-light/scalable/actions/presentation-play.svg
share/icons/material-design-light/scalable/actions/process-stop.svg
share/icons/material-design-light/scalable/actions/quickopen-file.svg
share/icons/material-design-light/scalable/actions/quickopen.svg
@@ -1712,19 +1761,24 @@ share/lthemeengine/colors/
share/lthemeengine/colors/airy.conf
share/lthemeengine/colors/darker.conf
share/lthemeengine/colors/dusk.conf
+share/lthemeengine/colors/lumina-dark.conf
share/lthemeengine/colors/sand.conf
share/lthemeengine/colors/simple.conf
share/lthemeengine/colors/waves.conf
share/lthemeengine/desktop_qss/
+share/lthemeengine/desktop_qss/DarkGlass-desktop-icons.qss
share/lthemeengine/desktop_qss/DarkGlass.qss
+share/lthemeengine/desktop_qss/Glass-desktop-icons.qss
share/lthemeengine/desktop_qss/Glass.qss
share/lthemeengine/qss/
share/lthemeengine/qss/scrollbar-simple.qss
share/lthemeengine/qss/sliders-simple.qss
share/lthemeengine/qss/tooltip-simple.qss
+share/lthemeengine/qss/traynotification-simple.qss
share/lumina-desktop/
share/lumina-desktop/Login.ogg
share/lumina-desktop/Logout.ogg
+share/lumina-desktop/Lumina-DE.png
share/lumina-desktop/compton.conf
share/lumina-desktop/desktop-background.jpg
share/lumina-desktop/fluxbox-init-rc
@@ -1794,69 +1848,6 @@ share/lumina-desktop/i18n/l-archiver_zh_
share/lumina-desktop/i18n/l-archiver_zh_HK.qm
share/lumina-desktop/i18n/l-archiver_zh_TW.qm
share/lumina-desktop/i18n/l-archiver_zu.qm
-share/lumina-desktop/i18n/l-calc_af.qm
-share/lumina-desktop/i18n/l-calc_ar.qm
-share/lumina-desktop/i18n/l-calc_az.qm
-share/lumina-desktop/i18n/l-calc_bg.qm
-share/lumina-desktop/i18n/l-calc_bn.qm
-share/lumina-desktop/i18n/l-calc_bs.qm
-share/lumina-desktop/i18n/l-calc_ca.qm
-share/lumina-desktop/i18n/l-calc_cs.qm
-share/lumina-desktop/i18n/l-calc_cy.qm
-share/lumina-desktop/i18n/l-calc_da.qm
-share/lumina-desktop/i18n/l-calc_de.qm
-share/lumina-desktop/i18n/l-calc_el.qm
-share/lumina-desktop/i18n/l-calc_en_AU.qm
-share/lumina-desktop/i18n/l-calc_en_GB.qm
-share/lumina-desktop/i18n/l-calc_en_ZA.qm
-share/lumina-desktop/i18n/l-calc_es.qm
-share/lumina-desktop/i18n/l-calc_et.qm
-share/lumina-desktop/i18n/l-calc_eu.qm
-share/lumina-desktop/i18n/l-calc_fa.qm
-share/lumina-desktop/i18n/l-calc_fi.qm
-share/lumina-desktop/i18n/l-calc_fr.qm
-share/lumina-desktop/i18n/l-calc_fr_CA.qm
-share/lumina-desktop/i18n/l-calc_gl.qm
-share/lumina-desktop/i18n/l-calc_he.qm
-share/lumina-desktop/i18n/l-calc_hi.qm
-share/lumina-desktop/i18n/l-calc_hr.qm
-share/lumina-desktop/i18n/l-calc_hu.qm
-share/lumina-desktop/i18n/l-calc_id.qm
-share/lumina-desktop/i18n/l-calc_is.qm
-share/lumina-desktop/i18n/l-calc_it.qm
-share/lumina-desktop/i18n/l-calc_ja.qm
-share/lumina-desktop/i18n/l-calc_ka.qm
-share/lumina-desktop/i18n/l-calc_ko.qm
-share/lumina-desktop/i18n/l-calc_lt.qm
-share/lumina-desktop/i18n/l-calc_lv.qm
-share/lumina-desktop/i18n/l-calc_mk.qm
-share/lumina-desktop/i18n/l-calc_mn.qm
-share/lumina-desktop/i18n/l-calc_ms.qm
-share/lumina-desktop/i18n/l-calc_mt.qm
-share/lumina-desktop/i18n/l-calc_nb.qm
-share/lumina-desktop/i18n/l-calc_nl.qm
-share/lumina-desktop/i18n/l-calc_pa.qm
-share/lumina-desktop/i18n/l-calc_pl.qm
-share/lumina-desktop/i18n/l-calc_pt.qm
-share/lumina-desktop/i18n/l-calc_pt_BR.qm
-share/lumina-desktop/i18n/l-calc_ro.qm
-share/lumina-desktop/i18n/l-calc_ru.qm
-share/lumina-desktop/i18n/l-calc_sk.qm
-share/lumina-desktop/i18n/l-calc_sl.qm
-share/lumina-desktop/i18n/l-calc_sr.qm
-share/lumina-desktop/i18n/l-calc_sv.qm
-share/lumina-desktop/i18n/l-calc_sw.qm
-share/lumina-desktop/i18n/l-calc_ta.qm
-share/lumina-desktop/i18n/l-calc_tg.qm
-share/lumina-desktop/i18n/l-calc_th.qm
-share/lumina-desktop/i18n/l-calc_tr.qm
-share/lumina-desktop/i18n/l-calc_uk.qm
-share/lumina-desktop/i18n/l-calc_uz.qm
-share/lumina-desktop/i18n/l-calc_vi.qm
-share/lumina-desktop/i18n/l-calc_zh_CN.qm
-share/lumina-desktop/i18n/l-calc_zh_HK.qm
-share/lumina-desktop/i18n/l-calc_zh_TW.qm
-share/lumina-desktop/i18n/l-calc_zu.qm
share/lumina-desktop/i18n/l-fileinfo_af.qm
share/lumina-desktop/i18n/l-fileinfo_ar.qm
share/lumina-desktop/i18n/l-fileinfo_az.qm
@@ -1987,72 +1978,69 @@ share/lumina-desktop/i18n/l-mediap_zh_CN
share/lumina-desktop/i18n/l-mediap_zh_HK.qm
share/lumina-desktop/i18n/l-mediap_zh_TW.qm
share/lumina-desktop/i18n/l-mediap_zu.qm
-share/lumina-desktop/i18n/l-pdf_af.qm
-share/lumina-desktop/i18n/l-pdf_ar.qm
-share/lumina-desktop/i18n/l-pdf_az.qm
-share/lumina-desktop/i18n/l-pdf_bg.qm
-share/lumina-desktop/i18n/l-pdf_bn.qm
-share/lumina-desktop/i18n/l-pdf_bs.qm
-share/lumina-desktop/i18n/l-pdf_ca.qm
-share/lumina-desktop/i18n/l-pdf_cs.qm
-share/lumina-desktop/i18n/l-pdf_cy.qm
-share/lumina-desktop/i18n/l-pdf_da.qm
-share/lumina-desktop/i18n/l-pdf_de.qm
-share/lumina-desktop/i18n/l-pdf_el.qm
-share/lumina-desktop/i18n/l-pdf_en_AU.qm
-share/lumina-desktop/i18n/l-pdf_en_GB.qm
-share/lumina-desktop/i18n/l-pdf_en_ZA.qm
-share/lumina-desktop/i18n/l-pdf_es.qm
-share/lumina-desktop/i18n/l-pdf_et.qm
-share/lumina-desktop/i18n/l-pdf_eu.qm
-share/lumina-desktop/i18n/l-pdf_fa.qm
-share/lumina-desktop/i18n/l-pdf_fi.qm
-share/lumina-desktop/i18n/l-pdf_fr.qm
-share/lumina-desktop/i18n/l-pdf_fr_CA.qm
-share/lumina-desktop/i18n/l-pdf_gl.qm
-share/lumina-desktop/i18n/l-pdf_he.qm
-share/lumina-desktop/i18n/l-pdf_hi.qm
-share/lumina-desktop/i18n/l-pdf_hr.qm
-share/lumina-desktop/i18n/l-pdf_hu.qm
-share/lumina-desktop/i18n/l-pdf_id.qm
-share/lumina-desktop/i18n/l-pdf_is.qm
-share/lumina-desktop/i18n/l-pdf_it.qm
-share/lumina-desktop/i18n/l-pdf_ja.qm
-share/lumina-desktop/i18n/l-pdf_ka.qm
-share/lumina-desktop/i18n/l-pdf_ko.qm
-share/lumina-desktop/i18n/l-pdf_lt.qm
-share/lumina-desktop/i18n/l-pdf_lv.qm
-share/lumina-desktop/i18n/l-pdf_mk.qm
-share/lumina-desktop/i18n/l-pdf_mn.qm
-share/lumina-desktop/i18n/l-pdf_ms.qm
-share/lumina-desktop/i18n/l-pdf_mt.qm
-share/lumina-desktop/i18n/l-pdf_nb.qm
-share/lumina-desktop/i18n/l-pdf_ne.qm
-share/lumina-desktop/i18n/l-pdf_nl.qm
-share/lumina-desktop/i18n/l-pdf_pa.qm
-share/lumina-desktop/i18n/l-pdf_pl.qm
-share/lumina-desktop/i18n/l-pdf_pt.qm
-share/lumina-desktop/i18n/l-pdf_pt_BR.qm
-share/lumina-desktop/i18n/l-pdf_ro.qm
-share/lumina-desktop/i18n/l-pdf_ru.qm
-share/lumina-desktop/i18n/l-pdf_sa.qm
-share/lumina-desktop/i18n/l-pdf_sk.qm
-share/lumina-desktop/i18n/l-pdf_sl.qm
-share/lumina-desktop/i18n/l-pdf_sr.qm
-share/lumina-desktop/i18n/l-pdf_sv.qm
-share/lumina-desktop/i18n/l-pdf_sw.qm
-share/lumina-desktop/i18n/l-pdf_ta.qm
-share/lumina-desktop/i18n/l-pdf_tg.qm
-share/lumina-desktop/i18n/l-pdf_th.qm
-share/lumina-desktop/i18n/l-pdf_tr.qm
-share/lumina-desktop/i18n/l-pdf_uk.qm
-share/lumina-desktop/i18n/l-pdf_ur.qm
-share/lumina-desktop/i18n/l-pdf_uz.qm
-share/lumina-desktop/i18n/l-pdf_vi.qm
-share/lumina-desktop/i18n/l-pdf_zh_CN.qm
-share/lumina-desktop/i18n/l-pdf_zh_HK.qm
-share/lumina-desktop/i18n/l-pdf_zh_TW.qm
-share/lumina-desktop/i18n/l-pdf_zu.qm
+share/lumina-desktop/i18n/l-photo_af.qm
+share/lumina-desktop/i18n/l-photo_ar.qm
+share/lumina-desktop/i18n/l-photo_az.qm
+share/lumina-desktop/i18n/l-photo_bg.qm
+share/lumina-desktop/i18n/l-photo_bn.qm
+share/lumina-desktop/i18n/l-photo_bs.qm
+share/lumina-desktop/i18n/l-photo_ca.qm
+share/lumina-desktop/i18n/l-photo_cs.qm
+share/lumina-desktop/i18n/l-photo_cy.qm
+share/lumina-desktop/i18n/l-photo_da.qm
+share/lumina-desktop/i18n/l-photo_de.qm
+share/lumina-desktop/i18n/l-photo_el.qm
+share/lumina-desktop/i18n/l-photo_en_AU.qm
+share/lumina-desktop/i18n/l-photo_en_GB.qm
+share/lumina-desktop/i18n/l-photo_en_ZA.qm
+share/lumina-desktop/i18n/l-photo_es.qm
+share/lumina-desktop/i18n/l-photo_et.qm
+share/lumina-desktop/i18n/l-photo_eu.qm
+share/lumina-desktop/i18n/l-photo_fa.qm
+share/lumina-desktop/i18n/l-photo_fi.qm
+share/lumina-desktop/i18n/l-photo_fr.qm
+share/lumina-desktop/i18n/l-photo_fr_CA.qm
+share/lumina-desktop/i18n/l-photo_gl.qm
+share/lumina-desktop/i18n/l-photo_he.qm
+share/lumina-desktop/i18n/l-photo_hi.qm
+share/lumina-desktop/i18n/l-photo_hr.qm
+share/lumina-desktop/i18n/l-photo_hu.qm
+share/lumina-desktop/i18n/l-photo_id.qm
+share/lumina-desktop/i18n/l-photo_is.qm
+share/lumina-desktop/i18n/l-photo_it.qm
+share/lumina-desktop/i18n/l-photo_ja.qm
+share/lumina-desktop/i18n/l-photo_ka.qm
+share/lumina-desktop/i18n/l-photo_ko.qm
+share/lumina-desktop/i18n/l-photo_lt.qm
+share/lumina-desktop/i18n/l-photo_lv.qm
+share/lumina-desktop/i18n/l-photo_mk.qm
+share/lumina-desktop/i18n/l-photo_mn.qm
+share/lumina-desktop/i18n/l-photo_ms.qm
+share/lumina-desktop/i18n/l-photo_mt.qm
+share/lumina-desktop/i18n/l-photo_nb.qm
+share/lumina-desktop/i18n/l-photo_nl.qm
+share/lumina-desktop/i18n/l-photo_pa.qm
+share/lumina-desktop/i18n/l-photo_pl.qm
+share/lumina-desktop/i18n/l-photo_pt.qm
+share/lumina-desktop/i18n/l-photo_pt_BR.qm
+share/lumina-desktop/i18n/l-photo_ro.qm
+share/lumina-desktop/i18n/l-photo_ru.qm
+share/lumina-desktop/i18n/l-photo_sk.qm
+share/lumina-desktop/i18n/l-photo_sl.qm
+share/lumina-desktop/i18n/l-photo_sr.qm
+share/lumina-desktop/i18n/l-photo_sv.qm
+share/lumina-desktop/i18n/l-photo_sw.qm
+share/lumina-desktop/i18n/l-photo_ta.qm
+share/lumina-desktop/i18n/l-photo_tg.qm
+share/lumina-desktop/i18n/l-photo_th.qm
+share/lumina-desktop/i18n/l-photo_tr.qm
+share/lumina-desktop/i18n/l-photo_uk.qm
+share/lumina-desktop/i18n/l-photo_uz.qm
+share/lumina-desktop/i18n/l-photo_vi.qm
+share/lumina-desktop/i18n/l-photo_zh_CN.qm
+share/lumina-desktop/i18n/l-photo_zh_HK.qm
+share/lumina-desktop/i18n/l-photo_zh_TW.qm
+share/lumina-desktop/i18n/l-photo_zu.qm
share/lumina-desktop/i18n/l-screenshot_af.qm
share/lumina-desktop/i18n/l-screenshot_ar.qm
share/lumina-desktop/i18n/l-screenshot_az.qm
@@ -2655,12 +2643,28 @@ share/lumina-desktop/i18n/lumina-xconfig
share/lumina-desktop/low-battery.ogg
share/lumina-desktop/luminaDesktop.conf
share/lumina-desktop/menu-scripts/
+share/lumina-desktop/menu-scripts/README.md
share/lumina-desktop/menu-scripts/ls.json.sh
+share/lumina-desktop/screensavers/
+share/lumina-desktop/screensavers/Fireflies.json
+share/lumina-desktop/screensavers/Grav.json
+share/lumina-desktop/screensavers/Matrix.json
+share/lumina-desktop/screensavers/README.md
+share/lumina-desktop/screensavers/Video.json
+share/lumina-desktop/screensavers/Warp.json
+share/lumina-desktop/screensavers/qml_scripts/
+share/lumina-desktop/screensavers/qml_scripts/Fireflies.qml
+share/lumina-desktop/screensavers/qml_scripts/Firefly.qml
+share/lumina-desktop/screensavers/qml_scripts/Grav.qml
+share/lumina-desktop/screensavers/qml_scripts/Matrix.qml
+share/lumina-desktop/screensavers/qml_scripts/Video.qml
+share/lumina-desktop/screensavers/qml_scripts/Warp.qml
share/lumina-desktop/syntax_rules/
share/lumina-desktop/syntax_rules/README.md
share/lumina-desktop/syntax_rules/cpp.syntax
share/lumina-desktop/syntax_rules/go.syntax
share/lumina-desktop/syntax_rules/html.syntax
+share/lumina-desktop/syntax_rules/java.syntax
share/lumina-desktop/syntax_rules/javascript.syntax
share/lumina-desktop/syntax_rules/json.syntax
share/lumina-desktop/syntax_rules/md.syntax
@@ -2670,15 +2674,16 @@ share/lumina-desktop/syntax_rules/rst.sy
share/lumina-desktop/syntax_rules/sh.syntax
share/lumina-desktop/syntax_rules/txt.syntax
share/lumina-desktop/syntax_rules/xml.syntax
+share/lumina-desktop/theme.cfg
share/lumina-desktop/themes/
share/lumina-desktop/themes/DarkGlass.qss.template
share/lumina-desktop/themes/Glass.qss.template
share/lumina-desktop/themes/Lumina-default.qss.template
share/lumina-desktop/themes/None.qss.template
-share/pixmaps/Insight-FileManager.png
-share/pixmaps/Lumina-DE.png
share/xsessions/
share/xsessions/Lumina-DE.desktop
+@tag gtk-update-icon-cache %D/share/icons/lumina-icons
+@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag gtk-update-icon-cache %D/share/icons/material-design-dark
@tag gtk-update-icon-cache %D/share/icons/material-design-light
@tag update-desktop-database
Index: ports/x11/lumina/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/lumina/pkg/DESCR,v
diff -u -p -u -r1.3 DESCR
--- ports/x11/lumina/pkg/DESCR 31 Oct 2016 17:49:30 -0000 1.3
+++ ports/x11/lumina/pkg/DESCR 9 Mar 2025 08:06:00 -0000
@@ -1 +1,6 @@
-Lumina-DE is a lightweight, BSD licensed desktop environment.
+The Lumina Desktop Environment is a lightweight system interface that is
+designed for use on any Unix-like operating system. It takes a plugin-based
+approach, allowing the entire interface to be assembled/arranged by each
+individual user as desired, with a system-wide default layout which can be
+setup by the system administrator. This allows every system (or user session)
+to be designed to maximize the individual user's productivity.
Index: ports/x11/lumina/patches/patch-src-qt5_OS-detect_pri
===================================================================
RCS file: /cvs/ports/x11/lumina/patches/patch-src-qt5_OS-detect_pri,v
diff -u -p -u -r1.3 patch-src-qt5_OS-detect_pri
--- ports/x11/lumina/patches/patch-src-qt5_OS-detect_pri 11 Mar 2022 20:16:38 -0000 1.3
+++ ports/x11/lumina/patches/patch-src-qt5_OS-detect_pri 9 Mar 2025 08:06:27 -0000
@@ -1,13 +1,14 @@
Index: src-qt5/OS-detect.pri
--- src-qt5/OS-detect.pri.orig
+++ src-qt5/OS-detect.pri
-@@ -47,7 +47,8 @@ isEmpty(OS){
+@@ -47,7 +47,7 @@ isEmpty(OS){
}else : openbsd-*{
+- isEmpty(PREFIX){ PREFIX=/usr/local }
++ isEmpty(L_ETCDIR){ L_ETCDIR=!!SYSCONFDIR!! }
OS = OpenBSD
- LIBS += -L/usr/local/lib -L/usr/lib
+ LIBS += -L!!LOCALBASE!!/lib -L/usr/lib
-+ isEmpty(L_ETCDIR){ L_ETCDIR=!!SYSCONFDIR!! }
#Use the defaults for everything else
}else : netbsd-*{
Index: ports/x11/lumina/patches/patch-src-qt5_desktop-utils_desktop-utils_pro
===================================================================
RCS file: /cvs/ports/x11/lumina/patches/patch-src-qt5_desktop-utils_desktop-utils_pro,v
diff -u -p -u -r1.3 patch-src-qt5_desktop-utils_desktop-utils_pro
--- ports/x11/lumina/patches/patch-src-qt5_desktop-utils_desktop-utils_pro 11 Mar 2022 20:16:38 -0000 1.3
+++ ports/x11/lumina/patches/patch-src-qt5_desktop-utils_desktop-utils_pro 9 Mar 2025 08:06:40 -0000
@@ -1,12 +1,12 @@
Index: src-qt5/desktop-utils/desktop-utils.pro
--- src-qt5/desktop-utils/desktop-utils.pro.orig
+++ src-qt5/desktop-utils/desktop-utils.pro
-@@ -10,7 +10,7 @@ SUBDIRS+= lumina-fm \
+@@ -8,7 +8,6 @@ SUBDIRS+= lumina-fm \
+ lumina-screenshot \
+ lumina-fileinfo \
lumina-textedit \
- lumina-calculator \
lumina-archiver \
--# lumina-notify \
-+ lumina-notify \
lumina-mediaplayer \
- lumina-xdg-entry \
- lumina-pdf
+- lumina-photo \
+- lumina-sudo
++ lumina-photo
