diff --git a/.gitignore b/.gitignore index e69de29..bb4613b 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/hawaii-shell-0.2.0.2.tar.gz diff --git a/0001-Use-external-QtXdg.patch b/0001-Use-external-QtXdg.patch new file mode 100644 index 0000000..6f75f24 --- /dev/null +++ b/0001-Use-external-QtXdg.patch @@ -0,0 +1,51 @@ +From 3aae8924f735b23d051b5ccb8dc10eac1e40d56b Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Fri, 3 Jan 2014 23:30:46 +0100 +Subject: [PATCH] Use external QtXdg + +--- + 3rdparty/libqtxdg | 1 - + src/client/CMakeLists.txt | 6 +++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + delete mode 160000 3rdparty/libqtxdg + +diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt +index 3bdb0fd..f54b83c 100644 +--- a/src/client/CMakeLists.txt ++++ b/src/client/CMakeLists.txt +@@ -4,12 +4,16 @@ find_package(QtAccountsService REQUIRED) + # Find ALSA + find_package(ALSA) + ++# Find QtXdg ++find_package(Qt5Xdg REQUIRED) ++ + include_directories( + ${Qt5Gui_PRIVATE_INCLUDE_DIRS} + ${POLKITQT-1_INCLUDE_DIR} + ${WaylandClient_INCLUDE_DIRS} + ${QtAccountsService_INCLUDE_DIRS} + ${ALSA_INCLUDE_DIR} ++ ${QTXDG_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/headers +@@ -33,7 +37,6 @@ configure_file( + ) + + set(SOURCES +- ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg/xdgdesktopfile.cpp + appcategories.cpp + appinfo.cpp + applicationiconprovider.cpp +@@ -114,6 +117,7 @@ target_link_libraries(hawaii-desktop-shell + ${POLKITQT-1_CORE_LIBRARY} + ${POLKITQT-1_AGENT_LIBRARY} + ${ALSA_LIBRARIES} ++ ${QTXDG_LIBRARY} + ${QtAccountsService_LIBRARIES} + HawaiiCore + ) +-- +1.8.4.2 + diff --git a/0001-shell-Use-default-wallpaper.patch b/0001-shell-Use-default-wallpaper.patch new file mode 100644 index 0000000..bce0616 --- /dev/null +++ b/0001-shell-Use-default-wallpaper.patch @@ -0,0 +1,27 @@ +From 84e45ca3c5078785b0b7ab922cd1e82009cc8fa7 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 16 Sep 2013 18:43:30 +0200 +Subject: [PATCH] shell: Use default wallpaper + +Avoids dragging in questionably licensed files. +https://github.com/hawaii-desktop/wallpapers/issues/3 +--- + src/libhawaiicore/settings/backgroundsettings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libhawaiicore/settings/backgroundsettings.cpp b/src/libhawaiicore/settings/backgroundsettings.cpp +index 1581fa4..3d08db2 100644 +--- a/src/libhawaiicore/settings/backgroundsettings.cpp ++++ b/src/libhawaiicore/settings/backgroundsettings.cpp +@@ -37,7 +37,7 @@ BackgroundSettings::BackgroundSettings(QObject *parent) + m_primaryColor = QColor(51, 102, 153); + m_secondaryColor = QColor(46, 93, 140); + m_shading = BackgroundSettings::SolidColorShading; +- m_url = QUrl::fromLocalFile(QStringLiteral("%1/backgrounds/hawaii/Also_Calm.png") ++ m_url = QUrl::fromLocalFile(QStringLiteral("%1/backgrounds/default.png") + .arg(INSTALL_DATADIR)); + m_fillMode = BackgroundSettings::Stretched; + +-- +1.8.4.2 + diff --git a/hawaii-shell.spec b/hawaii-shell.spec new file mode 100644 index 0000000..c04c81b --- /dev/null +++ b/hawaii-shell.spec @@ -0,0 +1,107 @@ +Name: hawaii-shell +Summary: Hawaii shell for desktop, netbook and tablet +Version: 0.2.0.2 +Release: 1%{?dist} +Group: Applications/System +License: BSD and LGPLv2+ and GPLv2+ +URL: https://github.com/hawaii-desktop/shell +Source0: http://downloads.sourceforge.net/mauios/%{name}-%{version}.tar.gz +Patch1: 0001-shell-Use-default-wallpaper.patch +Patch3: 0001-Use-external-QtXdg.patch + +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Compositor) +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: pkgconfig(polkit-qt-1) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(weston) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: bzip2-devel +BuildRequires: cmake +BuildRequires: qt5-qtaccountsservice-devel >= 0.1.1 +BuildRequires: qt5-qtconfiguration-devel >= 0.2.1 +BuildRequires: greenisland-devel >= 0.2.0 +BuildRequires: pkgconfig(glesv2) pkgconfig(egl) +BuildRequires: alsa-lib-devel + +BuildRequires: dconf-devel +BuildRequires: glib2-devel +BuildRequires: libqtxdg-qt5-devel + +Requires: qt5-qtsvg +Requires: qt5-qttools +Requires: qt5-qtdeclarative +Requires: fluid +Requires: greenisland +Requires: desktop-backgrounds-compat +Requires: weston + +%description +This is the Hawaii desktop environment shell. It contains a Qt platform plugin +and shells for different form factors such as desktop, netbook and tablet. Only +the desktop shell is implemented at the moment though. + + +%prep +%setup -q +%patch1 -p1 +%patch3 -p1 + + +%build +# We use private QtComposior API +CXXFLAGS="%{optflags}" +CXXFLAGS="$CXXFLAGS -I%{_qt5_headerdir}/QtCompositor/5.1.0/QtCompositor" +CXXFLAGS="$CXXFLAGS -I%{_qt5_headerdir}/QtCompositor/5.1.0" +%cmake -DQTWAYLAND_SCANNER_EXECUTABLE=%{_qt5_bindir}/qtwaylandscanner . +make %{?_smp_mflags} + + +%install +make install DESTDIR=%{buildroot} + + +%files +%{_bindir}/hawaii +%{_bindir}/hawaii-shell +%{_libdir}/libHawaiiCore.so.* +%exclude %{_libdir}/libHawaiiCore.so +%dir %{_libdir}/hawaii +%dir %{_libdir}/hawaii/qml +%dir %{_libdir}/hawaii/qml/Hawaii +%{_libdir}/hawaii/qml/Hawaii/Shell +%dir %{_libdir}/hawaii/plugins +%dir %{_libdir}/hawaii/plugins/platformthemes +%{_libdir}/hawaii/plugins/platformthemes/hawaii.so +%{_libdir}/weston/hawaii-desktop.so +%{_libexecdir}/starthawaii +%{_libexecdir}/hawaii-desktop-shell +%dir %{_datadir}/hawaii +%dir %{_datadir}/hawaii/styles +%{_datadir}/hawaii/styles/Aluminium +%doc AUTHORS +%doc COPYING +%doc COPYING.LIB +%doc README.md + + +%changelog +* Sat Jan 04 2014 Lubomir Rintel - 0.2.0.2-1 +- Update to new release tarball + +* Sun Nov 24 2013 Lubomir Rintel - 0.1.95-1 +- Bump + +* Tue Sep 24 2013 Lubomir Rintel - 0.1.93-1.20130822gitff4ed81 +- Bump + +* Mon Sep 16 2013 Lubomir Rintel - 0.1.91-1.20130804git5624ac7 +- Initial packaging diff --git a/sources b/sources index e69de29..a82c679 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2fe38f2145ab824b7d31f29a4611e2ca hawaii-shell-0.2.0.2.tar.gz