DEB compiz: Fix several causes of FTBFS.

+ compatibility with libpng >= 1.4
+ incompatible pointer types in scandir
+ implicit declaration for malloc and free

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

5 files changed, 120 insertions, 0 deletions

diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog
index 214b8ddd..fd3ce7b9 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog
@@ -1,3 +1,12 @@
+compiz-trinity (0.8.4-3debian13.0.0+11~a) trixie; urgency=low
+
+  * Fix several causes of FTBFS.
+    + compatibility with libpng >= 1.4
+    + incompatible pointer types in scandir
+    + implicit declaration for malloc and free
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Mon, 16 Sep 2024 16:37:39 +0200
+
 compiz-trinity (0.8.4-3debian13.0.0+10~a) trixie; urgency=low
 
   * updates-2024/04: ensure compliance with r14.1.x branch.
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/103-png-1.4-compatibility.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/103-png-1.4-compatibility.diff
new file mode 100644
index 00000000..a47a97f9
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/103-png-1.4-compatibility.diff
@@ -0,0 +1,18 @@
+Index: compiz-trinity-0.8.4/plugins/png.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/plugins/png.c
++++ compiz-trinity-0.8.4/plugins/png.c
+@@ -102,7 +102,13 @@ readPngData (png_struct	*png,
+ 
+     /* expand gray bit depth if needed */
+     if (color_type == PNG_COLOR_TYPE_GRAY && depth < 8)
++    {
++#    if PNG_LIBPNG_VER >= 10400
++	png_set_expand_gray_1_2_4_to_8 (png);
++#    else
+ 	png_set_gray_1_2_4_to_8 (png);
++#    endif
++    }
+ 
+     /* transform transparency to alpha */
+     if (png_get_valid(png, info, PNG_INFO_tRNS))
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/104-incompabible-pointer-types.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/104-incompabible-pointer-types.diff
new file mode 100644
index 00000000..7b021749
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/104-incompabible-pointer-types.diff
@@ -0,0 +1,18 @@
+Index: compiz-trinity-0.8.4/plugins/screenshot.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/plugins/screenshot.c
++++ compiz-trinity-0.8.4/plugins/screenshot.c
+@@ -179,11 +179,9 @@ shotFilter (const struct dirent *d)
+ }
+ 
+ static int
+-shotSort (const void *_a,
+-	  const void *_b)
++shotSort (const struct dirent **a,
++	  const struct dirent **b)
+ {
+-    struct dirent **a = (struct dirent **) _a;
+-    struct dirent **b = (struct dirent **) _b;
+     int		  al = strlen ((*a)->d_name);
+     int		  bl = strlen ((*b)->d_name);
+ 
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/105-malloc-free-implicit-declaration.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/105-malloc-free-implicit-declaration.diff
new file mode 100644
index 00000000..5fa0a37d
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/105-malloc-free-implicit-declaration.diff
@@ -0,0 +1,72 @@
+Index: compiz-trinity-0.8.4/plugins/commands.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/plugins/commands.c
++++ compiz-trinity-0.8.4/plugins/commands.c
+@@ -23,6 +23,7 @@
+  * Author: Danny Baumann <dannybaumann@web.de>
+  */
+ 
++#include <stdlib.h>
+ #include <compiz-core.h>
+ 
+ static CompMetadata commandsMetadata;
+Index: compiz-trinity-0.8.4/plugins/cube.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/plugins/cube.c
++++ compiz-trinity-0.8.4/plugins/cube.c
+@@ -24,6 +24,7 @@
+  *         Mirco Müller <macslow@bangang.de> (Skydome support)
+  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+ 
+Index: compiz-trinity-0.8.4/plugins/gnomecompat.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/plugins/gnomecompat.c
++++ compiz-trinity-0.8.4/plugins/gnomecompat.c
+@@ -23,6 +23,7 @@
+  * Author: Danny Baumann <dannybaumann@web.de>
+  */
+ 
++#include <stdlib.h>
+ #include <compiz-core.h>
+ 
+ static CompMetadata gnomeMetadata;
+Index: compiz-trinity-0.8.4/plugins/obs.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/plugins/obs.c
++++ compiz-trinity-0.8.4/plugins/obs.c
+@@ -23,6 +23,7 @@
+  * Author: Danny Baumann <dannybaumann@web.de>
+  */
+ 
++#include <stdlib.h>
+ #include <compiz-core.h>
+ 
+ static CompMetadata obsMetadata;
+Index: compiz-trinity-0.8.4/src/core.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/src/core.c
++++ compiz-trinity-0.8.4/src/core.c
+@@ -23,6 +23,7 @@
+  * Author: David Reveman <davidr@novell.com>
+  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <compiz-core.h>
+Index: compiz-trinity-0.8.4/src/metadata.c
+===================================================================
+--- compiz-trinity-0.8.4.orig/src/metadata.c
++++ compiz-trinity-0.8.4/src/metadata.c
+@@ -25,6 +25,7 @@
+  *          David Reveman <davidr@novell.com>
+  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <libxml/tree.h>
+ #include <libxml/xpath.h>
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series
index e45755d8..0d367dca 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series
@@ -23,3 +23,6 @@ kubuntu_04_trinity.patch
 100-tde-r14.patch
 101-build-without-gconf.patch
 102-update-tqt-202404.patch
+103-png-1.4-compatibility.diff
+104-incompabible-pointer-types.diff
+105-malloc-free-implicit-declaration.diff