Hello community,
here is the log from the commit of package mtpaint for openSUSE:Factory checked
in at 2014-08-20 10:51:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mtpaint (Old)
and /work/SRC/openSUSE:Factory/.mtpaint.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtpaint"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mtpaint/mtpaint.changes 2013-03-22
21:06:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mtpaint.new/mtpaint.changes 2014-08-20
10:51:38.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Aug 19 03:22:02 UTC 2014 - jeng...@inai.de
+
+- Augment mtpaint-3.40-giflib5.diff to support giflib7 API
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mtpaint.spec ++++++
--- /var/tmp/diff_new_pack.blrS52/_old 2014-08-20 10:51:39.000000000 +0200
+++ /var/tmp/diff_new_pack.blrS52/_new 2014-08-20 10:51:39.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mtpaint
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany.
#
# All modifications and additions to the file contributed by third parties
++++++ mtpaint-3.40-giflib5.diff ++++++
--- /var/tmp/diff_new_pack.blrS52/_old 2014-08-20 10:51:39.000000000 +0200
+++ /var/tmp/diff_new_pack.blrS52/_new 2014-08-20 10:51:39.000000000 +0200
@@ -1,8 +1,25 @@
-diff --git a/src/png.c b/src/png.c
-index 2b30821..e2ecf8f 100644
---- a/src/png.c
-+++ b/src/png.c
-@@ -1509,8 +1509,11 @@ static int load_gif_frames(char *file_name,
ani_settings *ani)
+---
+ src/png.c | 35 ++++++++++++++++++++++++++++++-----
+ 1 file changed, 30 insertions(+), 5 deletions(-)
+
+Index: mtpaint-3.40/src/png.c
+===================================================================
+--- mtpaint-3.40.orig/src/png.c
++++ mtpaint-3.40/src/png.c
+@@ -57,6 +57,12 @@
+ #include <lcms.h>
+ #endif
+
++#if defined(GIFLIB_MAJOR) && \
++ (GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR < 1))
++# define DGifCloseFile(a, b) DGifCloseFile(a)
++# define EGifCloseFile(a, b) EGifCloseFile(a)
++#endif
++
+ #include "global.h"
+
+ #include "mygtk.h"
+@@ -1509,8 +1515,11 @@ static int load_gif_frames(char *file_na
ls_settings w_set, init_set;
int res, val, disposal, bpp, cmask, lastzero = FALSE;
@@ -15,7 +32,16 @@
/* Init state structure */
memset(&stat, 0, sizeof(stat));
-@@ -1621,7 +1624,11 @@ static int load_gif(char *file_name, ls_settings
*settings)
+@@ -1608,7 +1617,7 @@ static int load_gif_frames(char *file_na
+ }
+ res = 1;
+ fail: mem_free_chanlist(w_set.img);
+- DGifCloseFile(giffy);
++ DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1621,7 +1630,11 @@ static int load_gif(char *file_name, ls_
int delay = settings->gif_delay, trans = -1;//, disposal = 0;
@@ -27,7 +53,16 @@
/* Get global palette */
settings->colors = convert_gif_palette(settings->pal, giffy->SColorMap);
-@@ -1682,10 +1689,17 @@ static int save_gif(char *file_name, ls_settings
*settings)
+@@ -1659,7 +1672,7 @@ static int load_gif(char *file_name, ls_
+ }
+ }
+ res = 1;
+-fail: DGifCloseFile(giffy);
++fail: DGifCloseFile(giffy, NULL);
+ return (res);
+ }
+
+@@ -1682,10 +1695,17 @@ static int save_gif(char *file_name, ls_
nc |= nc >> 1; nc |= nc >> 2; nc |= nc >> 4;
nc += !nc + 1; // No less than 2 colors
@@ -45,7 +80,15 @@
if (!giffy) goto fail0;
for (i = 0; i < settings->colors; i++)
-@@ -1732,7 +1746,12 @@ fail: EGifCloseFile(giffy);
+@@ -1725,14 +1745,19 @@ static int save_gif(char *file_name, ls_
+ if (!settings->silent) progress_end();
+ msg = 0;
+
+-fail: EGifCloseFile(giffy);
++fail: EGifCloseFile(giffy, NULL);
+ #ifndef WIN32
+ /* giflib creates files with 0600 permissions, which is nasty - WJ */
+ mode = umask(0022);
umask(mode);
chmod(file_name, 0666 & ~mode);
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
