From bfcb6e5c245f154b47ad21583a3743b3e37bf2af Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 18 Nov 2020 22:59:05 +0200 Subject: [PATCH 01/36] build(update): 0.6.0 --- .gitignore | 3 +++ sources | 5 +++-- wayfire.spec | 24 +++++++++++++++++++----- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7268c8e..3bb6a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ /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 diff --git a/sources b/sources index c4aa374..0b931fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (wayfire-0.5.0.tar.gz) = 0fafa839a71e613d0e04ad033a86ef90aa20a2616bd19dd59be9d1d312506c1c63c53b330180853f0b19dffd057f2c1b7ffd8389eaf6338805f9f5aa2631e19b -SHA512 (wf-utils-f9b5eba.tar.gz) = 9331e295140b91878a94203e68e26821b27247f9849c94e7f7afb0549e794ecc178299b252c67a96caac53a92643337b074bb38a0af9974f0f4bfd2a9baed68e +SHA512 (wayfire-0.6.0.tar.gz) = 44f94446a1458f71696e01564c7b01062ddc891174804014f147348baf803292ceaed950c798e29d1bf8d1279833c548e4d9e627502f037ecae0b1ac7d150570 +SHA512 (wf-touch-b1075c5.tar.gz) = d3cc7ea569423dda42c551196528b477daffa315b2369aa484a9005c8f0693065385677b205b774d6c69980dc20a127c951d164422becfb62ab01443c0c07c6f +SHA512 (wf-utils-f45641b.tar.gz) = ad5becf351e7f1f7274f2ff4a0370cb0daf04d38a3ab8ea110d1713e0a2935451c666d88fe8c3a4174adf064a58e6fba49031a717d76207a48f4a61ddb401d5c diff --git a/wayfire.spec b/wayfire.spec index d7af2f9..baa03ef 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,10 +1,14 @@ # Git submodules # * wf-utils -%global commit1 f9b5eba437a04a0d1fb9f00a0fdb88c12b9f6b27 +%global commit1 f45641beef46babdc8f1b8d18a924e72beaf8ee6 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +# * wf-touch +%global commit2 b1075c54a280f913edc26b9757262f4f9d6b62b0 +%global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) + Name: wayfire -Version: 0.5.0 +Version: 0.6.0 Release: 1%{?dist} Summary: 3D wayland compositor @@ -12,6 +16,7 @@ License: MIT URL: https://github.com/WayfireWM/wayfire Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz 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++ @@ -31,8 +36,8 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wf-config) >= 0.5.0 -BuildRequires: pkgconfig(wlroots) >= 0.11.0 +BuildRequires: pkgconfig(wf-config) >= 0.6.0 +BuildRequires: pkgconfig(wlroots) >= 0.12.0 BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager%{?_isa} @@ -40,6 +45,9 @@ Recommends: wf-shell%{?_isa} Suggests: lavalauncher%{?_isa} +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 @@ -57,7 +65,9 @@ Development files for %{name}. %prep %autosetup -p1 %autosetup -D -T -a1 +%autosetup -D -T -a2 mv wf-utils-%{commit1}/* subprojects/wf-utils/ +mv wf-touch-%{commit2}/* subprojects/wf-touch/ %build @@ -69,7 +79,8 @@ mv wf-utils-%{commit1}/* subprojects/wf-utils/ %install %meson_install -install -Dp -m0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop +install -Dpm0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop +rm -f %{buildroot}%{_libdir}/libwftouch.a %files @@ -88,6 +99,9 @@ install -Dp -m0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{na %changelog +* 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 From fd2b88d33b7317ef28ef6b0aff94369e72f0d3d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:20:50 +0000 Subject: [PATCH 02/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index baa03ef..d43aa48 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -9,7 +9,7 @@ Name: wayfire Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D wayland compositor License: MIT @@ -99,6 +99,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From 33619c0e3365a3115b037682a0037b737976a3e4 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Fri, 29 Jan 2021 23:39:19 +0200 Subject: [PATCH 03/36] build(update): 0.7.0 --- .gitignore | 1 + sources | 2 +- wayfire.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3bb6a4d..ec56e1f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /wayfire-0.6.0.tar.gz /wf-touch-b1075c5.tar.gz /wf-utils-f45641b.tar.gz +/wayfire-0.7.0.tar.gz diff --git a/sources b/sources index 0b931fe..b15c5bc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.6.0.tar.gz) = 44f94446a1458f71696e01564c7b01062ddc891174804014f147348baf803292ceaed950c798e29d1bf8d1279833c548e4d9e627502f037ecae0b1ac7d150570 +SHA512 (wayfire-0.7.0.tar.gz) = 9a3bd123d2fd21828eb18e95e5ce7c072185ea5784167210c1c73b928a8d41b4c18375d4d95f23454c4d9ff54c4d10a9222f026706f8e4e119353073c0e42317 SHA512 (wf-touch-b1075c5.tar.gz) = d3cc7ea569423dda42c551196528b477daffa315b2369aa484a9005c8f0693065385677b205b774d6c69980dc20a127c951d164422becfb62ab01443c0c07c6f SHA512 (wf-utils-f45641b.tar.gz) = ad5becf351e7f1f7274f2ff4a0370cb0daf04d38a3ab8ea110d1713e0a2935451c666d88fe8c3a4174adf064a58e6fba49031a717d76207a48f4a61ddb401d5c diff --git a/wayfire.spec b/wayfire.spec index d43aa48..54a01fb 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -8,13 +8,13 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.6.0 -Release: 2%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: 3D wayland compositor License: MIT URL: https://github.com/WayfireWM/wayfire -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz 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 @@ -22,7 +22,7 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel -BuildRequires: meson >= 0.50.0 +BuildRequires: meson >= 0.53.0 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) @@ -99,6 +99,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From fb07e5d7715b360fa463d8233b353b7d5f8a1fe3 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 23 Feb 2021 04:51:40 +0200 Subject: [PATCH 04/36] build: Add 'wdisplays' weak dep --- wayfire.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index 54a01fb..5a6bd3f 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -9,7 +9,7 @@ Name: wayfire Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D wayland compositor License: MIT @@ -41,6 +41,7 @@ BuildRequires: pkgconfig(wlroots) >= 0.12.0 BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager%{?_isa} +Recommends: wdisplays%{?_isa} Recommends: wf-shell%{?_isa} Suggests: lavalauncher%{?_isa} @@ -99,6 +100,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From f8ffad3ab92318590d242c012528f41784539b57 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 23 Feb 2021 05:20:45 +0200 Subject: [PATCH 05/36] build: Switch to BR: glm-devel instead of pkgconfig pkgconfig support is no longer supported in upstream and not shipped --- wayfire.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wayfire.spec b/wayfire.spec index 5a6bd3f..7fea595 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -20,6 +20,7 @@ Source2: https://github.com/WayfireWM/wf-touch/archive/%{commit2}/wf-touc BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: glm-devel BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel BuildRequires: meson >= 0.53.0 From 505010ae2ad6098c6430b57b67fe0dd27a146984 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 23 Feb 2021 05:33:00 +0200 Subject: [PATCH 06/36] fix: Quick fix previous commit --- wayfire.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index 7fea595..c79d9b0 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -27,7 +27,6 @@ BuildRequires: meson >= 0.53.0 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(glm) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libinput) >= 1.7.0 BuildRequires: pkgconfig(libjpeg) From ed3064761842581a47dba137c24c6160b1fd87c0 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 23 Feb 2021 19:32:14 +0200 Subject: [PATCH 07/36] build: Switch to BR: cmake(glm) instead of glm-devel https://github.com/WayfireWM/wf-config/issues/39 --- wayfire.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index c79d9b0..13e3790 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -20,10 +20,11 @@ Source2: https://github.com/WayfireWM/wf-touch/archive/%{commit2}/wf-touc BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: glm-devel BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel BuildRequires: meson >= 0.53.0 +BuildRequires: cmake +BuildRequires: cmake(glm) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) From 81a5967044c9cc192917b7c642d8b01cc8a9d320 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 21 Apr 2021 20:40:34 +0300 Subject: [PATCH 08/36] build(update): 0.7.1 --- .gitignore | 1 + sources | 2 +- wayfire.spec | 22 +++++++++++++--------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ec56e1f..c301c56 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /wf-touch-b1075c5.tar.gz /wf-utils-f45641b.tar.gz /wayfire-0.7.0.tar.gz +/wayfire-0.7.1.tar.gz diff --git a/sources b/sources index b15c5bc..31b8e89 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.0.tar.gz) = 9a3bd123d2fd21828eb18e95e5ce7c072185ea5784167210c1c73b928a8d41b4c18375d4d95f23454c4d9ff54c4d10a9222f026706f8e4e119353073c0e42317 +SHA512 (wayfire-0.7.1.tar.gz) = 989b4d0caeaca8452c5d1cd458898cd8bde1b08c94d92c843b18aaf3c0febfa7da9b14513e94eeee96ee12c30b540ef220dd8cfe018ff72c336abb2e9fdd3f68 SHA512 (wf-touch-b1075c5.tar.gz) = d3cc7ea569423dda42c551196528b477daffa315b2369aa484a9005c8f0693065385677b205b774d6c69980dc20a127c951d164422becfb62ab01443c0c07c6f SHA512 (wf-utils-f45641b.tar.gz) = ad5becf351e7f1f7274f2ff4a0370cb0daf04d38a3ab8ea110d1713e0a2935451c666d88fe8c3a4174adf064a58e6fba49031a717d76207a48f4a61ddb401d5c diff --git a/wayfire.spec b/wayfire.spec index 13e3790..7fad516 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,15 +1,17 @@ +%bcond_without test + # Git submodules -# * wf-utils +# * wf-utils %global commit1 f45641beef46babdc8f1b8d18a924e72beaf8ee6 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -# * wf-touch +# * wf-touch %global commit2 b1075c54a280f913edc26b9757262f4f9d6b62b0 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.7.0 -Release: 2%{?dist} +Version: 0.7.1 +Release: 1%{?dist} Summary: 3D wayland compositor License: MIT @@ -24,7 +26,9 @@ BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel BuildRequires: meson >= 0.53.0 BuildRequires: cmake + BuildRequires: cmake(glm) + BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) @@ -37,16 +41,13 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wf-config) >= 0.6.0 -BuildRequires: pkgconfig(wlroots) >= 0.12.0 +BuildRequires: pkgconfig(wf-config) >= 0.7.0 +BuildRequires: pkgconfig(wlroots) >= 0.13.0 BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager%{?_isa} -Recommends: wdisplays%{?_isa} Recommends: wf-shell%{?_isa} -Suggests: lavalauncher%{?_isa} - Provides: bundled(wf-touch) = 0.0~git%{commit2} Provides: bundled(wf-utils) = 0.0~git%{commit1} @@ -101,6 +102,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From 142baa5a456a3be3259435b9da2afff039d3cb43 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 27 Apr 2021 09:01:24 +0300 Subject: [PATCH 09/36] build: Remove BR: cmake (listed twice) --- wayfire.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index 7fad516..0405c50 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -25,7 +25,6 @@ BuildRequires: gcc-c++ BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel BuildRequires: meson >= 0.53.0 -BuildRequires: cmake BuildRequires: cmake(glm) From 513ff0990bbce9aa3993f35c6482c30b1bb789dc Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 4 May 2021 14:04:38 +0300 Subject: [PATCH 10/36] fix: Build with new glibc https://github.com/WayfireWM/wayfire/issues/1153 --- .gitignore | 1 + sources | 4 ++-- wayfire.spec | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c301c56..b61c0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /wf-utils-f45641b.tar.gz /wayfire-0.7.0.tar.gz /wayfire-0.7.1.tar.gz +/wf-touch-8974eb0.tar.gz diff --git a/sources b/sources index 31b8e89..e36edd7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.1.tar.gz) = 989b4d0caeaca8452c5d1cd458898cd8bde1b08c94d92c843b18aaf3c0febfa7da9b14513e94eeee96ee12c30b540ef220dd8cfe018ff72c336abb2e9fdd3f68 -SHA512 (wf-touch-b1075c5.tar.gz) = d3cc7ea569423dda42c551196528b477daffa315b2369aa484a9005c8f0693065385677b205b774d6c69980dc20a127c951d164422becfb62ab01443c0c07c6f +SHA512 (wayfire-0.7.1.tar.gz) = c9a3f99c4f2093fcb01c4d698ad17a97b6ad072a62e06cc1359b4d2af04d244ab2b50488d044e317e7bed8cda3b386428cbcdaad52b272a64b71a4b6f4684963 +SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 SHA512 (wf-utils-f45641b.tar.gz) = ad5becf351e7f1f7274f2ff4a0370cb0daf04d38a3ab8ea110d1713e0a2935451c666d88fe8c3a4174adf064a58e6fba49031a717d76207a48f4a61ddb401d5c diff --git a/wayfire.spec b/wayfire.spec index 0405c50..c222e02 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -6,12 +6,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch -%global commit2 b1075c54a280f913edc26b9757262f4f9d6b62b0 +%global commit2 8974eb0f6a65464b63dd03b842795cb441fb6403 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D wayland compositor License: MIT @@ -27,6 +27,9 @@ BuildRequires: libevdev-devel BuildRequires: meson >= 0.53.0 BuildRequires: cmake(glm) +%if %{with test} +BuildRequires: cmake(doctest) +%endif BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) @@ -75,7 +78,13 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/ %build %meson \ -Duse_system_wfconfig=enabled \ - -Duse_system_wlroots=enabled + -Duse_system_wlroots=enabled \ + %if %{with test} + -Dtests=enabled \ + %else + -Dtests=disabled \ + %endif + %{nil} %meson_build @@ -101,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From 03a23c4d7a3d5d567e741475112c7668d1b34442 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 3 Jul 2021 22:17:00 +0300 Subject: [PATCH 11/36] build(update): 0.7.2 --- .gitignore | 2 ++ sources | 4 ++-- wayfire.spec | 15 +++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b61c0ce..86779bf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /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 diff --git a/sources b/sources index e36edd7..0e73029 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.1.tar.gz) = c9a3f99c4f2093fcb01c4d698ad17a97b6ad072a62e06cc1359b4d2af04d244ab2b50488d044e317e7bed8cda3b386428cbcdaad52b272a64b71a4b6f4684963 +SHA512 (wayfire-0.7.2.tar.gz) = 5347505e603a1a00ecbf66e2a1ce5c086f547c1a1979d86fc30d417b9cadaab1c853dd109ae85a3d9a3a5865d4af6f7fa317691b22faaed2f3fe2d0d4bb2136d SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 -SHA512 (wf-utils-f45641b.tar.gz) = ad5becf351e7f1f7274f2ff4a0370cb0daf04d38a3ab8ea110d1713e0a2935451c666d88fe8c3a4174adf064a58e6fba49031a717d76207a48f4a61ddb401d5c +SHA512 (wf-utils-889fdaf.tar.gz) = 355694a5a0e7f05918e2e1532787f0dfee2f799f916fce9a8c8f208c1c8fbee7fd3016b79331133a062c51d0eedbd0378e88262480199465df0b4f66419b635b diff --git a/wayfire.spec b/wayfire.spec index c222e02..e2f7f15 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -2,7 +2,7 @@ # Git submodules # * wf-utils -%global commit1 f45641beef46babdc8f1b8d18a924e72beaf8ee6 +%global commit1 889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch @@ -10,8 +10,8 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.7.1 -Release: 2%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: 3D wayland compositor License: MIT @@ -44,11 +44,11 @@ BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wf-config) >= 0.7.0 -BuildRequires: pkgconfig(wlroots) >= 0.13.0 +BuildRequires: pkgconfig(wlroots) >= 0.14.0 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} @@ -110,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From bf551411fffe48a784cc2b1fe99ee3961c61b240 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:47:08 +0000 Subject: [PATCH 12/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index e2f7f15..4b83130 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -11,7 +11,7 @@ Name: wayfire Version: 0.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D wayland compositor License: MIT @@ -110,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From 51a5c61943174342d7c7d084192a45940feca83b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:17:57 +0000 Subject: [PATCH 13/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index 4b83130..ae2570e 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -11,7 +11,7 @@ Name: wayfire Version: 0.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D wayland compositor License: MIT @@ -110,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From 0f18438946a44408dfa5ba54db9bb37100f33944 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Fri, 15 Apr 2022 23:45:24 +0300 Subject: [PATCH 14/36] chore(update): 0.7.3 --- .gitignore | 1 + sources | 2 +- wayfire.spec | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 86779bf..7421892 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /wf-touch-8974eb0.tar.gz /wayfire-0.7.2.tar.gz /wf-utils-889fdaf.tar.gz +/wayfire-0.7.3.tar.gz diff --git a/sources b/sources index 0e73029..afcbe96 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.2.tar.gz) = 5347505e603a1a00ecbf66e2a1ce5c086f547c1a1979d86fc30d417b9cadaab1c853dd109ae85a3d9a3a5865d4af6f7fa317691b22faaed2f3fe2d0d4bb2136d +SHA512 (wayfire-0.7.3.tar.gz) = b14025a99aaf51d32370dd2b5156f2512537a13de927f90fba59b8ac9cc4417d60c6ead75f15b7b91312aa51382caa4240ce2991fd5f1bf00574050ccf3f99e6 SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 SHA512 (wf-utils-889fdaf.tar.gz) = 355694a5a0e7f05918e2e1532787f0dfee2f799f916fce9a8c8f208c1c8fbee7fd3016b79331133a062c51d0eedbd0378e88262480199465df0b4f66419b635b diff --git a/wayfire.spec b/wayfire.spec index ae2570e..9b489a3 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,5 +1,3 @@ -%bcond_without test - # Git submodules # * wf-utils %global commit1 889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac @@ -10,8 +8,8 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.7.2 -Release: 3%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: 3D wayland compositor License: MIT @@ -26,10 +24,8 @@ BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel BuildRequires: meson >= 0.53.0 -BuildRequires: cmake(glm) -%if %{with test} BuildRequires: cmake(doctest) -%endif +BuildRequires: cmake(glm) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) @@ -38,13 +34,14 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libinput) >= 1.7.0 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wf-config) >= 0.7.0 -BuildRequires: pkgconfig(wlroots) >= 0.14.0 +BuildRequires: pkgconfig(wlroots) >= 0.15.0 BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager @@ -76,14 +73,9 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/ %build -%meson \ +%meson \ -Duse_system_wfconfig=enabled \ - -Duse_system_wlroots=enabled \ - %if %{with test} - -Dtests=enabled \ - %else - -Dtests=disabled \ - %endif + -Duse_system_wlroots=enabled \ %{nil} %meson_build @@ -110,6 +102,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From 06b76f6b5826088f10e171bcdea717b21fdbe5b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:14:14 +0000 Subject: [PATCH 15/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index 9b489a3..bdf00a2 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -9,7 +9,7 @@ Name: wayfire Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D wayland compositor License: MIT @@ -102,6 +102,9 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog +* 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 From bd84f4159c1e3bfda73297eb57f8fd8506309b5c Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 1 Aug 2022 14:26:54 +0300 Subject: [PATCH 16/36] Convert to rpmautospec --- changelog | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ wayfire.spec | 67 ++-------------------------------------------------- 2 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 changelog 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/wayfire.spec b/wayfire.spec index bdf00a2..87d2869 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -9,7 +9,7 @@ Name: wayfire Version: 0.7.3 -Release: 2%{?dist} +Release: %autorelease Summary: 3D wayland compositor License: MIT @@ -102,67 +102,4 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %changelog -* 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 +%autochangelog From f5dc34dfa9c0c642d7e97117211e19d528f3557f Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 2 Aug 2022 05:36:16 +0300 Subject: [PATCH 17/36] chore(update): 0.7.4 --- .gitignore | 1 + sources | 2 +- wayfire.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7421892..3c8da67 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /wayfire-0.7.2.tar.gz /wf-utils-889fdaf.tar.gz /wayfire-0.7.3.tar.gz +/wayfire-0.7.4.tar.gz diff --git a/sources b/sources index afcbe96..6027b7d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.3.tar.gz) = b14025a99aaf51d32370dd2b5156f2512537a13de927f90fba59b8ac9cc4417d60c6ead75f15b7b91312aa51382caa4240ce2991fd5f1bf00574050ccf3f99e6 +SHA512 (wayfire-0.7.4.tar.gz) = 9e82cb55cdcd34aa355da1e796ca69374d0c1ea11b50397f2119506d755e87b6b120fcec415fba57af66adc89ed62302ef645e91946926764923fd56d1c363aa SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 SHA512 (wf-utils-889fdaf.tar.gz) = 355694a5a0e7f05918e2e1532787f0dfee2f799f916fce9a8c8f208c1c8fbee7fd3016b79331133a062c51d0eedbd0378e88262480199465df0b4f66419b635b diff --git a/wayfire.spec b/wayfire.spec index 87d2869..20331bf 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -8,7 +8,7 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.7.3 +Version: 0.7.4 Release: %autorelease Summary: 3D wayland compositor From bfbf7ad124e6f08bb2882028be66ccddc5772bcc Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sun, 4 Dec 2022 06:11:10 +0200 Subject: [PATCH 18/36] build: Update to 0.7.5 --- .gitignore | 2 ++ sources | 4 ++-- wayfire.spec | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3c8da67..ad341ae 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /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 diff --git a/sources b/sources index 6027b7d..345d55d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.4.tar.gz) = 9e82cb55cdcd34aa355da1e796ca69374d0c1ea11b50397f2119506d755e87b6b120fcec415fba57af66adc89ed62302ef645e91946926764923fd56d1c363aa +SHA512 (wayfire-0.7.5.tar.gz) = fc0266d4c82e1f19f72adb4264c5333e66b78f3c4b013ee36518cb4dba2079ca976a9b49513cc00382af64b56cec793bb2d35c6e95931ec22d3600a38e643cea SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 -SHA512 (wf-utils-889fdaf.tar.gz) = 355694a5a0e7f05918e2e1532787f0dfee2f799f916fce9a8c8f208c1c8fbee7fd3016b79331133a062c51d0eedbd0378e88262480199465df0b4f66419b635b +SHA512 (wf-utils-25ed62f.tar.gz) = 97cc8e37f7eeb8b677174e9fde4e35cd8d9e5d9301f3a2c55d47217448a993b6bec002f48f078b2f9f4cf95187ae2084dd1372e292d39915cf22f7e445f865a5 diff --git a/wayfire.spec b/wayfire.spec index 20331bf..b3c04fd 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,6 +1,6 @@ # Git submodules # * wf-utils -%global commit1 889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac +%global commit1 25ed62f35c0b7810beee2009c6a419847f8f89fe %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch @@ -8,7 +8,7 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.7.4 +Version: 0.7.5 Release: %autorelease Summary: 3D wayland compositor @@ -41,7 +41,7 @@ BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wf-config) >= 0.7.0 -BuildRequires: pkgconfig(wlroots) >= 0.15.0 +BuildRequires: pkgconfig(wlroots) >= 0.16.0 BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager From 38fc48768fdc537d06d9c77eed6e2a2beb12db82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:38:14 +0000 Subject: [PATCH 19/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1815b30be46e4a9bb8b3d099a0324078012b33f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:00:25 +0000 Subject: [PATCH 20/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From aa6abb74eeccf579b7d3fac5936d583d77312065 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 7 Oct 2023 16:40:47 +0300 Subject: [PATCH 21/36] build: Use forge macros --- wayfire.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wayfire.spec b/wayfire.spec index b3c04fd..bd26a99 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,3 +1,5 @@ +%global forgeurl https://github.com/WayfireWM/%{name} + # Git submodules # * wf-utils %global commit1 25ed62f35c0b7810beee2009c6a419847f8f89fe @@ -12,9 +14,11 @@ Version: 0.7.5 Release: %autorelease Summary: 3D wayland compositor +%forgemeta + License: MIT -URL: https://github.com/WayfireWM/wayfire -Source0: %{url}/archive/v%{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 @@ -65,7 +69,7 @@ Development files for %{name}. %prep -%autosetup -p1 +%forgeautosetup -p1 %autosetup -D -T -a1 %autosetup -D -T -a2 mv wf-utils-%{commit1}/* subprojects/wf-utils/ From cfcc35fb8c75f6b1d2a4e70ad4d69c6d6279a2ea Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 7 Oct 2023 16:42:23 +0300 Subject: [PATCH 22/36] build: Add Packit config --- .packit.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..0f7ab78 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,18 @@ +upstream_package_name: wayfire +downstream_package_name: wayfire + +copy_upstream_release_description: false + +jobs: + +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + allowed_pr_authors: ["atim"] + allowed_committers: ["atim"] + dist_git_branches: + - fedora-all From 259e6834e2e5eab83a0d5726c2cf983e8d038c5b Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 7 Oct 2023 19:13:30 +0300 Subject: [PATCH 23/36] build: Update to 0.8.0 --- .gitignore | 2 ++ sources | 4 ++-- wayfire.spec | 26 ++++++++++++++++---------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ad341ae..306d4b6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /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 diff --git a/sources b/sources index 345d55d..a8bb1d0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.7.5.tar.gz) = fc0266d4c82e1f19f72adb4264c5333e66b78f3c4b013ee36518cb4dba2079ca976a9b49513cc00382af64b56cec793bb2d35c6e95931ec22d3600a38e643cea +SHA512 (wayfire-0.8.0.tar.gz) = 7dd9066ea7e776e40093d71f039893a96e85d36c23da3790fb185baca9d4cd5d07df96fda07fcf95ecc1cc14f7ccf111499dd0515f7f4db6c7eb1467290eaa17 SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 -SHA512 (wf-utils-25ed62f.tar.gz) = 97cc8e37f7eeb8b677174e9fde4e35cd8d9e5d9301f3a2c55d47217448a993b6bec002f48f078b2f9f4cf95187ae2084dd1372e292d39915cf22f7e445f865a5 +SHA512 (wf-utils-15f8e16.tar.gz) = fa81d6f7c654cceb73e201eba49d3b7232017dc41f7ded5d62cb4f749a35dbb02b4f3eab90db78750fa5520c487391525af19b49eca45300e440a76b3561adf3 diff --git a/wayfire.spec b/wayfire.spec index bd26a99..7357a00 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -2,7 +2,7 @@ # Git submodules # * wf-utils -%global commit1 25ed62f35c0b7810beee2009c6a419847f8f89fe +%global commit1 15f8e16721585ae3eaf278ba71d7064237eb23f5 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch @@ -10,9 +10,9 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.7.5 +Version: 0.8.0 Release: %autorelease -Summary: 3D wayland compositor +Summary: A modular and extensible wayland compositor %forgemeta @@ -26,7 +26,7 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: inotify-tools-devel BuildRequires: libevdev-devel -BuildRequires: meson >= 0.53.0 +BuildRequires: meson >= 0.56.0 BuildRequires: cmake(doctest) BuildRequires: cmake(glm) @@ -38,13 +38,14 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libinput) >= 1.7.0 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(nlohmann_json) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wf-config) >= 0.7.0 +BuildRequires: pkgconfig(wf-config) >= 0.8.0 BuildRequires: pkgconfig(wlroots) >= 0.16.0 BuildRequires: pkgconfig(xkbcommon) @@ -55,9 +56,9 @@ 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 @@ -86,8 +87,10 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/ %install %meson_install -install -Dpm0644 %{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 @@ -98,11 +101,14 @@ rm -f %{buildroot}%{_libdir}/libwftouch.a %{_datadir}/wayland-sessions/*.desktop %{_libdir}/%{name}/ %{_libdir}/libwf-utils.so.0* +%{_mandir}/man1/*.1* + %files devel +%{_includedir}/%{name}/ +%{_libdir}/lib%{name}-blur-base.so %{_libdir}/libwf-utils.so %{_libdir}/pkgconfig/*.pc -%{_includedir}/%{name}/ %changelog From 7ba35d04327b9bd8354f8a9a986715c38782385a Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 7 Oct 2023 20:48:39 +0300 Subject: [PATCH 24/36] build: lib%{name}-blur-base.so into main package --- wayfire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index 7357a00..73a9077 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -100,13 +100,13 @@ rm -f %{buildroot}%{_prefix}/man/%{name}.1 %{_datadir}/%{name}/ %{_datadir}/wayland-sessions/*.desktop %{_libdir}/%{name}/ +%{_libdir}/lib%{name}-blur-base.so %{_libdir}/libwf-utils.so.0* %{_mandir}/man1/*.1* %files devel %{_includedir}/%{name}/ -%{_libdir}/lib%{name}-blur-base.so %{_libdir}/libwf-utils.so %{_libdir}/pkgconfig/*.pc From 2587681c205f8606740635613d58cfc70c410039 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sun, 8 Oct 2023 23:29:58 +0300 Subject: [PATCH 25/36] packit: Add upstream_tag_template: v{version} --- .packit.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index 0f7ab78..93df524 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,5 +1,6 @@ -upstream_package_name: wayfire downstream_package_name: wayfire +upstream_package_name: wayfire +upstream_tag_template: v{version} copy_upstream_release_description: false From fdef7a373ed0c8c3523f52594b070bb91c316498 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:26:17 +0000 Subject: [PATCH 26/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 24293b403a34557f8b073a1f20b7ef9a2bdaaa8e Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 16 Mar 2024 14:43:11 +0300 Subject: [PATCH 27/36] packit: Update config --- .packit.yaml | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 93df524..69d384e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,19 +1,27 @@ -downstream_package_name: wayfire -upstream_package_name: wayfire +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} -copy_upstream_release_description: false - jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + # - fedora-development + # - fedora-all -- job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide + - job: koji_build + trigger: commit + allowed_pr_authors: ["packit", "atim"] + allowed_committers: ["packit", "atim"] + dist_git_branches: + - fedora-all + # - epel-9 -- job: koji_build - trigger: commit - allowed_pr_authors: ["atim"] - allowed_committers: ["atim"] - dist_git_branches: - - fedora-all + # - job: bodhi_update + # trigger: commit + # dist_git_branches: + # - fedora-branched + # # - epel-9 From dde7528dcba3cfc7e29f13af5f8ae07a455f8c4b Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 16 Mar 2024 14:50:14 +0300 Subject: [PATCH 28/36] chore: Update to 0.8.1 (rh#2269552) --- .gitignore | 1 + sources | 2 +- wayfire.spec | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 306d4b6..f34ce12 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /wf-utils-25ed62f.tar.gz /wayfire-0.8.0.tar.gz /wf-utils-15f8e16.tar.gz +/wayfire-0.8.1.tar.gz diff --git a/sources b/sources index a8bb1d0..2c6db55 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.8.0.tar.gz) = 7dd9066ea7e776e40093d71f039893a96e85d36c23da3790fb185baca9d4cd5d07df96fda07fcf95ecc1cc14f7ccf111499dd0515f7f4db6c7eb1467290eaa17 +SHA512 (wayfire-0.8.1.tar.gz) = e1f7e156783322e35297964136e9060d22a754b1d5e85711b1bcf576733e53f41a2bfb06204eee49186e700e6f38d7c1a7db798eca9c37a180dc45b08f753960 SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 SHA512 (wf-utils-15f8e16.tar.gz) = fa81d6f7c654cceb73e201eba49d3b7232017dc41f7ded5d62cb4f749a35dbb02b4f3eab90db78750fa5520c487391525af19b49eca45300e440a76b3561adf3 diff --git a/wayfire.spec b/wayfire.spec index 73a9077..c62d056 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -10,12 +10,11 @@ %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.8.0 +Version: 0.8.1 +%forgemeta Release: %autorelease Summary: A modular and extensible wayland compositor -%forgemeta - License: MIT URL: https://wayfire.org Source0: %{forgesource} From fc0914c75e76b3d3ceb4c2345ed3871a8c81ec7b Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 16 Mar 2024 16:14:12 +0300 Subject: [PATCH 29/36] build: Bump wlroots req ver --- wayfire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wayfire.spec b/wayfire.spec index c62d056..30e45a5 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -45,7 +45,7 @@ BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wf-config) >= 0.8.0 -BuildRequires: pkgconfig(wlroots) >= 0.16.0 +BuildRequires: pkgconfig(wlroots) >= 0.17.0 BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager From e3581ae46b9169856fedabed3faa29914088ea9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:09:31 +0000 Subject: [PATCH 30/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5f9ae386a4a0aa7f9de343b48deada78dc2269f6 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 7 Oct 2024 16:09:29 +0300 Subject: [PATCH 31/36] chore: Update to 0.9.0 Signed-off-by: Artem Polishchuk --- .gitignore | 3 +++ sources | 6 +++--- wayfire.spec | 14 +++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index f34ce12..74bb649 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ /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 diff --git a/sources b/sources index 2c6db55..c15b650 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.8.1.tar.gz) = e1f7e156783322e35297964136e9060d22a754b1d5e85711b1bcf576733e53f41a2bfb06204eee49186e700e6f38d7c1a7db798eca9c37a180dc45b08f753960 -SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500 -SHA512 (wf-utils-15f8e16.tar.gz) = fa81d6f7c654cceb73e201eba49d3b7232017dc41f7ded5d62cb4f749a35dbb02b4f3eab90db78750fa5520c487391525af19b49eca45300e440a76b3561adf3 +SHA512 (wayfire-0.9.0.tar.gz) = 8c768642c7549aae13930c79df03e7d1ef3149e58e90c739d52540ded3e94659a18f0c6133b4a18881168069cd7ca31da8d91c435efba04697271c36314b7e81 +SHA512 (wf-touch-caa1569.tar.gz) = 2f60a4f20832351b946f814fa0e6dd3c3875b413572c286a1bf5e8b7361ca839529b1f77dd59612c16357d9267cdd8fed0ac8634b6f346a5dc98e426f3b5dbc5 +SHA512 (wf-utils-08553c4.tar.gz) = e55d6e9f9ba2981ee88776bf9fa047f1ed9e5701d5150cfd1c8ff39703e21ec50926ceea11685542f91a8262946b728ea6a0641ceb50faddbc9d1faafd25f005 diff --git a/wayfire.spec b/wayfire.spec index 30e45a5..967beb0 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -1,16 +1,16 @@ -%global forgeurl https://github.com/WayfireWM/%{name} +%global forgeurl https://github.com/WayfireWM/wayfire # Git submodules # * wf-utils -%global commit1 15f8e16721585ae3eaf278ba71d7064237eb23f5 +%global commit1 08553c418f164bf5e84613d27447a32e380b75f0 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch -%global commit2 8974eb0f6a65464b63dd03b842795cb441fb6403 +%global commit2 caa156921c6be1dff9c2ccd851330c96de7928bf %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.8.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.56.0 +BuildRequires: meson >= 0.63.0 BuildRequires: cmake(doctest) BuildRequires: cmake(glm) @@ -37,14 +37,14 @@ BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libinput) >= 1.7.0 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(nlohmann_json) +BuildRequires: pkgconfig(nlohmann_json) >= 3.11.2 BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wf-config) >= 0.8.0 +BuildRequires: pkgconfig(wf-config) >= 0.9.0 BuildRequires: pkgconfig(wlroots) >= 0.17.0 BuildRequires: pkgconfig(xkbcommon) From 127db1a9439a4f0763adb6f4186512fdf5ce3e54 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 7 Oct 2024 17:46:15 +0300 Subject: [PATCH 32/36] build: Update wf-touch submodule Signed-off-by: Artem Polishchuk --- .gitignore | 1 + sources | 2 +- wayfire.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 74bb649..2b14dbb 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /wayfire-0.9.0.tar.gz /wf-touch-caa1569.tar.gz /wf-utils-08553c4.tar.gz +/wf-touch-b8b844f.tar.gz diff --git a/sources b/sources index c15b650..7a01f97 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (wayfire-0.9.0.tar.gz) = 8c768642c7549aae13930c79df03e7d1ef3149e58e90c739d52540ded3e94659a18f0c6133b4a18881168069cd7ca31da8d91c435efba04697271c36314b7e81 -SHA512 (wf-touch-caa1569.tar.gz) = 2f60a4f20832351b946f814fa0e6dd3c3875b413572c286a1bf5e8b7361ca839529b1f77dd59612c16357d9267cdd8fed0ac8634b6f346a5dc98e426f3b5dbc5 +SHA512 (wf-touch-b8b844f.tar.gz) = 00d3991acb3898aa37d98c4fa34bf04eb193cbb8c409daa18ba9ed9ff0eb88cbfad552c62d85560ee4b94b9e37dee81a8c3138c6238fa7506a179e775cd079f9 SHA512 (wf-utils-08553c4.tar.gz) = e55d6e9f9ba2981ee88776bf9fa047f1ed9e5701d5150cfd1c8ff39703e21ec50926ceea11685542f91a8262946b728ea6a0641ceb50faddbc9d1faafd25f005 diff --git a/wayfire.spec b/wayfire.spec index 967beb0..526885e 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -6,7 +6,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch -%global commit2 caa156921c6be1dff9c2ccd851330c96de7928bf +%global commit2 b8b844fa873871f90a9cf0768c8ae8c92ad49f34 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire From f80817ecabbfbef376bfdb0a8a401715ad2f92f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:47:45 +0000 Subject: [PATCH 33/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a83695538ab69a8f177d835cc99f1d8870e29e00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:18:33 +0000 Subject: [PATCH 34/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3751974672c72705ee43b8afaec605b9edfc7c4e Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Fri, 16 Jan 2026 23:18:29 +0300 Subject: [PATCH 35/36] 0.10.1 Signed-off-by: Artem Polishchuk --- .gitignore | 3 +++ sources | 6 +++--- wayfire.spec | 21 +++++++++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 2b14dbb..69869f8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ /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/sources b/sources index 7a01f97..a50ca7c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wayfire-0.9.0.tar.gz) = 8c768642c7549aae13930c79df03e7d1ef3149e58e90c739d52540ded3e94659a18f0c6133b4a18881168069cd7ca31da8d91c435efba04697271c36314b7e81 -SHA512 (wf-touch-b8b844f.tar.gz) = 00d3991acb3898aa37d98c4fa34bf04eb193cbb8c409daa18ba9ed9ff0eb88cbfad552c62d85560ee4b94b9e37dee81a8c3138c6238fa7506a179e775cd079f9 -SHA512 (wf-utils-08553c4.tar.gz) = e55d6e9f9ba2981ee88776bf9fa047f1ed9e5701d5150cfd1c8ff39703e21ec50926ceea11685542f91a8262946b728ea6a0641ceb50faddbc9d1faafd25f005 +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 526885e..b9bbd0c 100644 --- a/wayfire.spec +++ b/wayfire.spec @@ -2,15 +2,15 @@ # Git submodules # * wf-utils -%global commit1 08553c418f164bf5e84613d27447a32e380b75f0 +%global commit1 3ef27d1f76b5f3d1f34305bff12b3174e81727c2 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # * wf-touch -%global commit2 b8b844fa873871f90a9cf0768c8ae8c92ad49f34 +%global commit2 093d8943df03cc8a2667990a065513c1bf2b57e0 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) Name: wayfire -Version: 0.9.0 +Version: 0.10.1 %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.63.0 +BuildRequires: meson >= 0.64.0 BuildRequires: cmake(doctest) BuildRequires: cmake(glm) @@ -40,12 +40,13 @@ 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.9.0 -BuildRequires: pkgconfig(wlroots) >= 0.17.0 +BuildRequires: pkgconfig(wf-config) >= 0.10.0 +BuildRequires: pkgconfig(wlroots-0.19) BuildRequires: pkgconfig(xkbcommon) Recommends: wayfire-config-manager @@ -56,8 +57,9 @@ 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 @@ -80,6 +82,7 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/ %meson \ -Duse_system_wfconfig=enabled \ -Duse_system_wlroots=enabled \ + -Dxwayland=enabled \ %{nil} %meson_build @@ -98,6 +101,7 @@ 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* @@ -106,6 +110,7 @@ rm -f %{buildroot}%{_prefix}/man/%{name}.1 %files devel %{_includedir}/%{name}/ +%{_libdir}/lib%{name}-*.a %{_libdir}/libwf-utils.so %{_libdir}/pkgconfig/*.pc From 9487c1e2b9e49f63a259662f202739bd02ebc157 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:42:36 +0000 Subject: [PATCH 36/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild