# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1574420238 -3600
# Node ID 73968a7f1da913642e3001017e053bc72210c627
# Parent  b753ca9ee288ee878193f274d66caba159cab20e
imlib: add patch for giflib >= 5 api

diff -r b753ca9ee288 -r 73968a7f1da9 imlib/receipt
--- a/imlib/receipt	Fri Nov 22 10:49:44 2019 +0100
+++ b/imlib/receipt	Fri Nov 22 11:57:18 2019 +0100
@@ -17,9 +17,7 @@
 compile_rules()
 {
 	# Update for giflib >= 5 api
-	sed -i 's|DGifOpenFileHandle(fd|&,NULL|' */*.c
-	sed -i 's|DGifCloseFile(gif|&,NULL|' */*.c
-	sed -i 's|PrintGifError()|fprintf(stderr, "GIF-LIB error\n")|' */*.c
+	patch -p0 < $stuff/giflib5.u
 
 	./configure \
 		--prefix=/usr \
diff -r b753ca9ee288 -r 73968a7f1da9 imlib/stuff/giflib5.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imlib/stuff/giflib5.u	Fri Nov 22 11:57:18 2019 +0100
@@ -0,0 +1,122 @@
+--- gdk_imlib/io-gif.c
++++ gdk_imlib/io-gif.c
+@@ -10,6 +10,15 @@
+ #else
+ #include <gif_lib.h>
+ 
++static int ErrorCode;
++static void PrintGifError(void)
++{
++	char *Err = GifErrorString(ErrorCode);
++	if (Err != NULL)
++		fprintf(stderr, "GIF-LIB error: %s.\n", Err);
++	else	fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode);
++}
++
+ unsigned char      *
+ loader_gif(FILE *f, int *w, int *h, int *t)
+ {
+@@ -30,7 +39,7 @@
+   fd = fileno(f);
+   /* Apparently rewind(f) isn't sufficient */
+   lseek(fd, (long) 0, 0);
+-  gif = DGifOpenFileHandle(fd);
++  gif = DGifOpenFileHandle(fd, &ErrorCode);
+ 
+   transp = -1;
+   data = NULL;
+@@ -62,13 +71,13 @@
+ 	  rows = malloc(*h * sizeof(GifRowType *));
+ 	  if (!rows)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      return NULL;
+ 	    }
+ 	  data = _gdk_malloc_image(*w, *h);
+ 	  if (!data)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      free(rows);
+ 	      return NULL;
+ 	    }
+@@ -79,7 +88,7 @@
+ 	      rows[i] = malloc(*w * sizeof(GifPixelType));
+ 	      if (!rows[i])
+ 		{
+-		  DGifCloseFile(gif);
++		  DGifCloseFile(gif, NULL);
+ 		  for (i = 0; i < *h; i++)
+ 		    if (rows[i])
+ 		      free(rows[i]);
+@@ -168,7 +177,7 @@
+ 	    }
+ 	}
+     }
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   for (i = 0; i < *h; i++)
+     free(rows[i]);
+   free(rows);
+--- Imlib/load.c
++++ Imlib/load.c
+@@ -420,6 +420,15 @@
+ #endif /* HAVE_LIBTIFF */
+ 
+ #ifdef HAVE_LIBGIF
++static int ErrorCode;
++static void PrintGifError(void)
++{
++	char *Err = GifErrorString(ErrorCode);
++	if (Err != NULL)
++		fprintf(stderr, "GIF-LIB error: %s.\n", Err);
++	else	fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode);
++}
++
+ unsigned char      *
+ _LoadGIF(ImlibData * id, FILE *f, int *w, int *h, int *t)
+ {
+@@ -443,7 +452,7 @@
+   fd = fileno(f);
+   /* Apparently rewind(f) isn't sufficient */
+   lseek(fd, (long) 0, 0);
+-  gif = DGifOpenFileHandle(fd);
++  gif = DGifOpenFileHandle(fd, &ErrorCode);
+ 
+   if (!gif)
+     return NULL;
+@@ -470,13 +479,13 @@
+ 	  rows = malloc(*h * sizeof(GifRowType *));
+ 	  if (!rows)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      return NULL;
+ 	    }
+ 	  data = _imlib_malloc_image(*w, *h);
+ 	  if (!data)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      free(rows);
+ 	      return NULL;
+ 	    }
+@@ -487,7 +496,7 @@
+ 	      rows[i] = malloc(*w * sizeof(GifPixelType));
+ 	      if (!rows[i])
+ 		{
+-		  DGifCloseFile(gif);
++		  DGifCloseFile(gif, NULL);
+ 		  for (i = 0; i < *h; i++)
+ 		    if (rows[i])
+ 		      free(rows[i]);
+@@ -576,7 +585,7 @@
+ 	    }
+ 	}
+     }
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   for (i = 0; i < *h; i++)
+     free(rows[i]);
+   free(rows);
diff -r b753ca9ee288 -r 73968a7f1da9 lxpanel-dev/receipt
--- a/lxpanel-dev/receipt	Fri Nov 22 10:49:44 2019 +0100
+++ b/lxpanel-dev/receipt	Fri Nov 22 11:57:18 2019 +0100
@@ -11,7 +11,7 @@
 HOST_ARCH="i486 arm"
 
 WANTED="lxpanel"
-DEPENDS="pkg-config"
+DEPENDS="pkg-config libfm-dev lxpanel"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r b753ca9ee288 -r 73968a7f1da9 unison/receipt
--- a/unison/receipt	Fri Nov 22 10:49:44 2019 +0100
+++ b/unison/receipt	Fri Nov 22 11:57:18 2019 +0100
@@ -15,7 +15,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	CFLAGS="" make UISTYLE=text unison
+	CFLAGS="" make -j 4 UISTYLE=text unison
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.