- Update to version 0.8.0:

* Deleted 0001-wf-utils.patch
  * Added wayland.patch
  * Workspace sets.
  * IPC socket.

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayfire?expand=0&rev=11
This commit is contained in:
Dead Mozay 2023-10-09 06:39:36 +00:00 committed by Git OBS Bridge
parent 7539abdfe0
commit 772cdf8fa2
8 changed files with 39 additions and 38 deletions

View File

@ -1,22 +0,0 @@
diff -rupN wayfire-0.7.5/subprojects/wf-utils/meson.build wayfire-0.7.5-patch/subprojects/wf-utils/meson.build
--- wayfire-0.7.5/subprojects/wf-utils/meson.build 2021-05-16 02:13:59.000000000 -0700
+++ wayfire-0.7.5-patch/subprojects/wf-utils/meson.build 2023-07-04 12:02:07.028222586 -0700
@@ -76,6 +76,7 @@ headers_parser = [
'wayfire/parser/action_parser.hpp',
'wayfire/parser/condition_parser.hpp',
'wayfire/parser/rule_parser.hpp',
+'wayfire/parser/lambda_rule_parser.hpp',
]
headers_rule = [
diff -rupN wayfire-0.7.5/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp wayfire-0.7.5-patch/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp
--- wayfire-0.7.5/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp 2021-05-16 02:13:59.000000000 -0700
+++ wayfire-0.7.5-patch/subprojects/wf-utils/wayfire/rule/lambda_rule.cpp 2023-07-04 12:02:29.920465237 -0700
@@ -1,6 +1,7 @@
#include "wayfire/rule/lambda_rule.hpp"
#include "wayfire/condition/condition.hpp"
#include <cstddef>
+#include <cstdint>
#include <functional>
#include <memory>
#include <sstream>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2e3184e72fe7999488fbba10bd38c29350b447489f02961aab5fa8438698b5c
size 781952

View File

@ -1 +0,0 @@
f2e3184e72fe7999488fbba10bd38c29350b447489f02961aab5fa8438698b5c *wayfire-0.7.5.tar.xz

3
wayfire-0.8.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e6af885c08822e3a0b1fd748e1ee75e29bc000e376f6613b26c564f8cbc2baf
size 828576

View File

@ -0,0 +1 @@
6e6af885c08822e3a0b1fd748e1ee75e29bc000e376f6613b26c564f8cbc2baf *wayfire-0.8.0.tar.xz

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Oct 9 04:57:48 UTC 2023 - Dead Mozay <dead_mozay@opensuse.org>
- Update to version 0.8.0:
* Deleted 0001-wf-utils.patch
* Added wayland.patch
* Workspace sets.
* IPC socket.
-------------------------------------------------------------------
Tue Jul 4 19:23:26 UTC 2023 - Shawn Dunn <sfalken@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package wayfire
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,20 +18,23 @@
%define libname libwf-utils0
Name: wayfire
Version: 0.7.5
Version: 0.8.0
Release: 0
Summary: 3D wayland compositor
License: MIT
URL: https://wayfire.org/
Source0: https://github.com/WayfireWM/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/WayfireWM/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.sha256sum
# PATCH-FIX-UPSTREAM 0001-wf-utils.patch gh#WayfireWM/wayfire#1790
Patch0: 0001-wf-utils.patch
# PATCH-FIX-OPENSUSE wayland.patch openSUSE uses non-standard header file locations/
Patch0: wayland.patch
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glslang-devel
BuildRequires: hwdata
BuildRequires: inotify-tools-devel
BuildRequires: meson >= 0.56.0
BuildRequires: fdupes
BuildRequires: pkgconfig
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(doctest)
@ -44,7 +47,8 @@ BuildRequires: pkgconfig(libevdev)
BuildRequires: pkgconfig(libinput) >= 1.7.0
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: inotify-tools-devel
BuildRequires: pkgconfig(nlohmann_json)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pixman-1)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
@ -54,10 +58,6 @@ BuildRequires: pkgconfig(wf-config) >= 0.7.0
BuildRequires: pkgconfig(wlroots) >= 0.16.0
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xwayland)
BuildRequires: pkgconfig(pango)
BuildRequires: glslang-devel
BuildRequires: doxygen
BuildRequires: hwdata
Recommends: wayfire-config-manager
Recommends: wayfire-plugins-extra
Recommends: wcm
@ -74,8 +74,8 @@ Summary: Library for %{name}
%package devel
Summary: Devel files for %{name}
Requires: %{name} = %{version}
Requires: %{libname} = %{version}
Requires: %{name} = %{version}
%description devel
Development files for %{name}.
@ -93,6 +93,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE1} | grep -Eo '^[0-9a-f]+'` %{SOU
%install
%meson_install
rm -rf %{buildroot}/%{_prefix}/man/wayfire.1
install -Dpm0644 wayfire.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop
find %{buildroot} -type f -name "*.a" -delete -print0
@ -108,12 +109,13 @@ find %{buildroot} -type f -name "*.a" -delete -print0
%{_datadir}/%{name}
%{_datadir}/wayland-sessions/
%{_datadir}/wayland-sessions/*.desktop
%{_mandir}/man1/wayfire.1%{?ext_man}
%files -n %{libname}
%{_libdir}/*.so.*
%{_libdir}/libwayfire-blur-base.so
%{_libdir}/%{name}/
%files devel
%{_libdir}/libwf-utils.so
%{_libdir}/pkgconfig/*.pc

12
wayland.patch Normal file
View File

@ -0,0 +1,12 @@
diff '--color=auto' -rub a/src/api/wayfire/util.hpp b/src/api/wayfire/util.hpp
--- a/src/api/wayfire/util.hpp 2023-10-07 16:09:32.000000000 +0600
+++ b/src/api/wayfire/util.hpp 2023-10-09 10:43:13.404407663 +0600
@@ -2,7 +2,7 @@
#define WF_UTIL_HPP
#include <algorithm>
-#include <wayland-server.h>
+#include <wayland/wayland-server.h>
#include <functional>
namespace wf