Attachment #165769 for bug #206372

View | Details | Raw Unified | Return to bug 206372
Collapse All | Expand All

Lines 2-9 Link Here

(-)b/graphics/imlib2/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= imlib2	4	PORTNAME= imlib2
5	PORTVERSION= 1.4.6	5	PORTVERSION= 1.4.7
6	PORTREVISION= 7
7	PORTEPOCH= 2	6	PORTEPOCH= 2
8	CATEGORIES= graphics enlightenment	7	CATEGORIES= graphics enlightenment
9	MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}	8	MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}

Lines 1-2 Link Here

(-)b/graphics/imlib2/distinfo (-2 / +2 lines)
1	SHA256 (imlib2-1.4.6.tar.bz2) = af51be727d62cfcff7457c753f355e44848fb997f33a7e1d43775276a9073274	1	SHA256 (imlib2-1.4.7.tar.bz2) = 35d733ce23ad7d338cff009095d37e656cb8a7a53717d53793a38320f9924701
2	SIZE (imlib2-1.4.6.tar.bz2) = 872717	2	SIZE (imlib2-1.4.7.tar.bz2) = 889510

Removed Link Here

(-)a/graphics/imlib2/files/patch-imlib2-config.in (-11 lines)
1	--- imlib2-config.in.orig 2014-02-06 19:05:15.000000000 -0500
2	+++ imlib2-config.in 2014-02-06 19:05:35.000000000 -0500
3	@@ -46,7 +46,7 @@
4	;;
5	--libs)
6	libdirs=-L@libdir@
7	- echo $libdirs -lImlib2 @my_libs@
8	+ echo $libdirs -lImlib2
9	;;
10	*)
11	echo "${usage}" 1>&2




--- src/lib/common.h.orig	2010-12-14 19:39:16.000000000 -0800
+++ src/lib/common.h	2010-12-14 19:39:34.000000000 -0800
@@ -16,10 +16,12 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-#define __hidden __attribute__((visibility("hidden")))
-#else
-#define __hidden
+#ifndef __hidden
+# if defined(__GNUC__) && (__GNUC__ >= 4)
+#  define __hidden __attribute__((visibility("hidden")))
+# else
+#  define __hidden
+# endif
 #endif
 
 #define DATABIG unsigned long long




--- src/modules/loaders/loader_gif.c.orig	2013-12-21 10:16:10 UTC
+++ src/modules/loaders/loader_gif.c
@@ -36,7 +36,11 @@ load(ImlibImage * im, ImlibProgressFunct
 #endif
    if (fd < 0)
       return 0;
+#if GIFLIB_MAJOR >= 5
+   gif = DGifOpenFileHandle(fd, NULL);
+#else
    gif = DGifOpenFileHandle(fd);
+#endif
    if (!gif)
      {
         close(fd);
@@ -60,13 +64,21 @@ load(ImlibImage * im, ImlibProgressFunct
              h = gif->Image.Height;
              if (!IMAGE_DIMENSIONS_OK(w, h))
                {
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+                  DGifCloseFile(gif, NULL);
+#else
                   DGifCloseFile(gif);
+#endif
                   return 0;
                }
              rows = malloc(h * sizeof(GifRowType *));
              if (!rows)
                {
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+                  DGifCloseFile(gif, NULL);
+#else
                   DGifCloseFile(gif);
+#endif
                   return 0;
                }
              for (i = 0; i < h; i++)
@@ -78,7 +90,11 @@ load(ImlibImage * im, ImlibProgressFunct
                   rows[i] = malloc(w * sizeof(GifPixelType));
                   if (!rows[i])
                     {
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+                       DGifCloseFile(gif, NULL);
+#else
                        DGifCloseFile(gif);
+#endif
                        for (i = 0; i < h; i++)
                          {
                             if (rows[i])
@@ -150,7 +166,11 @@ load(ImlibImage * im, ImlibProgressFunct
         im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
         if (!im->data)
           {
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+             DGifCloseFile(gif, NULL);
+#else
              DGifCloseFile(gif);
+#endif
              free(rows);
              return 0;
           }
@@ -181,7 +201,11 @@ load(ImlibImage * im, ImlibProgressFunct
                        last_per = (int)per;
                        if (!(progress(im, (int)per, 0, last_y, w, i)))
                          {
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+                            DGifCloseFile(gif, NULL);
+#else
                             DGifCloseFile(gif);
+#endif
                             for (i = 0; i < h; i++)
                               {
                                  free(rows[i]);
@@ -198,7 +222,11 @@ load(ImlibImage * im, ImlibProgressFunct
      {
         progress(im, 100, 0, last_y, w, h);
      }
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+   DGifCloseFile(gif, NULL);
+#else
    DGifCloseFile(gif);
+#endif
    for (i = 0; i < h; i++)
      {
         free(rows[i]);

Lines 26-32 lib/imlib2/loaders/xpm.so Link Here

(-)b/graphics/imlib2/pkg-plist (-2 / +1 lines)
26	lib/imlib2/loaders/zlib.so	26	lib/imlib2/loaders/zlib.so
27	lib/libImlib2.so	27	lib/libImlib2.so
28	lib/libImlib2.so.1	28	lib/libImlib2.so.1
29	lib/libImlib2.so.1.4.6	29	lib/libImlib2.so.1.4.7
30	libdata/pkgconfig/imlib2.pc	30	libdata/pkgconfig/imlib2.pc
31	%%DATADIR%%/data/fonts/cinema.ttf	31	%%DATADIR%%/data/fonts/cinema.ttf
32	%%DATADIR%%/data/fonts/grunge.ttf	32	%%DATADIR%%/data/fonts/grunge.ttf
33	-

Return to bug 206372

Removed Link Here

(-)a/graphics/imlib2/files/patch-src_lib_common.h (-19 lines)
1	--- src/lib/common.h.orig 2010-12-14 19:39:16.000000000 -0800
2	+++ src/lib/common.h 2010-12-14 19:39:34.000000000 -0800
3	@@ -16,10 +16,12 @@
4	#include <sys/types.h>
5	#endif
6
7	-#if defined(__GNUC__) && (__GNUC__ >= 4)
8	-#define __hidden __attribute__((visibility("hidden")))
9	-#else
10	-#define __hidden
11	+#ifndef __hidden
12	+# if defined(__GNUC__) && (__GNUC__ >= 4)
13	+# define __hidden __attribute__((visibility("hidden")))
14	+# else
15	+# define __hidden
16	+# endif
17	#endif
18
19	#define DATABIG unsigned long long

Removed Link Here

(-)a/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c (-84 lines)
1	--- src/modules/loaders/loader_gif.c.orig 2013-12-21 10:16:10 UTC
2	+++ src/modules/loaders/loader_gif.c
3	@@ -36,7 +36,11 @@ load(ImlibImage * im, ImlibProgressFunct
4	#endif
5	if (fd < 0)
6	return 0;
7	+#if GIFLIB_MAJOR >= 5
8	+ gif = DGifOpenFileHandle(fd, NULL);
9	+#else
10	gif = DGifOpenFileHandle(fd);
11	+#endif
12	if (!gif)
13	{
14	close(fd);
15	@@ -60,13 +64,21 @@ load(ImlibImage * im, ImlibProgressFunct
16	h = gif->Image.Height;
17	if (!IMAGE_DIMENSIONS_OK(w, h))
18	{
19	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
20	+ DGifCloseFile(gif, NULL);
21	+#else
22	DGifCloseFile(gif);
23	+#endif
24	return 0;
25	}
26	rows = malloc(h * sizeof(GifRowType *));
27	if (!rows)
28	{
29	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
30	+ DGifCloseFile(gif, NULL);
31	+#else
32	DGifCloseFile(gif);
33	+#endif
34	return 0;
35	}
36	for (i = 0; i < h; i++)
37	@@ -78,7 +90,11 @@ load(ImlibImage * im, ImlibProgressFunct
38	rows[i] = malloc(w * sizeof(GifPixelType));
39	if (!rows[i])
40	{
41	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
42	+ DGifCloseFile(gif, NULL);
43	+#else
44	DGifCloseFile(gif);
45	+#endif
46	for (i = 0; i < h; i++)
47	{
48	if (rows[i])
49	@@ -150,7 +166,11 @@ load(ImlibImage * im, ImlibProgressFunct
50	im->data = (DATA32 ) malloc(sizeof(DATA32) w * h);
51	if (!im->data)
52	{
53	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
54	+ DGifCloseFile(gif, NULL);
55	+#else
56	DGifCloseFile(gif);
57	+#endif
58	free(rows);
59	return 0;
60	}
61	@@ -181,7 +201,11 @@ load(ImlibImage * im, ImlibProgressFunct
62	last_per = (int)per;
63	if (!(progress(im, (int)per, 0, last_y, w, i)))
64	{
65	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
66	+ DGifCloseFile(gif, NULL);
67	+#else
68	DGifCloseFile(gif);
69	+#endif
70	for (i = 0; i < h; i++)
71	{
72	free(rows[i]);
73	@@ -198,7 +222,11 @@ load(ImlibImage * im, ImlibProgressFunct
74	{
75	progress(im, 100, 0, last_y, w, h);
76	}
77	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
78	+ DGifCloseFile(gif, NULL);
79	+#else
80	DGifCloseFile(gif);
81	+#endif
82	for (i = 0; i < h; i++)
83	{
84	free(rows[i]);