diff --git a/recipes-trueos/lumina/files/0001-lumina-desktop.pro-fix-out-of-tree-installation.patch b/recipes-trueos/lumina/files/0001-lumina-desktop.pro-fix-out-of-tree-installation.patch new file mode 100644 index 00000000..d018be40 --- /dev/null +++ b/recipes-trueos/lumina/files/0001-lumina-desktop.pro-fix-out-of-tree-installation.patch @@ -0,0 +1,47 @@ +From 1950d0059162a0ab3cfb02b71143a5b096aa1c17 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 23 Nov 2017 17:22:58 +0100 +Subject: [PATCH] lumina-desktop.pro: fix out of tree installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +| cp: cannot stat 'defaults/desktop-background.jpg': No such file or directory + +Signed-off-by: Andreas Müller +--- + src-qt5/core/lumina-desktop/lumina-desktop.pro | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro +index 82da892..9c8272c 100644 +--- a/src-qt5/core/lumina-desktop/lumina-desktop.pro ++++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro +@@ -92,17 +92,17 @@ conf.path = $${L_ETCDIR} + message("Installing defaults settings for OS: $${DEFAULT_SETTINGS}") + OS=$${DEFAULT_SETTINGS} + } +-exists("defaults/luminaDesktop-$${OS}.conf"){ ++exists("$$PWD/defaults/luminaDesktop-$${OS}.conf"){ + message(" -- Found OS-specific system config file: $${OS}"); +- conf.extra = cp defaults/luminaDesktop-$${OS}.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist ++ conf.extra = cp $$PWD/defaults/luminaDesktop-$${OS}.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + }else{ +- conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist ++ conf.extra = cp $$PWD/defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + } +-exists("defaults/desktop-background-$${OS}.jpg"){ ++exists("$$PWD/defaults/desktop-background-$${OS}.jpg"){ + message(" -- Found OS-specific background image: $${OS}"); +- defaults.extra = cp defaults/desktop-background-$${OS}.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg ++ defaults.extra = cp $$PWD/defaults/desktop-background-$${OS}.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg + }else{ +- defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg ++ defaults.extra = cp $$PWD/defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/desktop-background.jpg + } + + TRANSLATIONS = i18n/lumina-desktop_af.ts \ +-- +2.9.5 + diff --git a/recipes-trueos/lumina/lumina_1.4.bb b/recipes-trueos/lumina/lumina_1.4.bb new file mode 100644 index 00000000..2cd06c4a --- /dev/null +++ b/recipes-trueos/lumina/lumina_1.4.bb @@ -0,0 +1,52 @@ +SUMMARY = "Lumina Desktop Environment" +HOMEPAGE = "https://lumina-desktop.org/" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=45b10a7bfb52b622b91ca67ea02e4afa" + +REQUIRED_DISTRO_FEATURES = "x11" + +inherit qmake5 distro_features_check gtk-icon-cache + +DEPENDS += "qtbase qtx11extras qtmultimedia qtsvg poppler" + +SRC_URI = " \ + git://github.com/trueos/lumina.git \ + file://0001-lumina-desktop.pro-fix-out-of-tree-installation.patch \ +" +SRCREV = "a881c51e7b20f086b6b8b546c116d38478f87840" +S = "${WORKDIR}/git" + +do_configure_prepend() { + # change paths by sed instead of endles escapes in 'DEFINES+=..' below + sed -i 's:L_ETCDIR:QString("${sysconfdir}"):' `find ${S} -name *.cpp` + sed -i 's:L_SHAREDIR:QString("${datadir}"):' `find ${S} -name *.cpp` + sed -i 's:$${MAN_ZIP}:gzip -c:' `find ${S} -name *.pro` +} + +# Override magic in src-qt5/OS-detect.pri to our paths +EXTRA_QMAKEVARS_PRE += ' \ + OS=Linux \ + PREFIX=${prefix} \ + L_BINDIR=${bindir} \ + L_LIBDIR=${libdir} \ + L_ETCDIR=${sysconfdir} \ + L_SHAREDIR=${datadir} \ + L_INCLUDEDIR=${STAGING_INCDIR} \ + L_SESSDIR=${datadir}/xsessions \ + L_MANDIR=${mandir} \ + LRELEASE=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \ + DEFINES+=WITH_I18N \ +' + +PACKAGES =+ "${PN}-icon-themes" + +FILES_${PN} += " \ + ${datadir}/lthemeengine \ + ${datadir}/lumina-desktop \ + ${datadir}/xsessions \ + ${OE_QMAKE_PATH_PLUGINS} \ +" + +FILES_${PN}-icon-themes = "${datadir}/icons" + +RRECOMMENDS_${PN} += "${PN}-icon-themes"