Accepting request 1130295 from GNOME:Next

New stable rel

OBS-URL: https://build.opensuse.org/request/show/1130295
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libadwaita?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2023-12-01 16:51:24 +00:00 committed by Git OBS Bridge
parent 1291f1ff59
commit 14a4ddab33
8 changed files with 28 additions and 59 deletions

View File

@ -1,44 +0,0 @@
From 3e3967d5f69180644519936991cad10136e84ca9 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <pgriffis@igalia.com>
Date: Wed, 1 Nov 2023 09:52:47 -0500
Subject: [PATCH] Fix building against libappstream 1.0
---
src/adw-about-window.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/adw-about-window.c b/src/adw-about-window.c
index dd8da0f08..b2ab763c9 100644
--- a/src/adw-about-window.c
+++ b/src/adw-about-window.c
@@ -2005,7 +2005,7 @@ adw_about_window_new_from_appdata (const char *resource_path,
}
#if AS_CHECK_VERSION (1, 0, 0)
- releases = as_component_get_releases_plain (component);
+ releases = as_release_list_get_entries (as_component_get_releases_plain (component));
#else
releases = as_component_get_releases (component);
#endif
@@ -2042,12 +2042,17 @@ adw_about_window_new_from_appdata (const char *resource_path,
}
name = as_component_get_name (component);
- developer_name = as_component_get_developer_name (component);
project_license = as_component_get_project_license (component);
issue_url = as_component_get_url (component, AS_URL_KIND_BUGTRACKER);
support_url = as_component_get_url (component, AS_URL_KIND_HELP);
website_url = as_component_get_url (component, AS_URL_KIND_HOMEPAGE);
+#if AS_CHECK_VERSION (1, 0, 0)
+ developer_name = as_developer_get_name (as_component_get_developer (component));
+#else
+ developer_name = as_component_get_developer_name (component);
+#endif
+
adw_about_window_set_application_icon (self, application_id);
if (name)
--
GitLab

View File

@ -3,11 +3,10 @@
<service name="obs_scm" mode="manual">
<param name="url">https://gitlab.gnome.org/GNOME/libadwaita.git</param>
<param name="scm">git</param>
<param name="revision">cba6685ba3f3f33dac8506165fc28975e454664a</param>
<param name="revision">refs/tags/1.4.1</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">

View File

@ -1,4 +0,0 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/libadwaita.git</param>
<param name="changesrevision">cba6685ba3f3f33dac8506165fc28975e454664a</param></service></servicedata>

View File

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

3
libadwaita-1.4.1.obscpio Normal file
View File

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

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Dec 01 16:08:07 UTC 2023 - bjorn.lie@gmail.com
- Update to version 1.4.1:
+ Fix build with MSVC
+ Fix build with libappstream 1.0
+ AdwCarousel: Fix carousel scroll behavior with page reordering
+ AdwComboRow:
- Fix focus when opening the popover
- Set the correct state on the selected checkmark
+ AdwNavigationView: Fix a warning message
+ AdwTabOverview: Allow child focus on out animations
+ AdwTabView:
- Keep view alive during ::page-detached
- Fix crashes when using :pages
+ Docs: Fix erroneous <child> use in breakpoints migration guide
+ Updated translations.
- Drop 3e3967d5f69180644519936991cad10136e84ca9.patch: Fixed
upstream.
-------------------------------------------------------------------
Wed Nov 22 10:48:46 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,4 +1,4 @@
name: libadwaita
version: 1.4.0+12
mtime: 1699273898
commit: cba6685ba3f3f33dac8506165fc28975e454664a
version: 1.4.1
mtime: 1701444702
commit: b7e835df75cba85eced19ccde3b7d9727c104e24

View File

@ -17,14 +17,12 @@
Name: libadwaita
Version: 1.4.0+12
Version: 1.4.1
Release: 0
Summary: Building blocks for modern GNOME applications
License: LGPL-2.1-or-later
URL: https://gitlab.gnome.org/GNOME/libadwaita
Source: %{name}-%{version}.tar.zst
# PATCH-FIX-UPSTREAM 3e3967d5f69180644519936991cad10136e84ca9.patch -- Fix building against libappstream 1.0
Patch0: https://gitlab.gnome.org/GNOME/libadwaita/-/commit/3e3967d5f69180644519936991cad10136e84ca9.patch
BuildRequires: fdupes
BuildRequires: meson >= 0.59.0