From d4e18187e47675ba0d756cf5b5b2cc05b39c2a97a4656b4e04aa65a232f61881 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 8 Mar 2016 18:41:07 +0000 Subject: [PATCH] Accepting request 368646 from home:bmwiedemann:branches:X11:Utilities Add reproducible.patch to fix build-compare OBS-URL: https://build.opensuse.org/request/show/368646 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=29 --- putty.changes | 5 +++++ putty.spec | 3 +++ reproducible.patch | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 reproducible.patch diff --git a/putty.changes b/putty.changes index 8768c51..d7168da 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 8 18:35:39 UTC 2016 - bwiedemann@suse.com + +- Add reproducible.patch to fix build-compare + ------------------------------------------------------------------- Tue Mar 8 16:43:24 UTC 2016 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index 93a84dc..961e9fc 100644 --- a/putty.spec +++ b/putty.spec @@ -30,6 +30,8 @@ Source: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz Source2: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.gpg Source4: %name.keyring Patch1: putty-03-config.diff +# PATCH-FIX-TO-UPSTREAM: bmwiedemann -- drop build timestamps from png +Patch2: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick BuildRequires: gtk2-devel @@ -45,6 +47,7 @@ serial console client. %prep %setup -q %patch -P 1 -p1 +%patch2 -p1 %build %configure diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..8b88948 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,11 @@ +--- putty-0.66/icons/mkicon.py.orig 2015-11-07 10:16:40.000000000 +0000 ++++ putty-0.66/icons/mkicon.py 2016-03-08 18:34:34.600917451 +0000 +@@ -912,7 +912,7 @@ + assert minx >= 0 and miny >= 0 and maxx <= width and maxy <= width + + block = render(canvas, 0, 0, width, width) +- p = os.popen("convert -depth 8 -size %dx%d rgba:- %s" % (width,width,fname), "w") ++ p = os.popen("convert -strip -depth 8 -size %dx%d rgba:- %s" % (width,width,fname), "w") + assert len(block) == width + for line in block: + assert len(line) == width