Hello community, here is the log from the commit of package perl-Glib for openSUSE:Factory checked in at 2019-03-19 11:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Glib (Old) and /work/SRC/openSUSE:Factory/.perl-Glib.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Glib" Tue Mar 19 11:08:40 2019 rev:53 rq:685330 version:1.328 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Glib/perl-Glib.changes 2018-10-12 13:09:11.143428614 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Glib.new.28833/perl-Glib.changes 2019-03-19 11:08:42.598089980 +0100 @@ -1,0 +2,6 @@ +Fri Mar 15 11:20:02 UTC 2019 - Bjørn Lie <[email protected]> + +- Add perl-Glib-1.328-glib2.59-comment-linebreaks.patch: Fix build + with new glib2. Patch from fedora. + +------------------------------------------------------------------- New: ---- perl-Glib-1.328-glib2.59-comment-linebreaks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Glib.spec ++++++ --- /var/tmp/diff_new_pack.pVjUNi/_old 2019-03-19 11:08:43.182089841 +0100 +++ /var/tmp/diff_new_pack.pVjUNi/_new 2019-03-19 11:08:43.182089841 +0100 @@ -26,6 +26,7 @@ Url: https://metacpan.org/pod/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/X/XA/XAOC/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml +Patch0: perl-Glib-1.328-glib2.59-comment-linebreaks.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glib2-devel >= 2.0.0 BuildRequires: perl @@ -47,6 +48,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" ++++++ perl-Glib-1.328-glib2.59-comment-linebreaks.patch ++++++ diff -up Glib-1.328/t/g.t.comment-linebreaks Glib-1.328/t/g.t --- Glib-1.328/t/g.t.comment-linebreaks 2012-01-06 01:26:40.000000000 -0500 +++ Glib-1.328/t/g.t 2019-01-04 14:35:05.796603043 -0500 @@ -84,7 +84,11 @@ SKIP: { eq_array (\@bools, [FALSE, TRUE, FALSE]); ok ($key_file->has_group('locales')); - is ($key_file->get_comment('locales', 'mystring'), "some string\n"); + if (Glib->CHECK_VERSION (2, 59, 0)) { + is ($key_file->get_comment('locales', 'mystring'), "some string"); + } else { + is ($key_file->get_comment('locales', 'mystring'), "some string\n"); + } is ($key_file->get_string('locales', 'mystring'), 'Good morning'); is ($key_file->get_locale_string('locales', 'mystring', 'it'), 'Buongiorno'); @@ -94,11 +98,21 @@ SKIP: { $key_file->set_string_list('listsection', 'stringlist', 'one', 'two', 'three'); $key_file->set_locale_string('locales', 'mystring', 'en', 'one'); $key_file->set_comment('locales', 'mystring', 'comment'); - is ($key_file->get_comment('locales', 'mystring'), "comment\n"); - $key_file->set_comment('locales', undef, "another comment\n"); - is ($key_file->get_comment('locales', undef), "#another comment\n#"); + if (Glib->CHECK_VERSION (2, 59, 0)) { + is ($key_file->get_comment('locales', 'mystring'), "comment"); + $key_file->set_comment('locales', undef, "another comment"); + is ($key_file->get_comment('locales', undef), "#another comment"); + } else { + is ($key_file->get_comment('locales', 'mystring'), "comment\n"); + $key_file->set_comment('locales', undef, "another comment\n"); + is ($key_file->get_comment('locales', undef), "#another comment\n#"); + } $key_file->set_comment(undef, undef, 'one comment more'); - is ($key_file->get_comment(undef, undef), "one comment more\n"); + if (Glib->CHECK_VERSION (2, 59, 0)) { + is ($key_file->get_comment(undef, undef), "one comment more"); + } else { + is ($key_file->get_comment(undef, undef), "one comment more\n"); + } $key_file->set_boolean($start_group, 'boolkey', FALSE); $key_file->set_value($start_group, 'boolkey', '0');
