Bug#853444: ht: diff for NMU version 2.1.0+repack1-2.1

[Stephen Kitt]

Hi Anton,

On Fri, 11 Aug 2017 22:24:00 +0200, Anton Gladky  wrote:
> thanks a lot for the patch! I have just applied it and uploaded together
> with some other changes. Please cancel your upload.

Done (I think).

Regards,

Stephen


pgpzumke814rs.pgp
Description: OpenPGP digital signature

Bug#853444: ht: diff for NMU version 2.1.0+repack1-2.1

[Anton Gladky]

Hi Stephen,

thanks a lot for the patch! I have just applied it and uploaded together
with some other changes. Please cancel your upload.

Best regards

Anton


2017-08-10 22:57 GMT+02:00 Stephen Kitt :
> Control: tags 853444 + patch
> Control: tags 853444 + pending
>
> Dear maintainer,
>
> I've prepared an NMU for ht (versioned as 2.1.0+repack1-2.1) and
> uploaded it to DELAYED/2. Please feel free to tell me if I
> should delay it longer.
>
> Regards,
>
> Stephen

Bug#853444: ht: diff for NMU version 2.1.0+repack1-2.1

[Stephen Kitt]

Control: tags 853444 + patch
Control: tags 853444 + pending

Dear maintainer,

I've prepared an NMU for ht (versioned as 2.1.0+repack1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards,

Stephen
diff -Nru ht-2.1.0+repack1/debian/changelog ht-2.1.0+repack1/debian/changelog
--- ht-2.1.0+repack1/debian/changelog	2016-10-17 20:19:33.0 +0200
+++ ht-2.1.0+repack1/debian/changelog	2017-08-10 22:54:18.0 +0200
@@ -1,3 +1,11 @@
+ht (2.1.0+repack1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Force unambiguous signed abs() call, to build with GCC 7.
+(Closes: #853444)
+
+ -- Stephen Kitt   Thu, 10 Aug 2017 22:54:18 +0200
+
 ht (2.1.0+repack1-2) unstable; urgency=high
 
   * [107d7de] Set the minimal libiberty version to 20161017 in BD.
diff -Nru ht-2.1.0+repack1/debian/patches/50_signed_abs.patch ht-2.1.0+repack1/debian/patches/50_signed_abs.patch
--- ht-2.1.0+repack1/debian/patches/50_signed_abs.patch	1970-01-01 01:00:00.0 +0100
+++ ht-2.1.0+repack1/debian/patches/50_signed_abs.patch	2017-08-10 22:52:22.0 +0200
@@ -0,0 +1,14 @@
+Description: Force unambiguous signed abs()
+Author: Stephen Kitt 
+
+--- a/htapp.cc
 b/htapp.cc
+@@ -3023,7 +3023,7 @@
+ {
+ 	uint a = 2;
+ 	uint b = u/a;
+-	while (abs(a - b) > 1) {
++	while (abs((int) (a - b)) > 1) {
+ 		a = (a+b)/2;
+ 		b = u/a;
+ }
diff -Nru ht-2.1.0+repack1/debian/patches/series ht-2.1.0+repack1/debian/patches/series
--- ht-2.1.0+repack1/debian/patches/series	2016-10-13 23:22:18.0 +0200
+++ ht-2.1.0+repack1/debian/patches/series	2017-08-10 22:51:56.0 +0200
@@ -1,3 +1,4 @@
 20_fix_format_not_a_string.patch
 30_remove_C_TIMEDATE.patch
 40_use_packaged_libibberty.patch
+50_signed_abs.patch