Bug#1066963: xmorph: diff for NMU version 1:20150712-5.1

[Francisco Vilmar Cardoso Ruviaro]

Control: tags 1066963 + patch
Control: tags 1066963 + pending


Dear maintainer,

I've prepared an NMU for xmorph (versioned as 1:20150712-5.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer or cancel the NMU.

Regards.


diff -Nru xmorph-20150712/debian/changelog xmorph-20150712/debian/changelog
--- xmorph-20150712/debian/changelog	2024-03-10 13:01:28.000000000 +0000
+++ xmorph-20150712/debian/changelog	2024-06-19 15:42:19.000000000 +0000
@@ -1,8 +1,17 @@
+xmorph (1:20150712-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/patches/Fix-implicit-function-declaration.patch.
+    Thanks to Shengjing Zhu <shengjing.zhu at canonical.com>. (Closes: #1066963)
+
+ -- Francisco Vilmar Cardoso Ruviaro <vilmar at debian.org>  Wed, 19 Jun 2024 15:42:19 +0000
+
 xmorph (1:20150712-5) unstable; urgency=medium
 
   * Team upload.
   * Tighten xmorph/libmorph dependency. libmorph has no other reverse
     dependencies but is involved in the t64 transition. Closes: #1063316
+  * respect_LDFLAGS.diff: Respect LDFLAGS setting.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 10 Mar 2024 14:01:28 +0100
 
diff -Nru xmorph-20150712/debian/patches/Fix-implicit-function-declaration.patch xmorph-20150712/debian/patches/Fix-implicit-function-declaration.patch
--- xmorph-20150712/debian/patches/Fix-implicit-function-declaration.patch	1970-01-01 00:00:00.000000000 +0000
+++ xmorph-20150712/debian/patches/Fix-implicit-function-declaration.patch	2024-06-19 15:39:51.000000000 +0000
@@ -0,0 +1,44 @@
+Description: Fix implicit function declaration.
+Author: Shengjing Zhu <shengjing.zhu at canonical.com>
+Bug-Debian: https://bugs.debian.org/1066963
+Forwarded: not-needed
+Reviewed-By: Francisco Vilmar Cardoso Ruviaro <vilmar at debian.org>
+Last-Update: 2024-06-19
+
+--- a/libmorph/RgbaImage.c
++++ b/libmorph/RgbaImage.c
+@@ -933,6 +933,7 @@ rgbaImageTestCreate(RgbaImageT *self, in
+ 
+ #include "mesh.h"
+ #include "warp.h"
++#include "warp2.h"
+ 
+ 
+ int
+--- a/libmorph/relax.c
++++ b/libmorph/relax.c
+@@ -1,5 +1,6 @@
+ 
+ #include "stdio.h"
++#include "stdlib.h"
+ 
+ #include "mesh.h"
+ 
+--- a/morph/Makefile.am
++++ b/morph/Makefile.am
+@@ -12,4 +12,4 @@ morph_LDADD =   $(INTLLIBS)  ../libmorph
+ 
+ morph_SOURCES =    main.c
+ 
+-morph_CFLAGS = $(CFLAGS)  -DNDEBUG_LIBMORPH_REF_COUNT
++morph_CFLAGS = $(CFLAGS) $(CFLAGS_CONF) -DNDEBUG_LIBMORPH_REF_COUNT
+--- a/xmorph/sequence.c
++++ b/xmorph/sequence.c
+@@ -28,6 +28,7 @@ int prog_nsteps = 0;
+ #include "diw_map.h"
+ #include "mjg_dialog.h"
+ #include "warp.h"
++#include "warp2.h"
+ #include "mesh.h"
+ #include "RgbaImage.h"
+ #include "image_diw.h"
diff -Nru xmorph-20150712/debian/patches/series xmorph-20150712/debian/patches/series
--- xmorph-20150712/debian/patches/series	2024-03-10 13:01:28.000000000 +0000
+++ xmorph-20150712/debian/patches/series	2024-06-19 15:40:00.000000000 +0000
@@ -1 +1,2 @@
 respect_LDFLAGS.diff
+Fix-implicit-function-declaration.patch

-- 
Francisco Vilmar Cardoso Ruviaro <vilmar at debian.org>
4096R: 1B8C F656 EF3B 8447 2F48 F0E7 82FB F706 0B2F 7D00
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xmorph-1:20150712-5.1-nmu.diff
Type: text/x-patch
Size: 2728 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-phototools-devel/attachments/20240619/ac4a3cae/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-phototools-devel/attachments/20240619/ac4a3cae/attachment-0001.sig>