diff --git a/.gitignore b/.gitignore index bb4613b..56fda90 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /hawaii-shell-0.2.0.2.tar.gz +/hawaii-shell.tar.gz diff --git a/0001-Use-external-QtXdg.patch b/0001-Use-external-QtXdg.patch deleted file mode 100644 index 6f75f24..0000000 --- a/0001-Use-external-QtXdg.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 index bce0616..bfa6caa 100644 --- a/0001-shell-Use-default-wallpaper.patch +++ b/0001-shell-Use-default-wallpaper.patch @@ -1,18 +1,18 @@ -From 84e45ca3c5078785b0b7ab922cd1e82009cc8fa7 Mon Sep 17 00:00:00 2001 +From d5aee57328e9712aa2403767be034c9af55225ee 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 +Subject: [PATCH 1/3] shell: Use default wallpaper Avoids dragging in questionably licensed files. https://github.com/hawaii-desktop/wallpapers/issues/3 --- - src/libhawaiicore/settings/backgroundsettings.cpp | 2 +- + src/libhawaiishell/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 +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); @@ -23,5 +23,5 @@ index 1581fa4..3d08db2 100644 m_fillMode = BackgroundSettings::Stretched; -- -1.8.4.2 +1.8.5.3 diff --git a/0002-Use-external-QtXdg.patch b/0002-Use-external-QtXdg.patch new file mode 100644 index 0000000..0303450 --- /dev/null +++ b/0002-Use-external-QtXdg.patch @@ -0,0 +1,91 @@ +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 new file mode 100644 index 0000000..c6cce36 --- /dev/null +++ b/0003-Use-polkit-qt5-1.patch @@ -0,0 +1,28 @@ +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 c04c81b..fc2ef07 100644 --- a/hawaii-shell.spec +++ b/hawaii-shell.spec @@ -1,13 +1,18 @@ Name: hawaii-shell Summary: Hawaii shell for desktop, netbook and tablet -Version: 0.2.0.2 -Release: 1%{?dist} +Version: 0.2.90 +Release: 1.20140212gite338ecb%{?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 +#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 +Source0: %{name}.tar.gz +Patch1: 0001-shell-Use-default-wallpaper.patch +Patch2: 0002-Use-external-QtXdg.patch +Patch3: 0003-Use-polkit-qt5-1.patch BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -17,12 +22,13 @@ BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Compositor) +BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(pixman-1) -BuildRequires: pkgconfig(polkit-qt-1) +BuildRequires: pkgconfig(polkit-qt5-1) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(weston) +BuildRequires: pkgconfig(weston) >= 1.4 BuildRequires: pkgconfig(xkbcommon) BuildRequires: bzip2-devel BuildRequires: cmake @@ -39,10 +45,12 @@ BuildRequires: libqtxdg-qt5-devel Requires: qt5-qtsvg Requires: qt5-qttools Requires: qt5-qtdeclarative -Requires: fluid +Requires: qt5-qtgraphicaleffects +Requires: fluid >= 0.2.90 Requires: greenisland Requires: desktop-backgrounds-compat -Requires: weston +Requires: weston >= 1.4 +Requires: hawaii-widget-styles %description This is the Hawaii desktop environment shell. It contains a Qt platform plugin @@ -50,17 +58,22 @@ 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 +%setup -q -n %{name} %patch1 -p1 +%patch2 -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} @@ -70,30 +83,29 @@ 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 +%{_bindir}/* +%{_libdir}/*.so.* +%{_libdir}/hawaii %{_libdir}/weston/hawaii-desktop.so -%{_libexecdir}/starthawaii -%{_libexecdir}/hawaii-desktop-shell -%dir %{_datadir}/hawaii -%dir %{_datadir}/hawaii/styles -%{_datadir}/hawaii/styles/Aluminium +%{_libexecdir}/* +%{_datadir}/hawaii %doc AUTHORS %doc COPYING %doc COPYING.LIB %doc README.md +%files devel +%{_libdir}/*.so +%{_libdir}/cmake/HF1HawaiiShell +%{_includedir}/HF1 + + %changelog +* Sun Feb 16 2014 Lubomir Rintel - 0.2.90-1.20140212gite338ecb +- A later GIT snapshot +- Fixed dependencies + * Sat Jan 04 2014 Lubomir Rintel - 0.2.0.2-1 - Update to new release tarball diff --git a/sources b/sources index a82c679..48c1f1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fe38f2145ab824b7d31f29a4611e2ca hawaii-shell-0.2.0.2.tar.gz +e78e5bfe35ab08e3a4ed52ddbf805a03 hawaii-shell.tar.gz