On Fri, Jan 06, 2017 at 12:57:46PM -0500, Bryan C. Everly wrote: > Hi ports@, > > Attached is my diff for updating our version of the BSD licensed > Lumina Desktop Environment to the latest version (1.2 patch level 1). > I have worked with upstream (hence patch level 1) to get things more > compatible with our version of Xenocara. > > I'd appreciate a review and someone to commit it if all is well. This > is my daily driver desktop and I am currently running this version on > my laptop. > > Thanks in advance!
Hey Bryan, Giving this a go as I just installed lumina desktop for the first time on my home desktop about 5 days ago, convenient! :-) I had issues applying this, just this one reject though: 19:59 ryan@iddqd:/usr/ports/x11/lumina$ cat Makefile.rej @@ -4,9 +4,9 @@ GH_ACCOUNT= trueos GH_PROJECT= lumina -GH_TAGNAME= v1.1.0 +GH_TAGNAME= v1.2.0-p1 -SHARED_LIBS += LuminaUtils 1.1 # 1.1 +SHARED_LIBS += LuminaUtils 1.2 # 1.2 CATEGORIES= x11 MAINTAINER= Bryan C. Everly <br...@bceassociates.com> I think its just because a REVISION = 0 was recently added... I edited those changes in by hand. The only thing that sticks out at me that might be a preferred change is to strike the dash between the version and the p1 part, so the package name becomes lumina-1.2.0p1... The package built thought, and seems to run great! Thanks! -ryan Here is a regenerated patch for convenience ? lumina.diff Index: Makefile =================================================================== RCS file: /cvs/ports/x11/lumina/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 25 Dec 2016 14:34:40 -0000 1.21 +++ Makefile 7 Jan 2017 04:04:52 -0000 @@ -4,10 +4,9 @@ COMMENT= Lumina Desktop Environment GH_ACCOUNT= trueos GH_PROJECT= lumina -GH_TAGNAME= v1.1.0 -REVISION= 0 +GH_TAGNAME= v1.2.0-p1 -SHARED_LIBS += LuminaUtils 1.1 # 1.1 +SHARED_LIBS += LuminaUtils 1.2 # 1.2 CATEGORIES= x11 MAINTAINER= Bryan C. Everly <br...@bceassociates.com> @@ -44,7 +43,8 @@ pre-configure: ${WRKSRC}/src-qt5/OS-detect.pri do-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/qmake-qt5 CONFIG+="configure WITH_I18N" + cd ${WRKSRC} && ${LOCALBASE}/bin/qmake-qt5 \ + CONFIG+="configure WITH_I18N NO_XINPUT" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lumina Index: distinfo =================================================================== RCS file: /cvs/ports/x11/lumina/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 31 Oct 2016 17:49:30 -0000 1.15 +++ distinfo 7 Jan 2017 04:04:52 -0000 @@ -1,2 +1,2 @@ -SHA256 (lumina-1.1.0.tar.gz) = trTrnGcfDu+XYLD72T69mSJIrGGcxwJRhfw/gtagA3M= -SIZE (lumina-1.1.0.tar.gz) = 55828227 +SHA256 (lumina-1.2.0-p1.tar.gz) = +DZiEv4/KQOcX+vvW03pepLrckg+LZf1wIbt+PxlvUk= +SIZE (lumina-1.2.0-p1.tar.gz) = 56032695 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/lumina/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 31 Oct 2016 17:49:30 -0000 1.12 +++ pkg/PLIST 7 Jan 2017 04:04:52 -0000 @@ -2,6 +2,7 @@ @pkgpath x11/lumina/i18n @pkgpath x11/lumina/lumina bin/lte +@bin bin/lumina-archiver @bin bin/lumina-calculator @bin bin/lumina-config @bin bin/lumina-desktop @@ -14,13 +15,7 @@ bin/lte @bin bin/lumina-textedit @bin bin/lumina-xconfig @bin bin/start-lumina-desktop -include/LuminaOS.h -include/LuminaSingleApplication.h -include/LuminaThemes.h -include/LuminaUtils.h -include/LuminaX11.h -include/LuminaXDG.h -@lib lib/libLuminaUtils.so.${LIBLuminaUtils_VERSION} +share/applications/lumina-archiver.desktop share/applications/lumina-calculator.desktop share/applications/lumina-config.desktop share/applications/lumina-fileinfo.desktop @@ -55,6 +50,68 @@ share/lumina-desktop/fluxbox-init-rc share/lumina-desktop/fluxbox-keys share/lumina-desktop/globs2 share/lumina-desktop/i18n/ +share/lumina-desktop/i18n/l-archiver_af.qm +share/lumina-desktop/i18n/l-archiver_ar.qm +share/lumina-desktop/i18n/l-archiver_az.qm +share/lumina-desktop/i18n/l-archiver_bg.qm +share/lumina-desktop/i18n/l-archiver_bn.qm +share/lumina-desktop/i18n/l-archiver_bs.qm +share/lumina-desktop/i18n/l-archiver_ca.qm +share/lumina-desktop/i18n/l-archiver_cs.qm +share/lumina-desktop/i18n/l-archiver_cy.qm +share/lumina-desktop/i18n/l-archiver_da.qm +share/lumina-desktop/i18n/l-archiver_de.qm +share/lumina-desktop/i18n/l-archiver_el.qm +share/lumina-desktop/i18n/l-archiver_en_GB.qm +share/lumina-desktop/i18n/l-archiver_en_ZA.qm +share/lumina-desktop/i18n/l-archiver_es.qm +share/lumina-desktop/i18n/l-archiver_et.qm +share/lumina-desktop/i18n/l-archiver_eu.qm +share/lumina-desktop/i18n/l-archiver_fa.qm +share/lumina-desktop/i18n/l-archiver_fi.qm +share/lumina-desktop/i18n/l-archiver_fr.qm +share/lumina-desktop/i18n/l-archiver_fr_CA.qm +share/lumina-desktop/i18n/l-archiver_gl.qm +share/lumina-desktop/i18n/l-archiver_he.qm +share/lumina-desktop/i18n/l-archiver_hi.qm +share/lumina-desktop/i18n/l-archiver_hr.qm +share/lumina-desktop/i18n/l-archiver_hu.qm +share/lumina-desktop/i18n/l-archiver_id.qm +share/lumina-desktop/i18n/l-archiver_is.qm +share/lumina-desktop/i18n/l-archiver_it.qm +share/lumina-desktop/i18n/l-archiver_ja.qm +share/lumina-desktop/i18n/l-archiver_ka.qm +share/lumina-desktop/i18n/l-archiver_ko.qm +share/lumina-desktop/i18n/l-archiver_lt.qm +share/lumina-desktop/i18n/l-archiver_lv.qm +share/lumina-desktop/i18n/l-archiver_mk.qm +share/lumina-desktop/i18n/l-archiver_mn.qm +share/lumina-desktop/i18n/l-archiver_ms.qm +share/lumina-desktop/i18n/l-archiver_mt.qm +share/lumina-desktop/i18n/l-archiver_nb.qm +share/lumina-desktop/i18n/l-archiver_nl.qm +share/lumina-desktop/i18n/l-archiver_pa.qm +share/lumina-desktop/i18n/l-archiver_pl.qm +share/lumina-desktop/i18n/l-archiver_pt.qm +share/lumina-desktop/i18n/l-archiver_pt_BR.qm +share/lumina-desktop/i18n/l-archiver_ro.qm +share/lumina-desktop/i18n/l-archiver_ru.qm +share/lumina-desktop/i18n/l-archiver_sk.qm +share/lumina-desktop/i18n/l-archiver_sl.qm +share/lumina-desktop/i18n/l-archiver_sr.qm +share/lumina-desktop/i18n/l-archiver_sv.qm +share/lumina-desktop/i18n/l-archiver_sw.qm +share/lumina-desktop/i18n/l-archiver_ta.qm +share/lumina-desktop/i18n/l-archiver_tg.qm +share/lumina-desktop/i18n/l-archiver_th.qm +share/lumina-desktop/i18n/l-archiver_tr.qm +share/lumina-desktop/i18n/l-archiver_uk.qm +share/lumina-desktop/i18n/l-archiver_uz.qm +share/lumina-desktop/i18n/l-archiver_vi.qm +share/lumina-desktop/i18n/l-archiver_zh_CN.qm +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