diff options
| -rw-r--r-- | libLumina/LuminaOS-Debian.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-Gentoo.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-Linux.cpp | 2 | ||||
| -rw-r--r-- | lumina-9999.ebuild (renamed from lumina-0.9_pre.ebuild) | 28 |
4 files changed, 13 insertions, 21 deletions
diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp index e351ddd0..75aad108 100644 --- a/libLumina/LuminaOS-Debian.cpp +++ b/libLumina/LuminaOS-Debian.cpp @@ -40,7 +40,7 @@ QStringList LOS::ExternalDevicePaths(){ QString type = devs[i].section(" on ",0,0); type.remove("/dev/"); //Determine the type of hardware device based on the dev node - if(type.startsWith("sd") || type.startsWith("nvme"){ type = "HDRIVE"; } + if(type.startsWith("sd") || type.startsWith("nvme")){ type = "HDRIVE"; } else if(type.startsWith("sr")){ type="DVD"; } else if(type.contains("mapper")){ type="LVM"; } else{ type = "UNKNOWN"; } diff --git a/libLumina/LuminaOS-Gentoo.cpp b/libLumina/LuminaOS-Gentoo.cpp index 4029ee51..e3d5fe56 100644 --- a/libLumina/LuminaOS-Gentoo.cpp +++ b/libLumina/LuminaOS-Gentoo.cpp @@ -40,7 +40,7 @@ QStringList LOS::ExternalDevicePaths(){ QString type = devs[i].section(" on ",0,0); type.remove("/dev/"); //Determine the type of hardware device based on the dev node - if(type.startsWith("sd") || type.startsWith("nvme"){ type = "HDRIVE"; } + if(type.startsWith("sd") || type.startsWith("nvme")){ type = "HDRIVE"; } else if(type.startsWith("sr")){ type="DVD"; } else if(type.contains("mapper")){ type="LVM"; } else{ type = "UNKNOWN"; } diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp index 7bb803bd..5939c9d1 100644 --- a/libLumina/LuminaOS-Linux.cpp +++ b/libLumina/LuminaOS-Linux.cpp @@ -37,7 +37,7 @@ QStringList LOS::ExternalDevicePaths(){ QString type = devs[i].section(" ",0,0); type.remove("/dev/"); //Determine the type of hardware device based on the dev node - if(type.startsWith("sd") || type.startsWith("nvme"){ type = "HDRIVE"; } + if(type.startsWith("sd") || type.startsWith("nvme")){ type = "HDRIVE"; } else if(type.startsWith("sr")){ type="DVD"; } else if(type.contains("mapper")){ type="LVM"; } else{ type = "UNKNOWN"; } diff --git a/lumina-0.9_pre.ebuild b/lumina-9999.ebuild index 8d232b23..c8dd7108 100644 --- a/lumina-0.9_pre.ebuild +++ b/lumina-9999.ebuild @@ -3,36 +3,32 @@ # Available under the 3-clause BSD license # See the LICENSE file for full details -EAPI=5 +EAPI=6 inherit git-r3 qmake-utils versionator -MY_PV=$(replace_version_separator 3 '-') - DESCRIPTION="Lumina desktop environment" HOMEPAGE="https://github.com/pcbsd/${PN}" SRC_URI="" EGIT_REPO_URI="${HOMEPAGE}" -#EGIT_COMMIT="v${MY_PV}" LICENSE="BSD" SLOT="0" KEYWORDS="~x86 ~amd64" -DEPEND="dev-qt/linguist-tools - dev-qt/qtconcurrent - dev-qt/qtcore - dev-qt/qtmultimedia - dev-qt/qtnetwork - dev-qt/qtwidgets - dev-qt/qtx11extras +DEPEND="dev-qt/linguist-tools:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm" RDEPEND="${DEPEND} x11-misc/numlockx - x11-terms/xterm x11-wm/fluxbox x11-apps/xbacklight media-sound/alsa-utils @@ -41,10 +37,6 @@ RDEPEND="${DEPEND} src_compile(){ - eqmake5 PREFIX="${ROOT}usr" LIBPREFIX="${ROOT}usr/lib" DESTDIR="${D}" CONFIG+="NO_I18N" || die "eqmake5 failed" - emake || die "emake failed" -} - -src_install(){ - emake install || die "emake install failed" + eqmake5 PREFIX="${ROOT}usr" LIBPREFIX="${ROOT}usr/lib" DESTDIR="${D}" CONFIG+="NO_I18N" + emake } |