Update to 1.6~alpha
Resolves: RHEL-48759
This commit is contained in:
Tomas Popela
parent
841694ea18
commit
f804f15da8
1
.gitignore
vendored
1
.gitignore
vendored
@ -31,3 +31,4 @@
|
||||
/libadwaita-1.5.beta.tar.xz
|
||||
/libadwaita-1.5.0.tar.xz
|
||||
/libadwaita-1.5.1.tar.xz
|
||||
/libadwaita-1.6.alpha.tar.xz
|
||||
|
||||
@ -1,21 +1,18 @@
|
||||
%global apiver 1
|
||||
%global gtk_version 4.13.4
|
||||
%global gtk_version 4.15.2
|
||||
%global glib_version 2.76.0
|
||||
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: libadwaita
|
||||
Version: 1.5.1
|
||||
Version: 1.6~alpha
|
||||
Release: %autorelease
|
||||
Summary: Building blocks for modern GNOME applications
|
||||
|
||||
# part of src/adw-spring-animation.c is MIT
|
||||
License: LGPL-2.1-or-later AND MIT
|
||||
URL: https://gitlab.gnome.org/GNOME/libadwaita
|
||||
Source0: https://download.gnome.org/sources/%{name}/1.5/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
Patch0: mismatched-va_args.patch
|
||||
Patch1: plug-cond_1-leak.patch
|
||||
Source0: https://download.gnome.org/sources/%{name}/1.6/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc
|
||||
@ -98,7 +95,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||
%license COPYING
|
||||
%doc README.md AUTHORS NEWS
|
||||
%{_bindir}/adwaita-%{apiver}-demo
|
||||
%{_libdir}/*-%{apiver}.so.0*
|
||||
%{_libdir}/%{name}-%{apiver}-internal.so.0*
|
||||
%{_libdir}/%{name}-%{apiver}.so.0*
|
||||
%{_libdir}/girepository-1.0/*.typelib
|
||||
|
||||
%files devel
|
||||
@ -106,7 +104,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/gir-1.0/*-%{apiver}.gir
|
||||
%{_datadir}/vala/vapi/%{name}-%{apiver}.*
|
||||
%{_includedir}/%{name}-%{apiver}/
|
||||
%{_libdir}/*-%{apiver}.so
|
||||
%{_libdir}/%{name}-%{apiver}-internal.so
|
||||
%{_libdir}/%{name}-%{apiver}.so
|
||||
%{_libdir}/pkgconfig/*-%{apiver}.pc
|
||||
|
||||
%files doc
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From a717b3ee38bdf348ede2992de6b2345200f4f468 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hergert <chergert@redhat.com>
|
||||
Date: Wed, 12 Jun 2024 15:48:06 -0700
|
||||
Subject: [PATCH] va_args: fix umatched va_start()
|
||||
|
||||
va_list on some architectures require a va_end() to restore state which
|
||||
may have been spilled. In this case it is easier to just avoid calling
|
||||
va_start() altogether.
|
||||
---
|
||||
src/adw-alert-dialog.c | 4 ++--
|
||||
src/adw-message-dialog.c | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/adw-alert-dialog.c b/src/adw-alert-dialog.c
|
||||
index 7c002a4a..48d5d773 100644
|
||||
--- a/src/adw-alert-dialog.c
|
||||
+++ b/src/adw-alert-dialog.c
|
||||
@@ -1784,11 +1784,11 @@ adw_alert_dialog_add_responses (AdwAlertDialog *self,
|
||||
|
||||
g_return_if_fail (ADW_IS_ALERT_DIALOG (self));
|
||||
|
||||
- va_start (args, first_id);
|
||||
-
|
||||
if (!first_id)
|
||||
return;
|
||||
|
||||
+ va_start (args, first_id);
|
||||
+
|
||||
id = first_id;
|
||||
label = va_arg (args, const char *);
|
||||
|
||||
diff --git a/src/adw-message-dialog.c b/src/adw-message-dialog.c
|
||||
index cb3d3548..e36876fd 100644
|
||||
--- a/src/adw-message-dialog.c
|
||||
+++ b/src/adw-message-dialog.c
|
||||
@@ -1917,11 +1917,11 @@ adw_message_dialog_add_responses (AdwMessageDialog *self,
|
||||
|
||||
g_return_if_fail (ADW_IS_MESSAGE_DIALOG (self));
|
||||
|
||||
- va_start (args, first_id);
|
||||
-
|
||||
if (!first_id)
|
||||
return;
|
||||
|
||||
+ va_start (args, first_id);
|
||||
+
|
||||
id = first_id;
|
||||
label = va_arg (args, const char *);
|
||||
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From 3b9f98fb670b97911fc0d307d22cbf87e6ad27e6 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hergert <chergert@redhat.com>
|
||||
Date: Wed, 12 Jun 2024 16:03:12 -0700
|
||||
Subject: [PATCH] breakpoint: plug leak of cond_1 in failure paths
|
||||
|
||||
---
|
||||
src/adw-breakpoint.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/adw-breakpoint.c b/src/adw-breakpoint.c
|
||||
index 3d69420c4..eb2710ea3 100644
|
||||
--- a/src/adw-breakpoint.c
|
||||
+++ b/src/adw-breakpoint.c
|
||||
@@ -642,6 +642,7 @@ parse_multi (const char *str,
|
||||
return cond_1;
|
||||
} else {
|
||||
*error = CONDITION_PARSER_ERROR_UNKNOWN_OPERATOR;
|
||||
+ g_clear_pointer (&cond_1, adw_breakpoint_condition_free);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -650,6 +651,7 @@ parse_multi (const char *str,
|
||||
} else {
|
||||
*endp = (char *) str;
|
||||
*error = CONDITION_PARSER_ERROR_UNEXPECTED_CHARACTER;
|
||||
+ g_clear_pointer (&cond_1, adw_breakpoint_condition_free);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -663,6 +665,7 @@ parse_multi (const char *str,
|
||||
|
||||
if (!cond_2) {
|
||||
*endp = (char *) str;
|
||||
+ g_clear_pointer (&cond_1, adw_breakpoint_condition_free);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -679,6 +682,7 @@ parse_multi (const char *str,
|
||||
|
||||
if (!cond_2) {
|
||||
*endp = (char *) str;
|
||||
+ g_clear_pointer (&cond_1, adw_breakpoint_condition_free);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libadwaita-1.5.1.tar.xz) = cb0cbcc8780e1e0e21a2801e3ad1cb0f2f223057faea1e1511e47abff7cccd828bf678f6ace8d650740c4c05920e5d71407a4d6b57c685159fcf94e1187c395c
|
||||
SHA512 (libadwaita-1.6.alpha.tar.xz) = 2a238f28934479945f8ae32c17861ebb32045e805652f5b5f230a4f03d4d7b8283522b8291d548b794d63e25b4baf2ac51160e25981ce17d2a3fcf3f711c3f3f
|
||||
|
||||
Loading…
Reference in New Issue
Block a user