diff --git a/0001-shell-Use-default-wallpaper.patch b/0001-shell-Use-default-wallpaper.patch index bfa6caa..d463021 100644 --- a/0001-shell-Use-default-wallpaper.patch +++ b/0001-shell-Use-default-wallpaper.patch @@ -1,27 +1,41 @@ -From d5aee57328e9712aa2403767be034c9af55225ee Mon Sep 17 00:00:00 2001 +From ce96b860246f11579a05a9c8aa76393e995e4b3e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 16 Sep 2013 18:43:30 +0200 -Subject: [PATCH 1/3] shell: Use default wallpaper +Subject: [PATCH] shell: Use default wallpaper -Avoids dragging in questionably licensed files. -https://github.com/hawaii-desktop/wallpapers/issues/3 +The background is no longer questionably licensed, but we still like to use the +Fedora (or whatever branding is used) theme. --- - src/libhawaiishell/settings/backgroundsettings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/packages/backgrounds/wallpaper/contents/preferences/Preferences.qml | 2 +- + src/packages/backgrounds/wallpaper/contents/ui/main.qml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/libhawaiishell/settings/backgroundsettings.cpp b/src/libhawaiishell/settings/backgroundsettings.cpp -index a76a431..baf495a 100644 ---- a/src/libhawaiishell/settings/backgroundsettings.cpp -+++ b/src/libhawaiishell/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; +diff --git a/src/packages/backgrounds/wallpaper/contents/preferences/Preferences.qml b/src/packages/backgrounds/wallpaper/contents/preferences/Preferences.qml +index e6836de..e814074 100644 +--- a/src/packages/backgrounds/wallpaper/contents/preferences/Preferences.qml ++++ b/src/packages/backgrounds/wallpaper/contents/preferences/Preferences.qml +@@ -50,7 +50,7 @@ Item { + category: "shell/backgrounds/org.hawaii.backgrounds.wallpaper" + property color color: "#336699" +- property url wallpaperUrl: FluidCore.StandardPaths.locateFile(FluidCore.StandardPaths.GenericDataLocation, "backgrounds/hawaii/Also_Calm.png") ++ property url wallpaperUrl: FluidCore.StandardPaths.locateFile(FluidCore.StandardPaths.GenericDataLocation, "backgrounds/default.png") + property int fillMode: Image.Stretch + } + +diff --git a/src/packages/backgrounds/wallpaper/contents/ui/main.qml b/src/packages/backgrounds/wallpaper/contents/ui/main.qml +index 852d122..c143d31 100644 +--- a/src/packages/backgrounds/wallpaper/contents/ui/main.qml ++++ b/src/packages/backgrounds/wallpaper/contents/ui/main.qml +@@ -44,7 +44,7 @@ FluidUi.NoiseBackground { + category: "shell/backgrounds/org.hawaii.backgrounds.wallpaper" + + property color color: "#336699" +- property url wallpaperUrl: FluidCore.StandardPaths.locateFile(FluidCore.StandardPaths.GenericDataLocation, "backgrounds/hawaii/Also_Calm.png") ++ property url wallpaperUrl: FluidCore.StandardPaths.locateFile(FluidCore.StandardPaths.GenericDataLocation, "backgrounds/default.png") + property int fillMode: Image.Stretch + + function applyChanges() { -- -1.8.5.3 +2.0.0 diff --git a/0001-systemd-Install-unit-files-into-proper-location.patch b/0001-systemd-Install-unit-files-into-proper-location.patch new file mode 100644 index 0000000..5676f79 --- /dev/null +++ b/0001-systemd-Install-unit-files-into-proper-location.patch @@ -0,0 +1,24 @@ +From 05998063122ad833f845c323efb2dd406ace3621 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Sun, 15 Jun 2014 12:06:47 +0200 +Subject: [PATCH] systemd: Install unit files into proper location + +/etc/systemd is reserved for user configuration. It is intended to overlay +defaults in /usr/lib/systemd. +--- + data/systemd/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/systemd/CMakeLists.txt b/data/systemd/CMakeLists.txt +index bd5e29b..f1c7209 100644 +--- a/data/systemd/CMakeLists.txt ++++ b/data/systemd/CMakeLists.txt +@@ -47,4 +47,4 @@ if(PolkitQt5-1_FOUND) + ) + endif() + +-install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/systemd/user) ++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/user) +-- +2.0.0 + diff --git a/0002-Use-external-QtXdg.patch b/0002-Use-external-QtXdg.patch deleted file mode 100644 index 0303450..0000000 --- a/0002-Use-external-QtXdg.patch +++ /dev/null @@ -1,91 +0,0 @@ -From fc128723a73c42ceac1469e5078ac91d5ef048e8 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 14 Feb 2014 20:45:13 +0100 -Subject: [PATCH 2/3] Use external QtXdg - ---- - 3rdparty/libqtxdg | 1 - - src/client/CMakeLists.txt | 5 +++++ - src/libhawaiishell/CMakeLists.txt | 2 -- - src/libhawaiishell/applications/appinfo.cpp | 2 +- - src/libhawaiishell/pluginmetadata.cpp | 2 +- - 5 files changed, 7 insertions(+), 5 deletions(-) - delete mode 160000 3rdparty/libqtxdg - -diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt -index 54a14f4..60bfbeb 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}/src/libhawaiishell -@@ -92,6 +96,7 @@ target_link_libraries(hawaii-shell-client - ${POLKITQT-1_CORE_LIBRARY} - ${POLKITQT-1_AGENT_LIBRARY} - ${ALSA_LIBRARIES} -+ ${QTXDG_LIBRARY} - ${QtAccountsService_LIBRARIES} - HF1HawaiiShell - ) -diff --git a/src/libhawaiishell/CMakeLists.txt b/src/libhawaiishell/CMakeLists.txt -index b93c0e0..05ab86e 100644 ---- a/src/libhawaiishell/CMakeLists.txt -+++ b/src/libhawaiishell/CMakeLists.txt -@@ -4,12 +4,10 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/includes - ${CMAKE_CURRENT_SOURCE_DIR}/applications - ${CMAKE_CURRENT_SOURCE_DIR}/settings -- ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg - ${CMAKE_CURRENT_BINARY_DIR} - ) - - set(SOURCES -- ${CMAKE_SOURCE_DIR}/3rdparty/libqtxdg/xdgdesktopfile.cpp - applications/appcategories.cpp - applications/appinfo.cpp - applications/applicationsmodel.cpp -diff --git a/src/libhawaiishell/applications/appinfo.cpp b/src/libhawaiishell/applications/appinfo.cpp -index fac02d5..fb7d2f3 100644 ---- a/src/libhawaiishell/applications/appinfo.cpp -+++ b/src/libhawaiishell/applications/appinfo.cpp -@@ -27,8 +27,8 @@ - #include - #include - -+#include - #include "appinfo.h" --#include "xdgdesktopfile.h" - - namespace Hawaii { - -diff --git a/src/libhawaiishell/pluginmetadata.cpp b/src/libhawaiishell/pluginmetadata.cpp -index a04c45b..acd71bb 100644 ---- a/src/libhawaiishell/pluginmetadata.cpp -+++ b/src/libhawaiishell/pluginmetadata.cpp -@@ -24,8 +24,8 @@ - * $END_LICENSE$ - ***************************************************************************/ - -+#include - #include "pluginmetadata.h" --#include "xdgdesktopfile.h" - - namespace Hawaii { - --- -1.8.5.3 - diff --git a/0003-Use-polkit-qt5-1.patch b/0003-Use-polkit-qt5-1.patch deleted file mode 100644 index c6cce36..0000000 --- a/0003-Use-polkit-qt5-1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ecea0115b8cdbafbf1ccc81bc86f1e5af1bf57e6 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 5 Feb 2014 13:10:35 +0100 -Subject: [PATCH 3/3] Use polkit-qt5-1 - -Renamed to avoid clash with qt4-based one. ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41682ec..03e6d4d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,8 +108,8 @@ string(REGEX REPLACE "[ \t\n]+" "" CMAKE_INSTALL_WESTONLIBDIR "${CMAKE_INSTALL_W - pkg_check_modules(systemd libsystemd-daemon) - set(HAVE_SYSTEMD ${systemd_FOUND}) - --# Find polkit-qt-1 --find_package(PolkitQt-1 REQUIRED) -+# Find polkit-qt5-1 -+find_package(PolkitQt5-1 REQUIRED) - - # Subdirectories - add_subdirectory(headers) --- -1.8.5.3 - diff --git a/hawaii-shell.spec b/hawaii-shell.spec index edcdc86..b4d7856 100644 --- a/hawaii-shell.spec +++ b/hawaii-shell.spec @@ -1,18 +1,17 @@ Name: hawaii-shell Summary: Hawaii shell for desktop, netbook and tablet Version: 0.2.90 -Release: 4.20140212gite338ecb%{?dist} +Release: 4.20140524git2785c40%{?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 # git clone https://github.com/hawaii-desktop/shell.git # cd shell -# git archive e338ecb --prefix=hawaii-shell/ |gzip -9 >hawaii-shell.tar.gz +# git archive 2785c40 --prefix=hawaii-shell/ |gzip -9 >hawaii-shell.tar.gz Source0: %{name}.tar.gz -Patch1: 0001-shell-Use-default-wallpaper.patch -Patch2: 0002-Use-external-QtXdg.patch -Patch3: 0003-Use-polkit-qt5-1.patch +Patch1: 0001-shell-Use-default-wallpaper.patch +Patch2: 0001-systemd-Install-unit-files-into-proper-location.patch BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -33,7 +32,8 @@ BuildRequires: pkgconfig(xkbcommon) BuildRequires: bzip2-devel BuildRequires: cmake BuildRequires: qt5-qtaccountsservice-devel >= 0.1.1 -BuildRequires: qt5-qtconfiguration-devel >= 0.2.1 +BuildRequires: qt5-qtconfiguration-devel >= 0.3.0 + BuildRequires: greenisland-devel >= 0.2.0 BuildRequires: pkgconfig(glesv2) pkgconfig(egl) BuildRequires: alsa-lib-devel @@ -60,19 +60,10 @@ and shells for different form factors such as desktop, netbook and tablet. Only the desktop shell is implemented at the moment though. -%package devel -Summary: Development files for Hawaii shell foundation -Requires: cmake - -%description devel -%{summary}. - - %prep %setup -q -n %{name} %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build @@ -86,24 +77,21 @@ make install DESTDIR=%{buildroot} %files %{_bindir}/* -%{_libdir}/*.so.* %{_libdir}/hawaii %{_libdir}/weston/hawaii-desktop.so %{_libexecdir}/* %{_datadir}/hawaii +%{_userunitdir}/* %doc AUTHORS %doc COPYING %doc COPYING.LIB %doc README.md -%files devel -%{_libdir}/*.so -%{_libdir}/cmake/HF1HawaiiShell -%{_includedir}/HF1 - - %changelog + *Sun Jun 15 2014 Lubomir Rintel - 0.2.90-4.20140524git2785c40 +- A later GIT snapshot + * Sat Jun 07 2014 Fedora Release Engineering - 0.2.90-4.20140212gite338ecb - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 48c1f1e..b8ac7d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e78e5bfe35ab08e3a4ed52ddbf805a03 hawaii-shell.tar.gz +3397cccf47c6f2838e65b58bcbfacf5e hawaii-shell.tar.gz