From 223d90650da4ce6719193512a18b4804ba34ab3616b08a92547833d8f22861ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sat, 26 Nov 2016 21:53:30 +0000 Subject: [PATCH] Accepting request 442113 from home:StefanBruens:branches:devel:languages:perl_2 v2: explicitly mention patch in changelog OBS-URL: https://build.opensuse.org/request/show/442113 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Alien-wxWidgets?expand=0&rev=18 --- cpanspec.yml | 1 + perl-Alien-wxWidgets-dump_sorted_config.patch | 22 +++++++++++++++++++ perl-Alien-wxWidgets.changes | 6 +++++ perl-Alien-wxWidgets.spec | 2 ++ 4 files changed, 31 insertions(+) create mode 100644 perl-Alien-wxWidgets-dump_sorted_config.patch diff --git a/cpanspec.yml b/cpanspec.yml index 63943e4..c2dc51f 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -7,6 +7,7 @@ patches: perl-Alien-wxWidgets-do_not_build_wxgtk.patch: perl-Alien-wxWidgets-ignore_cbuilder_version.patch: + perl-Alien-wxWidgets-dump_sorted_config.patch: preamble: |- BuildRequires: gcc-c++ diff --git a/perl-Alien-wxWidgets-dump_sorted_config.patch b/perl-Alien-wxWidgets-dump_sorted_config.patch new file mode 100644 index 0000000..418a1bc --- /dev/null +++ b/perl-Alien-wxWidgets-dump_sorted_config.patch @@ -0,0 +1,22 @@ +--- lib/Alien/wxWidgets.pm.orig 2016-11-23 16:54:35.940061462 +0100 ++++ lib/Alien/wxWidgets.pm 2016-11-23 16:55:14.383929523 +0100 +@@ -132,6 +132,8 @@ + my @configs = $class->get_configurations( @_ ); + + require Data::Dumper; ++ # sort output, to have same output as from My::Build::Base ++ $Data::Dumper::Sortkeys = 1; + print Data::Dumper->Dump( \@configs ); + } + +--- inc/My/Build/Base.pm.orig 2016-11-24 14:43:52.306654279 +0100 ++++ inc/My/Build/Base.pm 2016-11-24 14:44:09.806598987 +0100 +@@ -218,6 +218,8 @@ + my %config = $self->_init_config; + my $base = $self->awx_key; + ++ # sort output for reproducible builds ++ $Data::Dumper::Sortkeys = 1; + my $body = Data::Dumper->Dump( [ \%config ] ); + $body =~ s/rEpLaCe/$base/g; + diff --git a/perl-Alien-wxWidgets.changes b/perl-Alien-wxWidgets.changes index d151e71..afc1b20 100644 --- a/perl-Alien-wxWidgets.changes +++ b/perl-Alien-wxWidgets.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 26 13:56:53 UTC 2016 - stefan.bruens@rwth-aachen.de + +- Add perl-Alien-wxWidgets-dump_sorted_config.patch: + sort config dictionaries to make builds deterministic + ------------------------------------------------------------------- Sun Nov 13 15:11:39 UTC 2016 - stefan.bruens@rwth-aachen.de diff --git a/perl-Alien-wxWidgets.spec b/perl-Alien-wxWidgets.spec index fab6f40..04ea255 100644 --- a/perl-Alien-wxWidgets.spec +++ b/perl-Alien-wxWidgets.spec @@ -28,6 +28,7 @@ Source0: http://www.cpan.org/authors/id/M/MD/MDOOTSON/%{cpan_name}-%{vers Source1: cpanspec.yml Patch0: perl-Alien-wxWidgets-do_not_build_wxgtk.patch Patch1: perl-Alien-wxWidgets-ignore_cbuilder_version.patch +Patch2: perl-Alien-wxWidgets-dump_sorted_config.patch # MANUAL #BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,6 +59,7 @@ settings from an installed wxWidgets. find . -type f -print0 | xargs -0 chmod 644 %patch0 %patch1 +%patch2 # MANUAL BEGIN # this copy of GNU patch is only used on win32, remove it for license clarity # see https://build.opensuse.org/request/show/237465