Update to 41.1

This commit is contained in:
David King 2021-11-15 15:02:25 +00:00
parent dbe03d359d
commit 4dae642ec1
4 changed files with 6 additions and 56 deletions

1
.gitignore vendored
View File

@ -96,3 +96,4 @@ cheese-2.31.1.tar.bz2
/cheese-3.34.0.tar.xz
/cheese-3.38.0.tar.xz
/cheese-41.0.tar.xz
/cheese-41.1.tar.xz

View File

@ -1,52 +0,0 @@
From 6cba16a610adf7eddd17113d283b3a989e26328c Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 20 Sep 2021 08:26:54 +0100
Subject: [PATCH 1/2] introspection: Pin the API version for now
---
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 82f663f5..79c6cf98 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,8 @@ version_array = cheese_version.split('.')
cheese_major_version = version_array[0].to_int()
cheese_minor_version = version_array[1].to_int()
-cheese_api_version = cheese_major_version.to_string() + '.0'
+#cheese_api_version = cheese_major_version.to_string() + '.0'
+cheese_api_version = 3.0
cheese_prefix = get_option('prefix')
cheese_bindir = get_option('bindir')
--
2.31.1
From 760fe75d06831b3d0f3d0e820f32967602878e08 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 20 Sep 2021 08:31:58 +0100
Subject: [PATCH 2/2] Fix the API version
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 79c6cf98..48de79d1 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,7 @@ cheese_major_version = version_array[0].to_int()
cheese_minor_version = version_array[1].to_int()
#cheese_api_version = cheese_major_version.to_string() + '.0'
-cheese_api_version = 3.0
+cheese_api_version = '3.0'
cheese_prefix = get_option('prefix')
cheese_bindir = get_option('bindir')
--
2.31.1

View File

@ -1,6 +1,6 @@
Name: cheese
Epoch: 2
Version: 41.0
Version: 41.1
Release: 1%{?dist}
Summary: Application for taking pictures and movies from a webcam
@ -8,8 +8,6 @@ License: GPLv2+
URL: https://wiki.gnome.org/Apps/Cheese
Source0: https://download.gnome.org/sources/%{name}/41/%{name}-%{version}.tar.xz
Patch0: cheese-41.0-introspection.patch
BuildRequires: gcc
BuildRequires: meson
BuildRequires: gtk-doc
@ -122,6 +120,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk
%changelog
* Mon Nov 15 2021 David King <amigadave@amigadave.com> - 2:41.1-1
- Update to 41.1
* Mon Sep 20 2021 David King <amigadave@amigadave.com> - 2:41.0-1
- Update to 41.0

View File

@ -1 +1 @@
SHA512 (cheese-41.0.tar.xz) = c5de776e080974703289ea36097e52402439265db17ae5b22687253c1cdd77ad27e95bbbc4acab0ec514954aae7fe9042e50f36eb407df3cc02783bc62cb896e
SHA512 (cheese-41.1.tar.xz) = 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074