Hello community, here is the log from the commit of package leptonica for openSUSE:Factory checked in at 2013-03-18 07:07:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leptonica (Old) and /work/SRC/openSUSE:Factory/.leptonica.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leptonica", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/leptonica/leptonica.changes 2012-08-28 20:47:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leptonica.new/leptonica.changes 2013-03-18 07:07:05.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 12 22:17:39 UTC 2013 - [email protected] + +- fix build with giflib-5.x, leptonica-1.69-giflib5.patch + +------------------------------------------------------------------- New: ---- leptonica-1.69-giflib5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leptonica.spec ++++++ --- /var/tmp/diff_new_pack.1IozGy/_old 2013-03-18 07:07:07.000000000 +0100 +++ /var/tmp/diff_new_pack.1IozGy/_new 2013-03-18 07:07:07.000000000 +0100 @@ -1,7 +1,8 @@ # # spec file for package leptonica # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +31,7 @@ # PATCH-FIX-UPSTREAM liblept-1.69-no_return.patch [email protected] -- fix no-return-in-nonvoid-function error # Reported upstream: http://code.google.com/p/leptonica/issues/detail?id=69 Patch0: liblept-1.69-no_return.patch +Patch1: leptonica-1.69-giflib5.patch BuildRequires: giflib-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -68,6 +70,7 @@ %prep %setup -q %patch -P 0 -p0 +%patch1 -p1 %build %configure \ ++++++ leptonica-1.69-giflib5.patch ++++++ diff --git a/src/gifio.c b/src/gifio.c index f653ae2..e086380 100644 --- a/src/gifio.c +++ b/src/gifio.c @@ -100,7 +100,11 @@ SavedImage si; _lseek(fd, 0, SEEK_SET); #endif /* _MSC_VER */ +#if GIFLIB_MAJOR < 5 if ((gif = DGifOpenFileHandle(fd)) == NULL) +#else + if ((gif = DGifOpenFileHandle(fd, NULL)) == NULL) +#endif return (PIX *)ERROR_PTR("invalid file or file not found", procName, NULL); @@ -316,6 +320,10 @@ GifByteType *gif_line; } /* Save the cmap colors in a gif_cmap */ +#if GIFLIB_MAJOR >= 5 +#define MakeMapObject GifMakeMapObject +#define FreeMapObject GifFreeMapObject +#endif if ((gif_cmap = MakeMapObject(gif_ncolor, NULL)) == NULL) { pixDestroy(&pixd); return ERROR_INT("failed to create GIF color map", procName, 1); @@ -337,7 +345,11 @@ GifByteType *gif_line; } /* Get the gif file handle */ +#if GIFLIB_MAJOR < 5 if ((gif = EGifOpenFileHandle(fd)) == NULL) { +#else + if ((gif = EGifOpenFileHandle(fd, NULL)) == NULL) { +#endif pixDestroy(&pixd); FreeMapObject(gif_cmap); return ERROR_INT("failed to create GIF image handle", procName, 1); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
