diff options
| -rw-r--r-- | DEPENDENCIES | 13 | ||||
| -rw-r--r-- | libLumina/LuminaThemes.cpp | 11 | ||||
| -rw-r--r-- | libLumina/LuminaThemes.h | 4 | ||||
| -rw-r--r-- | libLumina/LuminaUtils.cpp | 16 | ||||
| -rw-r--r-- | lumina-desktop-32.spec | 87 | ||||
| -rw-r--r-- | lumina-desktop-64.spec | 84 | ||||
| -rw-r--r-- | lumina-desktop.spec | 314 | ||||
| -rw-r--r-- | lumina-desktop/defaults/luminaDesktop.conf | 2 | ||||
| -rw-r--r-- | lumina-desktop/main.cpp | 5 |
9 files changed, 343 insertions, 193 deletions
diff --git a/DEPENDENCIES b/DEPENDENCIES index df6a5267..1a4dd5ec 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -94,8 +94,6 @@ Optional Tools fluxbox kde-style-oxygen xscreensaver - - Optional packages xbacklight (required for changing screen brightness) alsa-utils (required for adjusting audio volume) acpi (required for monitoring battery life) @@ -110,12 +108,12 @@ Optional Tools gcc gcc-c++ - qt-devel qt5-qttools-devel - qt-config qt5-qttools - qt5-qtbase-gui + qt5-linguist + qt5-qtbase-devel qt5-qtmultimedia-devel + qt5-qtdeclarative-devel qt5-qtsvg-devel qt5-qtx11extras-devel xcb-util-image @@ -123,12 +121,9 @@ Optional Tools xcb-util-wm-devel libxcb-devel xcb-util-devel - phonon-devel - phonon-qt5-devel libXcomposite-devel libXdamage-devel libXrender-devel - qt5-qtdeclarative-devel fluxbox qt5-style-oxygen plasma-oxygen @@ -139,4 +134,4 @@ Optional Tools numlockx pavucontrol xterm - sysstat + sysstat
\ No newline at end of file diff --git a/libLumina/LuminaThemes.cpp b/libLumina/LuminaThemes.cpp index 351189eb..415b3acf 100644 --- a/libLumina/LuminaThemes.cpp +++ b/libLumina/LuminaThemes.cpp @@ -429,7 +429,7 @@ LuminaThemeEngine::LuminaThemeEngine(QApplication *app){ watcher->addPath( QDir::homePath()+"/.lumina/envsettings.conf" ); watcher->addPath( QDir::homePath()+"/.lumina/themesettings.cfg" ); watcher->addPaths( QStringList() << theme << colors << QDir::homePath()+"/.icons/default/index.theme" ); //also watch these files for changes - connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherChange()) ); + connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherChange(QString)) ); connect(syncTimer, SIGNAL(timeout()), this, SLOT(reloadFiles()) ); } @@ -437,14 +437,19 @@ LuminaThemeEngine::~LuminaThemeEngine(){ } -void LuminaThemeEngine::watcherChange(){ +void LuminaThemeEngine::refresh(){ + QTimer::singleShot(100,this, SLOT(reloadFiles()) ); +} + +void LuminaThemeEngine::watcherChange(QString file){ if(syncTimer->isActive()){ syncTimer->stop(); } syncTimer->start(); + if(!watcher->files().contains(file)){ watcher->addPath(file); } } void LuminaThemeEngine::reloadFiles(){ //Check the Theme file/settings - if(lastcheck < QFileInfo(QDir::homePath()+"/.lumina/themesettings.cfg").lastModified() ){ + if(lastcheck < QFileInfo(QDir::homePath()+"/.lumina/themesettings.cfg").lastModified().addSecs(1) ){ QStringList current = LTHEME::currentSettings(); application->setStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1], current[3], current[4]) ); if(icons!=current[2]){ diff --git a/libLumina/LuminaThemes.h b/libLumina/LuminaThemes.h index 0ff15aa1..f0b8c2b6 100644 --- a/libLumina/LuminaThemes.h +++ b/libLumina/LuminaThemes.h @@ -92,6 +92,8 @@ public: LuminaThemeEngine(QApplication *app); ~LuminaThemeEngine(); + void refresh(); + private: QApplication *application; QFileSystemWatcher *watcher; @@ -101,7 +103,7 @@ private: //LuminaThemeStyle *style; private slots: - void watcherChange(); + void watcherChange(QString); void reloadFiles(); signals: diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp index cad7f817..a8ddfc90 100644 --- a/libLumina/LuminaUtils.cpp +++ b/libLumina/LuminaUtils.cpp @@ -574,6 +574,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } QString var = tmp[i].section("=",0,0).toLower().simplified(); QString val = tmp[i].section("=",1,1).section("#",0,0).simplified(); + if(val.isEmpty()){ continue; } QString istrue = (val.toLower()=="true") ? "true": "false"; //Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while if(var.contains(".")){ var.replace(".","_"); } @@ -621,6 +622,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } QString var = tmp[i].section("=",0,0).toLower().simplified(); QString val = tmp[i].section("=",1,1).section("#",0,0).simplified(); + if(val.isEmpty()){ continue; } QString istrue = (val.toLower()=="true") ? "true": "false"; //Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while if(var.contains(".")){ var.replace(".","_"); } @@ -643,6 +645,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } QString var = tmp[i].section("=",0,0).toLower().simplified(); QString val = tmp[i].section("=",1,1).section("#",0,0).simplified(); + if(val.isEmpty()){ continue; } QString istrue = (val.toLower()=="true") ? "true": "false"; //Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while if(var.contains(".")){ var.replace(".","_"); } @@ -675,6 +678,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } QString var = tmp[i].section("=",0,0).simplified(); QString val = tmp[i].section("=",1,1).section("#",0,0).toLower().simplified(); + if(val.isEmpty()){ continue; } //Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while if(var.contains(".")){ var.replace(".","_"); } //Now parse the variable and put the value in the proper file @@ -701,7 +705,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){ //Now do any theme settings QStringList themesettings = LTHEME::currentSettings(); //List: [theme path, colorspath, iconsname, font, fontsize] - qDebug() << "Current Theme Color:" << themesettings[1]; + //qDebug() << "Current Theme Color:" << themesettings[1]; tmp = sysDefaults.filter("theme_"); if(tmp.isEmpty()){ tmp = sysDefaults.filter("theme."); } bool setTheme = !tmp.isEmpty(); @@ -709,6 +713,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } QString var = tmp[i].section("=",0,0).toLower().simplified(); QString val = tmp[i].section("=",1,1).section("#",0,0).simplified(); + if(val.isEmpty()){ continue; } //Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while if(var.contains(".")){ var.replace(".","_"); } //Now parse the variable and put the value in the proper file @@ -728,8 +733,8 @@ void LUtils::LoadSystemDefaults(bool skipOS){ QStringList systhemes = LTHEME::availableSystemThemes(); QStringList syscolors = LTHEME::availableSystemColors(); //theme file - qDebug() << "Detected Themes/colors:" << systhemes << syscolors; - if( !themesettings[0].startsWith("/") || !QFile::exists(themesettings[0]) || !themesettings[1].endsWith(".qss.template")){ + //qDebug() << "Detected Themes/colors:" << systhemes << syscolors; + if( !themesettings[0].startsWith("/") || !QFile::exists(themesettings[0]) || !themesettings[0].endsWith(".qss.template")){ themesettings[0] = themesettings[0].section(".qss",0,0).simplified(); for(int i=0; i<systhemes.length(); i++){ if(systhemes[i].startsWith(themesettings[0]+"::::",Qt::CaseInsensitive)){ @@ -750,7 +755,8 @@ void LUtils::LoadSystemDefaults(bool skipOS){ } } } - + //qDebug() << " - Final Theme Color:" << themesettings[1]; + //Ensure that the settings directory exists QString setdir = QDir::homePath()+"/.lumina/LuminaDE"; if(!QFile::exists(setdir)){ @@ -848,4 +854,4 @@ void ResizeMenu::mouseReleaseEvent(QMouseEvent *ev){ }else{ QMenu::mouseReleaseEvent(ev); //do normal processing } -}
\ No newline at end of file +} diff --git a/lumina-desktop-32.spec b/lumina-desktop-32.spec deleted file mode 100644 index 633f2373..00000000 --- a/lumina-desktop-32.spec +++ /dev/null @@ -1,87 +0,0 @@ -Summary: A lightweight, portable desktop environment -Name: lumina-desktop -Version: 0.8.7 -Release: 1%{?dist} -License: BSD -Group: System Environment/Base -Source0: http://ftp.lumina-desktop.org/%{name}-%{version}.tar.gz -URL: http://lumina-desktop.org -ExcludeArch: s390 s390x -BuildRequires: gcc, gcc-c++, qt-devel, qt-config, qt5-qttools, qt5-qttools-devel, qt5-qtbase-gui, qt5-qtmultimedia-devel, qt5-qtsvg-devel, qt5-qtx11extras-devel, xcb-util-image, xcb-util-image-devel, xcb-util-wm-devel, libxcb-devel, xcb-util-devel, phonon-devel, phonon-qt5-devel, libXcomposite-devel, libXdamage-devel, libXrender-devel, qt5-qtdeclarative-devel -Requires: fluxbox, qt5-style-oxygen, plasma-oxygen, xscreensaver, xbacklight, alsa-utils, acpi, numlockx, pavucontrol, xterm, sysstat - -%description -The Lumina Desktop Environment is a lightweight system interface -that is designed for use on any Unix-like operating system. - -%prep -%autosetup -n lumina-%{version}-Release - -%build -qmake-qt5 CONFIG+=configure\ NO_I18N PREFIX=/usr/local LIBPREFIX=/lib - -%install -make -make INSTALL_ROOT=%{buildroot} install - -%files -/usr/local/bin/Lumina-DE -/usr/local/bin/lumina-open -/usr/local/bin/lumina-config -/usr/local/bin/lumina-fm -/usr/local/bin/lumina-screenshot -/usr/local/bin/lumina-search -/usr/local/bin/lumina-info -/usr/local/bin/lumina-xconfig -/usr/local/bin/lumina-fileinfo -/usr/local/etc/luminaDesktop.conf.dist -/lib/libLuminaUtils.so -/lib/libLuminaUtils.so.1 -/lib/libLuminaUtils.so.1.0 -/lib/libLuminaUtils.so.1.0.0 -/usr/local/include/LuminaXDG.h -/usr/local/include/LuminaUtils.h -/usr/local/include/LuminaX11.h -/usr/local/include/LuminaThemes.h -/usr/local/include/LuminaOS.h -/usr/local/include/LuminaSingleApplication.h -/usr/local/share/applications/lumina-fm.desktop -/usr/local/share/applications/lumina-screenshot.desktop -/usr/local/share/applications/lumina-search.desktop -/usr/local/share/applications/lumina-info.desktop -/usr/local/share/pixmaps/Lumina-DE.png -/usr/local/share/pixmaps/Insight-FileManager.png -/usr/share/xsessions/Lumina-DE.desktop -/usr/local/share/Lumina-DE/desktop-background.jpg -/usr/local/share/Lumina-DE/luminaDesktop.conf -/usr/local/share/Lumina-DE/fluxbox-init-rc -/usr/local/share/Lumina-DE/fluxbox-keys -/usr/local/share/Lumina-DE/Login.ogg -/usr/local/share/Lumina-DE/Logout.ogg -/usr/local/share/Lumina-DE/colors/Lumina-Red.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Green.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Purple.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Gold.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Glass.qss.colors -/usr/local/share/Lumina-DE/colors/PCBSD10-Default.qss.colors -/usr/local/share/Lumina-DE/themes/Lumina-default.qss.template -/usr/local/share/Lumina-DE/themes/None.qss.template -/usr/local/share/Lumina-DE/quickplugins/quick-sample.qml -/usr/local/share/Lumina-DE/colors/Blue-Light.qss.colors -/usr/local/share/Lumina-DE/colors/Grey-Dark.qss.colors -/usr/local/share/Lumina-DE/colors/Solarized-Dark.qss.colors -/usr/local/share/Lumina-DE/colors/Solarized-Light.qss.colors -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_gold.jpg -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_green.jpg -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_purple.jpg -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_red.jpg - -%changelog -* Tue Oct 27 2015 Jesse Smith jsmith@resonatingmedia.com -- Update to 0.8.7 - -* Thu Aug 20 2015 Jesse Smith jsmith@resonatingmedia.com -- Updated for 32-bit - -* Thu Jul 30 2015 Jesse Smith jsmith@resonatingmedia.com -- Initial build diff --git a/lumina-desktop-64.spec b/lumina-desktop-64.spec deleted file mode 100644 index 11418ee1..00000000 --- a/lumina-desktop-64.spec +++ /dev/null @@ -1,84 +0,0 @@ -Summary: A lightweight, portable desktop environment -Name: lumina-desktop -Version: 0.8.7 -Release: 1%{?dist} -License: BSD -Group: System Environment/Base -Source0: http://ftp.lumina-desktop.org/%{name}-%{version}.tar.gz -URL: http://lumina-desktop.org -ExcludeArch: s390 s390x -BuildRequires: gcc, gcc-c++, qt-devel, qt-config, qt5-qttools, qt5-qttools-devel, qt5-qtbase-gui, qt5-qtmultimedia-devel, qt5-qtsvg-devel, qt5-qtx11extras-devel, xcb-util-image, xcb-util-image-devel, xcb-util-wm-devel, libxcb-devel, xcb-util-devel, phonon-devel, phonon-qt5-devel, libXcomposite-devel, libXdamage-devel, libXrender-devel, qt5-qtdeclarative-devel -Requires: fluxbox, qt5-style-oxygen, plasma-oxygen, xscreensaver, xbacklight, alsa-utils, acpi, numlockx, pavucontrol, xterm, sysstat - -%description -The Lumina Desktop Environment is a lightweight system interface -that is designed for use on any Unix-like operating system. - -%prep -%autosetup -n lumina-%{version}-Release - -%build -qmake-qt5 CONFIG+=configure\ NO_I18N PREFIX=/usr/local LIBPREFIX=/lib64 - -%install -make -make INSTALL_ROOT=%{buildroot} install - -%files -/usr/local/bin/Lumina-DE -/usr/local/bin/lumina-open -/usr/local/bin/lumina-config -/usr/local/bin/lumina-fm -/usr/local/bin/lumina-screenshot -/usr/local/bin/lumina-search -/usr/local/bin/lumina-info -/usr/local/bin/lumina-xconfig -/usr/local/bin/lumina-fileinfo -/usr/local/etc/luminaDesktop.conf.dist -/lib64/libLuminaUtils.so -/lib64/libLuminaUtils.so.1 -/lib64/libLuminaUtils.so.1.0 -/lib64/libLuminaUtils.so.1.0.0 -/usr/local/include/LuminaXDG.h -/usr/local/include/LuminaUtils.h -/usr/local/include/LuminaX11.h -/usr/local/include/LuminaThemes.h -/usr/local/include/LuminaOS.h -/usr/local/include/LuminaSingleApplication.h -/usr/local/share/applications/lumina-fm.desktop -/usr/local/share/applications/lumina-screenshot.desktop -/usr/local/share/applications/lumina-search.desktop -/usr/local/share/applications/lumina-info.desktop -/usr/local/share/pixmaps/Lumina-DE.png -/usr/local/share/pixmaps/Insight-FileManager.png -/usr/share/xsessions/Lumina-DE.desktop -/usr/local/share/Lumina-DE/desktop-background.jpg -/usr/local/share/Lumina-DE/luminaDesktop.conf -/usr/local/share/Lumina-DE/fluxbox-init-rc -/usr/local/share/Lumina-DE/fluxbox-keys -/usr/local/share/Lumina-DE/Login.ogg -/usr/local/share/Lumina-DE/Logout.ogg -/usr/local/share/Lumina-DE/colors/Lumina-Red.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Green.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Purple.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Gold.qss.colors -/usr/local/share/Lumina-DE/colors/Lumina-Glass.qss.colors -/usr/local/share/Lumina-DE/colors/PCBSD10-Default.qss.colors -/usr/local/share/Lumina-DE/themes/Lumina-default.qss.template -/usr/local/share/Lumina-DE/themes/None.qss.template -/usr/local/share/Lumina-DE/quickplugins/quick-sample.qml -/usr/local/share/Lumina-DE/colors/Blue-Light.qss.colors -/usr/local/share/Lumina-DE/colors/Grey-Dark.qss.colors -/usr/local/share/Lumina-DE/colors/Solarized-Dark.qss.colors -/usr/local/share/Lumina-DE/colors/Solarized-Light.qss.colors -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_gold.jpg -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_green.jpg -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_purple.jpg -/usr/local/share/wallpapers/Lumina-DE/Lumina_Wispy_red.jpg - -%changelog -* Tue Oct 27 2015 Jesse Smith jsmith@resonatingmedia.com -- Update to 0.8.7 - -* Thu Jul 30 2015 Jesse Smith jsmith@resonatingmedia.com -- Initial build diff --git a/lumina-desktop.spec b/lumina-desktop.spec new file mode 100644 index 00000000..b37c31cc --- /dev/null +++ b/lumina-desktop.spec @@ -0,0 +1,314 @@ +# Enable hardened build by default +%global _hardened_build 1 + +# Enable pulling translations by default +%bcond_without pull_translations + +Summary: A lightweight, portable desktop environment +Name: lumina-desktop +Version: 0.8.8 +Release: 1%{?dist} +License: BSD +Group: User Interface/Desktops +# Main source +Source0: https://github.com/pcbsd/lumina/archive/v%{version}-Release/lumina-%{version}-Release.tar.gz +%if %{with pull_translations} +# Translations +Source1: https://github.com/pcbsd/lumina-i18n/raw/master/dist/lumina-i18n.txz +%endif +URL: http://lumina-desktop.org + +# Exclude IBM ESA/390 and ESA System/z architectures +ExcludeArch: s390 s390x + +# Compiler requirements +BuildRequires: gcc, gcc-c++ + +%if %{with pull_translations} +# Translation installation requirements +BuildRequires: tar +%endif + +# Qt requirements +BuildRequires: qt5-qttools, qt5-qttools-devel, qt5-linguist +BuildRequires: qt5-qtbase-devel, qt5-qtmultimedia-devel, qt5-qtdeclarative-devel +BuildRequires: qt5-qtsvg-devel, qt5-qtx11extras-devel + +# X component requirements +BuildRequires: xcb-util-image, xcb-util-image-devel, xcb-util-wm-devel, libxcb-devel, xcb-util-devel +BuildRequires: libXcomposite-devel, libXdamage-devel, libXrender-devel + +# Runtime requirements +Requires: alsa-utils, acpi, numlockx, pavucontrol, sysstat +Requires: xscreensaver, xbacklight, xterm +Requires: qt5-style-oxygen, plasma-oxygen +Requires: fluxbox + +# Enforce the library subpackage version requirement +Requires: %{name}-libs = %{version}-%{release} + +# Desktop requirements +Requires: lumina-open = %{version}-%{release} +Requires: lumina-config = %{version}-%{release} +Requires: lumina-fm = %{version}-%{release} +Requires: lumina-screenshot = %{version}-%{release} +Requires: lumina-search = %{version}-%{release} +Requires: lumina-info = %{version}-%{release} +Requires: lumina-xconfig = %{version}-%{release} +Requires: lumina-fileinfo = %{version}-%{release} + + +%description +The Lumina Desktop Environment is a lightweight system interface +that is designed for use on any Unix-like operating system. + +%package libs +Summary: Libraries for Lumina Desktop +Group: System Environment/Libraries + +%description libs +This package provides the libraries for the Lumina Desktop +Environment. + +%package devel +Summary: Development libraries for Lumina Desktop +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +This package provides the files needed to develop plugins +or extensions for the Lumina Desktop Environment, or +to develop applications that use Lumina Desktop libraries. + +%package -n lumina-open +Summary: xdg-open style utility for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-open +This package provides lumina-open, which handles opening of +files and URLs according to the system-wide mimetype association. +It also provides an optional selector if more than one application +is assigned with the given url or file type. + +%package -n lumina-config +Summary: Configuration utility for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-config +This package provides lumina-config, which allows changing +various aspects of lumina and fluxbox, like the wallpaper being +used, theme, icons, panel (and plugins), startup and default +applications, desktop menu and more. + +%package -n lumina-fm +Summary: File manager for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-fm +This package provides lumina-fm, which is a simple file manager +with support for multiple view modes, tabbed browsing, +including an integrated slideshow-based picture viewer. + + +%package -n lumina-screenshot +Summary: Screenshot utility for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-screenshot +This package provides lumina-screenshot, which is a simple +screenshot utility that allows to snapshot the whole desktop +or a single window after a configurable delay. + +Optionally the window border can be hidden when taking a +screenshot of a single window. + + +%package -n lumina-search +Summary: Search utility for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-search +This package provides lumina-search, which is a simple +search utility that allows to search for applications or +files and directories in the home directory and launch +or open them. + + +%package -n lumina-info +Summary: Basic information utility for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-info +This package provides lumina-info, which is a simple +utility that displays various information about the Lumina +installation, like paths, contributors, license or version. + + +%package -n lumina-xconfig +Summary: X server display configuration tool for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-xconfig +This package provides lumina-xconfig, which is a simple +multi-head aware display configuration tool for configuring +the X server. + + +%package -n lumina-fileinfo +Summary: Desktop file editor for Lumina Desktop +Group: User Interface/Desktops +Requires: %{name}-libs = %{version}-%{release} + +%description -n lumina-fileinfo +This package provides lumina-fileinfo, which is an +advanced desktop file (menu) editor. + + +%prep +%setup -q -n lumina-%{version}-Release + +%build +%qmake_qt5 CONFIG+=configure PREFIX="%{_prefix}" LIBPREFIX="%{_libdir}" QT5LIBDIR="%{_qt5_prefix}" +make %{?_smp_mflags} + +%install +# Install the desktop +make INSTALL_ROOT=%{buildroot} install + +%if %{with pull_translations} +# Install translations +mkdir -p %{buildroot}%{_datadir}/Lumina-DE/i18n +tar xvf %{SOURCE1} -C %{buildroot}%{_datadir}/Lumina-DE/i18n +%endif + +# Move config folder to correct location +mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot} + +# Fix paths in desktop files +find %{buildroot}/ -name *.desktop -exec sed -i "s:/usr/local/:/usr/:g" {} \; + +# Create proper config file +cp %{buildroot}%{_datadir}/Lumina-DE/luminaDesktop.conf %{buildroot}%{_sysconfdir}/luminaDesktop.conf +sed -i "s:/usr/local/share/applications/firefox.desktop:firefox:g" %{buildroot}%{_sysconfdir}/luminaDesktop.conf +sed -i "s:/usr/local/share/applications/thunderbird.desktop:thunderbird:g" %{buildroot}%{_sysconfdir}/luminaDesktop.conf + + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + +%files libs +%license LICENSE +%{_libdir}/libLuminaUtils.so.1 +%{_libdir}/libLuminaUtils.so.1.0 +%{_libdir}/libLuminaUtils.so.1.0.0 + +%files devel +%license LICENSE +%{_libdir}/libLuminaUtils.so +%{_includedir}/LuminaXDG.h +%{_includedir}/LuminaUtils.h +%{_includedir}/LuminaX11.h +%{_includedir}/LuminaThemes.h +%{_includedir}/LuminaOS.h +%{_includedir}/LuminaSingleApplication.h + +%files +%license LICENSE +%{_bindir}/Lumina-DE +%config(noreplace) %{_sysconfdir}/luminaDesktop.conf +%{_sysconfdir}/luminaDesktop.conf.dist +%{_datadir}/pixmaps/Lumina-DE.png +%{_datadir}/xsessions/Lumina-DE.desktop +%{_datadir}/Lumina-DE/desktop-background.jpg +%{_datadir}/Lumina-DE/luminaDesktop.conf +%{_datadir}/Lumina-DE/fluxbox-init-rc +%{_datadir}/Lumina-DE/fluxbox-keys +%{_datadir}/Lumina-DE/Login.ogg +%{_datadir}/Lumina-DE/Logout.ogg +%{_datadir}/Lumina-DE/colors/Lumina-Red.qss.colors +%{_datadir}/Lumina-DE/colors/Lumina-Green.qss.colors +%{_datadir}/Lumina-DE/colors/Lumina-Purple.qss.colors +%{_datadir}/Lumina-DE/colors/Lumina-Gold.qss.colors +%{_datadir}/Lumina-DE/colors/Lumina-Glass.qss.colors +%{_datadir}/Lumina-DE/colors/PCBSD10-Default.qss.colors +%{_datadir}/Lumina-DE/themes/Lumina-default.qss.template +%{_datadir}/Lumina-DE/themes/None.qss.template +%{_datadir}/Lumina-DE/quickplugins/quick-sample.qml +%{_datadir}/Lumina-DE/colors/Blue-Light.qss.colors +%{_datadir}/Lumina-DE/colors/Grey-Dark.qss.colors +%{_datadir}/Lumina-DE/colors/Solarized-Dark.qss.colors +%{_datadir}/Lumina-DE/colors/Solarized-Light.qss.colors +%{_datadir}/wallpapers/Lumina-DE/Lumina_Wispy_gold.jpg +%{_datadir}/wallpapers/Lumina-DE/Lumina_Wispy_green.jpg +%{_datadir}/wallpapers/Lumina-DE/Lumina_Wispy_purple.jpg +%{_datadir}/wallpapers/Lumina-DE/Lumina_Wispy_red.jpg +%{_datadir}/Lumina-DE/i18n/lumina-desktop*.qm + +%files -n lumina-open +%license LICENSE +%{_bindir}/lumina-open +%{_datadir}/Lumina-DE/i18n/lumina-open*.qm + +%files -n lumina-config +%license LICENSE +%{_bindir}/lumina-config +%{_datadir}/Lumina-DE/i18n/lumina-config*.qm + +%files -n lumina-fm +%license LICENSE +%{_bindir}/lumina-fm +%{_datadir}/Lumina-DE/i18n/lumina-fm*.qm +%{_datadir}/pixmaps/Insight-FileManager.png +%{_datadir}/applications/lumina-fm.desktop + +%files -n lumina-screenshot +%license LICENSE +%{_bindir}/lumina-screenshot +%{_datadir}/Lumina-DE/i18n/lumina-screenshot*.qm +%{_datadir}/applications/lumina-screenshot.desktop + +%files -n lumina-search +%license LICENSE +%{_bindir}/lumina-search +%{_datadir}/Lumina-DE/i18n/lumina-search*.qm +%{_datadir}/applications/lumina-search.desktop + +%files -n lumina-info +%license LICENSE +%{_bindir}/lumina-info +%{_datadir}/Lumina-DE/i18n/lumina-info*.qm +%{_datadir}/applications/lumina-info.desktop + +%files -n lumina-xconfig +%license LICENSE +%{_bindir}/lumina-xconfig +%{_datadir}/Lumina-DE/i18n/lumina-xconfig*.qm + +%files -n lumina-fileinfo +%license LICENSE +%{_bindir}/lumina-fileinfo +%{_datadir}/Lumina-DE/i18n/lumina-fileinfo*.qm + + +%changelog +* Wed Dec 23 2015 Neal Gompa <ngompa13@gmail.com> +- Update to 0.8.8 +- Bring it closer to Fedora guidelines +- Break out Lumina Desktop package into subpackages +- Unify 32-bit and 64-bit packaging + +* Tue Oct 27 2015 Jesse Smith <jsmith@resonatingmedia.com> +- Update to 0.8.7 + +* Thu Aug 20 2015 Jesse Smith <jsmith@resonatingmedia.com> +- Updated for 32-bit + +* Thu Jul 30 2015 Jesse Smith <jsmith@resonatingmedia.com> +- Initial build diff --git a/lumina-desktop/defaults/luminaDesktop.conf b/lumina-desktop/defaults/luminaDesktop.conf index f2632e0e..2c973adb 100644 --- a/lumina-desktop/defaults/luminaDesktop.conf +++ b/lumina-desktop/defaults/luminaDesktop.conf @@ -29,7 +29,7 @@ session_playlogoutaudio=true #[true/false] Play the audio chimes on log out #THEME SETTINGS #theme.themefile=<file path> #Absolute path to the theme template file to use (disable for Lumina-Default) -theme.colorfile=Black #Name of the color spec file to use for theming +theme_colorfile=Black #Name of the color spec file to use for theming theme_iconset=oxygen #Name of the icon theme to use theme_font=Arial #Name of the font family to use theme_fontsize=10pt #Default size of the fonts to use on the desktop (can also use a percentage of the screen height (<number>%) ) diff --git a/lumina-desktop/main.cpp b/lumina-desktop/main.cpp index 3602c10e..50ad7ef4 100644 --- a/lumina-desktop/main.cpp +++ b/lumina-desktop/main.cpp @@ -70,8 +70,7 @@ int main(int argc, char ** argv) setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... - //Startup the Application - if(DEBUG){ qDebug() << "Session Init:";} + //Startup the session LSession a(argc, argv); if(!a.isPrimaryProcess()){ return 0; } //Setup the log file @@ -95,7 +94,7 @@ int main(int argc, char ** argv) //LUtils::LoadTranslation(&a, "lumina-desktop"); if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); } a.setupSession(); - + theme.refresh(); if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;} int retCode = a.exec(); //qDebug() << "Stopping the window manager"; |