Update to 3.40.0

This commit is contained in:
Kalev Lember 2022-08-11 13:51:47 +02:00
parent 908a7deb67
commit 38811b1ac8
5 changed files with 8 additions and 65 deletions

1
.gitignore vendored
View File

@ -30,3 +30,4 @@
/glade-3.38.0.tar.xz
/glade-3.38.1.tar.xz
/glade-3.38.2.tar.xz
/glade-3.40.0.tar.xz

View File

@ -1,32 +0,0 @@
From 6da47128e8da04edccccdfcbc9101940fc15fe3a Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 20 Jan 2022 14:18:09 -0500
Subject: [PATCH] meson: i18n.merge_file() does not take a positional argument
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 9f244566..bfbc514c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
desktop_conf.set('VERSION', glade_version)
i18n.merge_file(
- 'desktop',
type: 'desktop',
input: configure_file(
input: 'org.gnome.Glade.desktop.in.in',
@@ -18,7 +17,6 @@ i18n.merge_file(
appdata = glade_name + '.appdata.xml'
i18n.merge_file(
- 'appdata',
input: 'org.gnome.Glade.appdata.xml.in',
output: '@BASENAME@',
po_dir: po_dir,
--
GitLab

View File

@ -1,23 +0,0 @@
From efdd5338b034a11c5d617684d92d11edc600965e Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 20 Jan 2022 14:19:03 -0500
Subject: [PATCH] Remove duplicate entry for 'da' from help/LINGUAS
---
help/LINGUAS | 1 -
1 file changed, 1 deletion(-)
diff --git a/help/LINGUAS b/help/LINGUAS
index fc3cd4c3..d67e42c8 100644
--- a/help/LINGUAS
+++ b/help/LINGUAS
@@ -1,6 +1,5 @@
# please keep this list sorted alphabetically
#
-da
bg
ca
cs
--
GitLab

View File

@ -1,6 +1,6 @@
Name: glade
Version: 3.38.2
Release: 8%{?dist}
Version: 3.40.0
Release: 1%{?dist}
Summary: User Interface Designer for GTK+
# - /usr/bin/glade is GPLv2+
@ -9,13 +9,7 @@ Summary: User Interface Designer for GTK+
# GPLv2+ and LGPLv2+ code, so the resulting binaries are GPLv2+
License: GPLv2+ and LGPLv2+
URL: https://glade.gnome.org/
Source0: https://download.gnome.org/sources/glade/3.38/glade-%{version}.tar.xz
# meson 0.61+: i18n.merge_file() does not take a positional argument
# Remove duplicate entry for 'da' from help/LINGUAS
# Fixes https://bugzilla.redhat.com/2082581
Patch: https://gitlab.gnome.org/GNOME/glade/-/commit/6da47128e8.patch
Patch: https://gitlab.gnome.org/GNOME/glade/-/commit/efdd5338b0.patch
Source0: https://download.gnome.org/sources/glade/3.40/glade-%{version}.tar.xz
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl
@ -121,6 +115,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Glade.de
%changelog
* Thu Aug 11 2022 Kalev Lember <klember@redhat.com> - 3.40.0-1
- Update to 3.40.0
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (glade-3.38.2.tar.xz) = 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
SHA512 (glade-3.40.0.tar.xz) = 6b018f882e9d155a4b2256c0b4c72743f971c8d730a53f16faa240d01e14051f5b6ce04e355dcc78e1679579fb091facaa06acdda6297c5b8efc642c42bb7b4e