[hawaii-shell] A later GIT snapshot
Lubomir Rintel
lkundrak at fedoraproject.org
Sun Jun 15 10:31:04 UTC 2014
commit bd072a983ea3481158d993b80112a5ba3e6ec312
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun Jun 15 12:30:28 2014 +0200
A later GIT snapshot
A work in progress! libhawaii is not yet in.
0001-shell-Use-default-wallpaper.patch | 52 +++++++----
...d-Install-unit-files-into-proper-location.patch | 24 +++++
0002-Use-external-QtXdg.patch | 91 --------------------
0003-Use-polkit-qt5-1.patch | 28 ------
hawaii-shell.spec | 32 ++-----
sources | 2 +-
6 files changed, 68 insertions(+), 161 deletions(-)
---
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 <lkundrak at v3.sk>
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 <lkundrak at v3.sk>
+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/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 <lkundrak at v3.sk> - 0.2.90-4.20140524git2785c40
+- A later GIT snapshot
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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
More information about the scm-commits
mailing list