diff --git a/0001-Adapt-tests-to-glib-2.77.patch b/0001-Adapt-tests-to-glib-2.77.patch deleted file mode 100644 index 44441d7903863d8530980961d9d8c651c16b1f19..0000000000000000000000000000000000000000 --- a/0001-Adapt-tests-to-glib-2.77.patch +++ /dev/null @@ -1,47 +0,0 @@ -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/Glib-1.3293.tar.gz b/Glib-1.3293.tar.gz deleted file mode 100755 index ae569771866f261ef7011c2059959fab32354473..0000000000000000000000000000000000000000 Binary files a/Glib-1.3293.tar.gz and /dev/null differ diff --git a/Glib-1.3294.tar.gz b/Glib-1.3294.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b394798a5ca3b093c9d923f01b3d5dec2a9d3c21 Binary files /dev/null and b/Glib-1.3294.tar.gz differ diff --git a/perl-Glib.spec b/perl-Glib.spec index dfc49d6e06aa6a7a46e1acc79938ebda767e38a2..178517f39a2a28c0bdd047dd413dc116e709603e 100755 --- a/perl-Glib.spec +++ b/perl-Glib.spec @@ -1,13 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: perl-Glib -Version: 1.3293 -Release: 5 +Version: 1.3294 +Release: 1 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 @@ -37,7 +36,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" @@ -86,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/* %changelog +* Tue Jul 16 2024 dfh 1.3294-1 +- Add G_OPTION_FLAG_NONE to the GOptionFlag GEnum (GNOME/perl-glib!8) +- Add a CI pipeline for perl-Glib (GNOME/perl-glib!9) +- Adapt tests to glib-2.77 (GNOME/perl-glib!10) + * Mon Apr 15 2024 wangxiaomeng 1.3293-5 - backport: fix issue with comment check and glib 2.77+