diff --git a/.gitignore b/.gitignore index c08c5b7..69869f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,26 @@ /wayfire-0.2.20191001gitcec3540.tar.gz /wayfire-0.4.0.tar.gz +/wayfire-0.5.0.tar.gz +/wf-utils-f9b5eba.tar.gz +/wayfire-0.6.0.tar.gz +/wf-touch-b1075c5.tar.gz +/wf-utils-f45641b.tar.gz +/wayfire-0.7.0.tar.gz +/wayfire-0.7.1.tar.gz +/wf-touch-8974eb0.tar.gz +/wayfire-0.7.2.tar.gz +/wf-utils-889fdaf.tar.gz +/wayfire-0.7.3.tar.gz +/wayfire-0.7.4.tar.gz +/wayfire-0.7.5.tar.gz +/wf-utils-25ed62f.tar.gz +/wayfire-0.8.0.tar.gz +/wf-utils-15f8e16.tar.gz +/wayfire-0.8.1.tar.gz +/wayfire-0.9.0.tar.gz +/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 diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..69d384e --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,27 @@ +copy_upstream_release_description: false +# downstream_package_name: foo # not mandatory +# upstream_package_name: Foo # not mandatory +upstream_project_url: https://github.com/WayfireWM/wayfire +upstream_tag_template: v{version} + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + # - fedora-development + # - fedora-all + + - job: koji_build + trigger: commit + allowed_pr_authors: ["packit", "atim"] + allowed_committers: ["packit", "atim"] + dist_git_branches: + - fedora-all + # - epel-9 + + # - job: bodhi_update + # trigger: commit + # dist_git_branches: + # - fedora-branched + # # - epel-9 diff --git a/changelog b/changelog new file mode 100644 index 0000000..4d71a75 --- /dev/null +++ b/changelog @@ -0,0 +1,64 @@ +* Sat Jul 23 2022 Fedora Release Engineering - 0.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Apr 15 2022 Artem Polishchuk - 0.7.3-1 +- chore(update): 0.7.3 + +* Sat Jan 22 2022 Fedora Release Engineering - 0.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 03 2021 Artem Polishchuk - 0.7.2-1 +- build(update): 0.7.2 + +* Tue May 04 2021 Artem Polishchuk - 0.7.1-2 +- fix: Build with new glibc https://github.com/WayfireWM/wayfire/issues/1153 + +* Wed Apr 21 2021 Artem Polishchuk - 0.7.1-1 +- build(update): 0.7.1 + +* Tue Feb 23 2021 Artem Polishchuk - 0.7.0-2 +- build: Add 'wdisplays' weak dep + +* Fri Jan 29 2021 Artem Polishchuk - 0.7.0-1 +- build(update): 0.7.0 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 18 2020 Artem Polishchuk - 0.6.0-1 +- build(update): 0.6.0 + +* Tue Aug 04 2020 Artem Polishchuk - 0.5.0-1 +- Update to 0.5.0 + +* Sat Aug 01 2020 Aleksei Bavshin - 0.4.0-5 +- Add patch for wlroots 0.11.0 compatibility + +* Sat Aug 01 2020 Fedora Release Engineering - 0.4.0-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 28 2020 Artem Polishchuk - 0.4.0-2 +- Add very weak dep: 'lavalauncher' +- Disable LTO + +* Sun Mar 22 2020 Artem Polishchuk - 0.4.0-1 +- Update to 0.4.0 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.2-9.20191001gitcec3540 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 01 2019 Artem Polishchuk - 0.2-8.20191001gitcec3540 +- Update to latest git snapshot + +* Thu Sep 26 2019 Artem Polishchuk - 0.2-6.20190510git5b91b87 +- Unbundle 'wf-config' + +* Thu Sep 26 2019 Artem Polishchuk - 0.2-2.20190510git5b91b87 +- Initial package diff --git a/sources b/sources index bb513c3..a50ca7c 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (wayfire-0.4.0.tar.gz) = 726de2744d1c8f9dd8bba564a4fe93565db54a892fd03c278f53f94bb7824925ede986428b03316cbb556089781b35c928a442963bcbb85858efb247da4a36da +SHA512 (wayfire-0.10.1.tar.gz) = d28a442f005da63e1bd265a2c7cdbad6713bed0ae293de708cf9aeb466743c73882b2b7f434c044dc16d1f7048b2bafdb7f9a22ad736a7258601f2514ab0f5a4 +SHA512 (wf-touch-093d894.tar.gz) = 4ceb0c454df6d2d2aa77a312b5dba11bb36cf753cb6e9abfc71bd517b68edf5ce8e7bea3f05067dfb8b8fcf61c064a6a8573082c936e997c948b304a3cc61273 +SHA512 (wf-utils-3ef27d1.tar.gz) = da836b21c669a9638d370ca22ad2b605892998008ce9d13ea7c20ca8e1236252ee517af03f69af98ba06ae43b497c978d559787474b05b8f016f1e6737bacbad diff --git a/wayfire.spec b/wayfire.spec index 4ec4841..b9bbd0c 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,45 +1,65 @@ -# Enable LTO -%global optflags %{optflags} -flto -%global build_ldflags %{build_ldflags} -flto +%global forgeurl https://github.com/WayfireWM/wayfire + +# Git submodules +# * wf-utils +%global commit1 3ef27d1f76b5f3d1f34305bff12b3174e81727c2 +%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) + +# * wf-touch +%global commit2 093d8943df03cc8a2667990a065513c1bf2b57e0 +%global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.4.0 -Release: 1%{?dist} -Summary: 3D wayland compositor +Version: 0.10.1 +%forgemeta +Release: %autorelease +Summary: A modular and extensible wayland compositor License: MIT -URL: https://github.com/WayfireWM/wayfire -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +URL: https://wayfire.org +Source0: %{forgesource} +Source1: https://github.com/WayfireWM/wf-utils/archive/%{commit1}/wf-utils-%{shortcommit1}.tar.gz +Source2: https://github.com/WayfireWM/wf-touch/archive/%{commit2}/wf-touch-%{shortcommit2}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel -BuildRequires: meson >= 0.47.0 +BuildRequires: meson >= 0.64.0 + +BuildRequires: cmake(doctest) +BuildRequires: cmake(glm) + BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(glm) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libinput) >= 1.7.0 BuildRequires: pkgconfig(libjpeg) 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.4.0 -BuildRequires: pkgconfig(wlroots) >= 0.9.0 +BuildRequires: pkgconfig(wf-config) >= 0.10.0 +BuildRequires: pkgconfig(wlroots-0.19) BuildRequires: pkgconfig(xkbcommon) -Recommends: wayfire-config-manager%{?_isa} -Recommends: wf-shell%{?_isa} +Recommends: wayfire-config-manager +Recommends: wf-shell + +Provides: bundled(wf-touch) = 0.0~git%{commit2} +Provides: bundled(wf-utils) = 0.0~git%{commit1} %description -Wayfire is a wayland compositor based on wlroots. It aims to create a -customizable, extendable and lightweight environment without sacrificing its -appearance. +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. %package devel @@ -51,17 +71,28 @@ Development files for %{name}. %prep -%autosetup -p1 +%forgeautosetup -p1 +%autosetup -D -T -a1 +%autosetup -D -T -a2 +mv wf-utils-%{commit1}/* subprojects/wf-utils/ +mv wf-touch-%{commit2}/* subprojects/wf-touch/ %build -%meson +%meson \ + -Duse_system_wfconfig=enabled \ + -Duse_system_wlroots=enabled \ + -Dxwayland=enabled \ + %{nil} %meson_build %install %meson_install -install -Dp -m 0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop +install -D -p -m 0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop +rm -f %{buildroot}%{_libdir}/libwftouch.a +# Duplicate man file +rm -f %{buildroot}%{_prefix}/man/%{name}.1 %files @@ -70,25 +101,19 @@ install -Dp -m 0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{n %{_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* +%{_mandir}/man1/*.1* + %files devel -%{_libdir}/pkgconfig/*.pc %{_includedir}/%{name}/ +%{_libdir}/lib%{name}-*.a +%{_libdir}/libwf-utils.so +%{_libdir}/pkgconfig/*.pc %changelog -* Sun Mar 22 2020 Artem Polishchuk - 0.4.0-1 -- Update to 0.4.0 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.2-9.20191001gitcec3540 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Oct 01 2019 Artem Polishchuk - 0.2-8.20191001gitcec3540 -- Update to latest git snapshot - -* Thu Sep 26 2019 Artem Polishchuk - 0.2-6.20190510git5b91b87 -- Unbundle 'wf-config' - -* Thu Sep 26 2019 Artem Polishchuk - 0.2-2.20190510git5b91b87 -- Initial package +%autochangelog