Hello community, here is the log from the commit of package swftools for openSUSE:Factory checked in at 2015-01-30 17:49:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swftools (Old) and /work/SRC/openSUSE:Factory/.swftools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swftools" Changes: -------- --- /work/SRC/openSUSE:Factory/swftools/swftools.changes 2014-08-06 15:32:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.swftools.new/swftools.changes 2015-01-30 17:50:17.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 29 12:57:35 UTC 2015 - dimstar@opensuse.org + +- Update 0001-build-support-for-giflib-5.x.patch: cope with + giflib 5.1 API change (DGifCloseFile now takes two parameters). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swftools.spec ++++++ --- /var/tmp/diff_new_pack.NwdM3L/_old 2015-01-30 17:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.NwdM3L/_new 2015-01-30 17:50:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package swftools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ 0001-build-support-for-giflib-5.x.patch ++++++ --- /var/tmp/diff_new_pack.NwdM3L/_old 2015-01-30 17:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.NwdM3L/_new 2015-01-30 17:50:19.000000000 +0100 @@ -8,11 +8,11 @@ src/gif2swf.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) -diff --git a/src/gif2swf.c b/src/gif2swf.c -index 2359da5..5e52ea8 100644 ---- a/src/gif2swf.c -+++ b/src/gif2swf.c -@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx) +Index: swftools-0.9.2/src/gif2swf.c +=================================================================== +--- swftools-0.9.2.orig/src/gif2swf.c ++++ swftools-0.9.2/src/gif2swf.c +@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c GifFileType *gft; FILE *fi; @@ -20,7 +20,7 @@ if ((fi = fopen(sname, "rb")) == NULL) { if (VERBOSE(1)) -@@ -230,13 +231,22 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx) +@@ -230,13 +231,22 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c } fclose(fi); @@ -45,7 +45,19 @@ return t; } -@@ -465,6 +475,7 @@ int CheckInputFile(char *fname, char **realname) +@@ -455,7 +465,11 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + + free(pal); + free(imagedata); ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ DGifCloseFile(gft, NULL); ++#else + DGifCloseFile(gft); ++#endif + + return t; + } +@@ -465,6 +479,7 @@ int CheckInputFile(char *fname, char **r FILE *fi; char *s = malloc(strlen(fname) + 5); GifFileType *gft; @@ -53,7 +65,7 @@ if (!s) exit(2); -@@ -488,7 +499,12 @@ int CheckInputFile(char *fname, char **realname) +@@ -488,7 +503,12 @@ int CheckInputFile(char *fname, char **r } fclose(fi); @@ -67,7 +79,7 @@ fprintf(stderr, "%s is not a GIF file!\n", fname); return -1; } -@@ -498,8 +514,12 @@ int CheckInputFile(char *fname, char **realname) +@@ -498,8 +518,12 @@ int CheckInputFile(char *fname, char **r if (global.max_image_height < gft->SHeight) global.max_image_height = gft->SHeight; @@ -81,6 +93,15 @@ return -1; } // After DGifSlurp() call, gft->ImageCount become available --- -1.8.2 - +@@ -518,7 +542,11 @@ int CheckInputFile(char *fname, char **r + fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0); + } + ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ DGifCloseFile(gft, NULL); ++#else + DGifCloseFile(gft); ++#endif + + return 0; + } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org