commit 66e63d38b670412a9b2eb47142a97e5f44ebaf50
Author: Jan Palus <[email protected]>
Date: Sat Jun 29 01:06:10 2024 +0200
up to 0.8.1
no-git-check.patch | 27 ---------------------------
wayfire.spec | 24 +++++++++++-------------
2 files changed, 11 insertions(+), 40 deletions(-)
---
diff --git a/wayfire.spec b/wayfire.spec
index 033a415..6961245 100644
--- a/wayfire.spec
+++ b/wayfire.spec
@@ -5,15 +5,14 @@
Summary: A modular and extensible wayland compositor
Summary(pl.UTF-8): Modularny i rozszerzalny kompozytor Wayland
Name: wayfire
-Version: 0.8.0
-Release: 3
+Version: 0.8.1
+Release: 1
License: MIT
Group: Applications
#Source0Download: https://github.com/WayfireWM/wayfire/releases
Source0:
https://github.com/WayfireWM/wayfire/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 36e88c89c0be0e6af725ecab15049ecb
-Patch0: no-git-check.patch
-Patch1: glm.patch
+# Source0-md5: ec2652b11a5a8d03f96a38e8ca426246
+Patch0: glm.patch
URL: https://wayfire.org/
BuildRequires: EGL-devel
BuildRequires: GLM-devel >= 0.9.9.9
@@ -27,7 +26,7 @@ BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel >= 6:9
BuildRequires: libxcb-devel
-BuildRequires: meson >= 0.56.0
+BuildRequires: meson >= 0.63.0
BuildRequires: ninja
BuildRequires: nlohmann-json-devel
BuildRequires: pango-devel
@@ -39,16 +38,16 @@ BuildRequires: wayland-devel
BuildRequires: wayland-protocols >= 1.12
BuildRequires: wf-config-devel < 0.9.0
BuildRequires: wf-config-devel >= 0.8.0
-BuildRequires: wlroots-devel < 0.17.0
-BuildRequires: wlroots-devel >= 0.16.0
+BuildRequires: wlroots-devel < 0.18.0
+BuildRequires: wlroots-devel >= 0.17.0
BuildRequires: xorg-lib-libxkbcommon-devel
BuildRequires: xz
Requires: %{name}-libs = %{version}-%{release}
Requires: libinput >= 1.7.0
Requires: wf-config < 0.9.0
Requires: wf-config >= 0.8.0
-Requires: wlroots < 0.17.0
-Requires: wlroots >= 0.16.0
+Requires: wlroots < 0.18.0
+Requires: wlroots >= 0.17.0
Suggests: alacritty
Suggests: alsa-utils
Suggests: grim
@@ -94,8 +93,8 @@ Requires: pixman-devel
Requires: wayland-devel
Requires: wf-config-devel < 0.9.0
Requires: wf-config-devel >= 0.8.0
-Requires: wlroots-devel < 0.17.0
-Requires: wlroots-devel >= 0.16.0
+Requires: wlroots-devel < 0.18.0
+Requires: wlroots-devel >= 0.17.0
%description devel
Header files for wayfire.
@@ -118,7 +117,6 @@ Biblioteki statyczne wayfire.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%meson build \
diff --git a/no-git-check.patch b/no-git-check.patch
deleted file mode 100644
index ab2c740..0000000
--- a/no-git-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 515603f2ff5e0a342679119d0995bf49abfc3f62 Mon Sep 17 00:00:00 2001
-From: Scott Moreau <[email protected]>
-Date: Sat, 7 Oct 2023 11:42:02 -0600
-Subject: [PATCH] build: Tell meson to ignore the return value of git commands
-
-We grab the commit hash and branch name for use in the log,
-but this does not work when building from a tarball. Tell meson
-to ignore the return value by setting 'check: false' for git commands.
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 85993a190..eb2733cad 100644
---- a/meson.build
-+++ b/meson.build
-@@ -86,8 +86,8 @@ conf_data = configuration_data()
- version = '"@0@"'.format(meson.project_version())
- git = find_program('git', native: true, required: false)
- if git.found()
-- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check:
true)
-- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'],
check: true)
-+ git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check:
false)
-+ git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'],
check: false)
- if git_commit.returncode() == 0 and git_branch.returncode() == 0
- version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
- meson.project_version(),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wayfire.git/commitdiff/66e63d38b670412a9b2eb47142a97e5f44ebaf50
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
