diff --git a/0001-Adapt-tests-to-glib-2.77.patch b/0001-Adapt-tests-to-glib-2.77.patch new file mode 100644 index 0000000000000000000000000000000000000000..44441d7903863d8530980961d9d8c651c16b1f19 --- /dev/null +++ b/0001-Adapt-tests-to-glib-2.77.patch @@ -0,0 +1,47 @@ +From ce710632fd503f7cf1ed595dfc372e3619bcc37c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +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 +. + +This patch adapts the test. + + +--- + 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 + diff --git a/perl-Glib.spec b/perl-Glib.spec index 5947bef457520b5c089787a670a6a5bac11855c9..dfc49d6e06aa6a7a46e1acc79938ebda767e38a2 100755 --- a/perl-Glib.spec +++ b/perl-Glib.spec @@ -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 1.3293-5 +- backport: fix issue with comment check and glib 2.77+ + * Fri Apr 14 2023 yangxianzhao 1.3293-4 - Add yaml