packages/perl-Glib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue with comment check and glib 2.77+

Browse Source 
(cherry picked from commit 9b6b1a2e57001897af8792f2b36541cba7250fad)
This commit is contained in:
wangxiaomeng 2024-04-15 18:53:05 +08:00 committed by openeuler-sync-bot
parent 566b2aa2da
commit 198c1d7624
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-Adapt-tests-to-glib-2.77.patch Normal file
View File

@ -0,0 +1,47 @@
From ce710632fd503f7cf1ed595dfc372e3619bcc37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 31 Jul 2023 10:33:13 +0200
Subject: [PATCH] Adapt tests to glib-2.77
After upgrading glib from 2.76 to 2.77, a t/g.t test started to fail:
# Failed test at t/g.t line 99.
# got: 'another comment
# '
# expected: '#another comment
# #'
# Looks like you failed 1 test of 33.
t/g.t ......................
Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/33 subtests
The missing hash characters was an intentional change in glib
<https://gitlab.gnome.org/GNOME/glib/-/issues/3056>.
This patch adapts the test.
<https://gitlab.gnome.org/GNOME/perl-glib/-/issues/3>
---
t/g.t | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/t/g.t b/t/g.t
index 4c7cd2c..d48a311 100644
--- a/t/g.t
+++ b/t/g.t
@@ -96,7 +96,11 @@ SKIP: {
$key_file->set_comment('locales', 'mystring', 'comment');
like ($key_file->get_comment('locales', 'mystring'), qr/^comment$/);
$key_file->set_comment('locales', undef, "another comment\n");
- is ($key_file->get_comment('locales', undef), "#another comment\n#");
+ is ($key_file->get_comment('locales', undef),
+ Glib::major_version > 2 ||
+ (Glib::major_version == 2 && Glib::minor_version >= 77) ?
+ "another comment\n" : "#another comment\n#"
+ );
$key_file->set_comment(undef, undef, 'one comment more');
like ($key_file->get_comment(undef, undef), qr/^one comment more$/);
$key_file->set_boolean($start_group, 'boolkey', FALSE);
--
2.43.0

7
perl-Glib.spec
View File

@ -1,12 +1,13 @@
%global _empty_manifest_terminate_build 0
Name: perl-Glib
Version: 1.3293
Release: 4
Release: 5
Summary: Perl wrappers for the GLib utility and Object libraries
License: LGPL-2.1
Group: Development/Libraries
URL: http://search.cpan.org/dist/Glib/
Source0: http://www.cpan.org/authors/id/X/XA/XAOC/Glib-%{version}.tar.gz
Patch0: 0001-Adapt-tests-to-glib-2.77.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel perl-devel
BuildRequires: gcc
@ -36,6 +37,7 @@ GObject-based libraries. The "SEE ALSO" section contains pointers to all
sorts of good information.
%prep
%setup -q -n Glib-%{version}
%patch -P0 -p1 -b .commentfix
%build
export PERL_MM_OPT=""
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*
%changelog
* Mon Apr 15 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> 1.3293-5
- backport: fix issue with comment check and glib 2.77+
* Fri Apr 14 2023 yangxianzhao <yangxianzhao@uniontech.com> 1.3293-4
- Add yaml