Compare commits

..

No commits in common. "rawhide" and "f42" have entirely different histories.

3 changed files with 11 additions and 19 deletions

3
.gitignore vendored
View file

@ -21,6 +21,3 @@
/wf-touch-caa1569.tar.gz
/wf-utils-08553c4.tar.gz
/wf-touch-b8b844f.tar.gz
/wayfire-0.10.1.tar.gz
/wf-touch-093d894.tar.gz
/wf-utils-3ef27d1.tar.gz

View file

@ -1,3 +1,3 @@
SHA512 (wayfire-0.10.1.tar.gz) = d28a442f005da63e1bd265a2c7cdbad6713bed0ae293de708cf9aeb466743c73882b2b7f434c044dc16d1f7048b2bafdb7f9a22ad736a7258601f2514ab0f5a4
SHA512 (wf-touch-093d894.tar.gz) = 4ceb0c454df6d2d2aa77a312b5dba11bb36cf753cb6e9abfc71bd517b68edf5ce8e7bea3f05067dfb8b8fcf61c064a6a8573082c936e997c948b304a3cc61273
SHA512 (wf-utils-3ef27d1.tar.gz) = da836b21c669a9638d370ca22ad2b605892998008ce9d13ea7c20ca8e1236252ee517af03f69af98ba06ae43b497c978d559787474b05b8f016f1e6737bacbad
SHA512 (wayfire-0.9.0.tar.gz) = 8c768642c7549aae13930c79df03e7d1ef3149e58e90c739d52540ded3e94659a18f0c6133b4a18881168069cd7ca31da8d91c435efba04697271c36314b7e81
SHA512 (wf-touch-b8b844f.tar.gz) = 00d3991acb3898aa37d98c4fa34bf04eb193cbb8c409daa18ba9ed9ff0eb88cbfad552c62d85560ee4b94b9e37dee81a8c3138c6238fa7506a179e775cd079f9
SHA512 (wf-utils-08553c4.tar.gz) = e55d6e9f9ba2981ee88776bf9fa047f1ed9e5701d5150cfd1c8ff39703e21ec50926ceea11685542f91a8262946b728ea6a0641ceb50faddbc9d1faafd25f005

View file

@ -2,15 +2,15 @@
# Git submodules
# * wf-utils
%global commit1 3ef27d1f76b5f3d1f34305bff12b3174e81727c2
%global commit1 08553c418f164bf5e84613d27447a32e380b75f0
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# * wf-touch
%global commit2 093d8943df03cc8a2667990a065513c1bf2b57e0
%global commit2 b8b844fa873871f90a9cf0768c8ae8c92ad49f34
%global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
Name: wayfire
Version: 0.10.1
Version: 0.9.0
%forgemeta
Release: %autorelease
Summary: A modular and extensible wayland compositor
@ -25,7 +25,7 @@ BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: inotify-tools-devel
BuildRequires: libevdev-devel
BuildRequires: meson >= 0.64.0
BuildRequires: meson >= 0.63.0
BuildRequires: cmake(doctest)
BuildRequires: cmake(glm)
@ -40,13 +40,12 @@ BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(nlohmann_json) >= 3.11.2
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pixman-1)
BuildRequires: pkgconfig(yyjson)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-protocols) >= 1.12
BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(wf-config) >= 0.10.0
BuildRequires: pkgconfig(wlroots-0.19)
BuildRequires: pkgconfig(wf-config) >= 0.9.0
BuildRequires: pkgconfig(wlroots) >= 0.17.0
BuildRequires: pkgconfig(xkbcommon)
Recommends: wayfire-config-manager
@ -57,9 +56,8 @@ Provides: bundled(wf-utils) = 0.0~git%{commit1}
%description
Wayfire is a 3D Wayland compositor, inspired by Compiz and based on wlroots.
It aims to create a customizable, extendable and lightweight environment without
sacrificing its appearance.
It aims to create a customizable, extendable and lightweight environment
without sacrificing its appearance.
%package devel
@ -82,7 +80,6 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/
%meson \
-Duse_system_wfconfig=enabled \
-Duse_system_wlroots=enabled \
-Dxwayland=enabled \
%{nil}
%meson_build
@ -101,7 +98,6 @@ rm -f %{buildroot}%{_prefix}/man/%{name}.1
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/wayland-sessions/*.desktop
%{_datadir}/xdg-desktop-portal/wayfire-portals.conf
%{_libdir}/%{name}/
%{_libdir}/lib%{name}-blur-base.so
%{_libdir}/libwf-utils.so.0*
@ -110,7 +106,6 @@ rm -f %{buildroot}%{_prefix}/man/%{name}.1
%files devel
%{_includedir}/%{name}/
%{_libdir}/lib%{name}-*.a
%{_libdir}/libwf-utils.so
%{_libdir}/pkgconfig/*.pc