Bug#925746: libidn: diff for NMU version 1.33-2.3

[Marcelo Mota]

Control: tags 925746 + pending

Dear maintainer,

I've prepared an NMU for libidn (versioned as 1.33-2.3) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer or cancel the NMU.

I've uploaded to experimental and if this fix work fine i'll
send a new upload to unstable.


Regards,

Marcelo S Mota


diff -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog
--- libidn-1.33/debian/changelog        2018-04-10 13:03:08.000000000 -0300
+++ libidn-1.33/debian/changelog        2020-06-10 02:39:16.000000000 -0300
@@ -1,3 +1,12 @@
+libidn (1.33-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/0005-Fix-link-failure.patch: added to fix build
+    failure with gnulibs's upstream patch. Thanks to Gianfranco Costamagna
+    <locutusofborg@debian.org>. (Closes: #925746)
+
+ -- Marcelo Soares Mota <motasmarcelo@gmail.com>  Wed, 10 Jun 2020 02:39:16 
-0300
+
 libidn (1.33-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libidn-1.33/debian/patches/0005-Fix-link-failure.patch 
libidn-1.33/debian/patches/0005-Fix-link-failure.patch
--- libidn-1.33/debian/patches/0005-Fix-link-failure.patch      1969-12-31 
21:00:00.000000000 -0300
+++ libidn-1.33/debian/patches/0005-Fix-link-failure.patch      2020-06-10 
02:39:16.000000000 -0300
@@ -0,0 +1,19 @@
+Description: Fix link failure with gnulib's upstream patch
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2019-03-20
+Bug-Debian: https://bugs.debian.org/925746
+Origin: 
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=cca32830b57e91f837c01d15b8732f23ff97fc36
+
+Index: libidn-1.33/lib/gltests/glthread/thread.h
+===================================================================
+--- libidn-1.33.orig/lib/gltests/glthread/thread.h
++++ libidn-1.33/lib/gltests/glthread/thread.h
+@@ -122,8 +122,6 @@
+    call to foo(...) in the same function.  To avoid this, we test the
+    address of a function in libpthread that we don't use.  */
+
+-#  pragma weak pthread_create
+-
+ #  ifdef __clang__
+   /* Without this, clang complains that pthread_sigmask is never declared.  */
+ #   include <signal.h>
diff -Nru libidn-1.33/debian/patches/series libidn-1.33/debian/patches/series
--- libidn-1.33/debian/patches/series   2017-12-11 20:13:42.000000000 -0200
+++ libidn-1.33/debian/patches/series   2020-06-10 02:39:16.000000000 -0300
@@ -2,3 +2,4 @@
 0002-Update-intprops.h-for-gcc-7-compatibility.patch
 0003-Increase-value-for-Wframe-larger-than-gcc-7.patch
 0004-Update-Makefile.gdoc-to-use-GDOC_BIN-instead-of-hard.patch
+0005-Fix-link-failure.patch