Hello community,
here is the log from the commit of package xplanet for openSUSE:Factory checked
in at 2014-06-05 10:49:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xplanet (Old)
and /work/SRC/openSUSE:Factory/.xplanet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xplanet"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xplanet/xplanet.changes 2014-03-23
22:34:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xplanet.new/xplanet.changes 2014-06-05
10:50:02.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Jun 1 09:40:00 UTC 2014 - jeng...@inai.de
+
+- Update xplanet-giflib5.patch to support giflib7-5.1
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xplanet.spec ++++++
--- /var/tmp/diff_new_pack.j01WHM/_old 2014-06-05 10:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.j01WHM/_new 2014-06-05 10:50:04.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xplanet
#
-# 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
@@ -42,8 +42,8 @@
BuildRequires: libtiff-devel
BuildRequires: pango-devel
%if 0%{?suse_version} == 1110
-BuildRequires: xorg-x11-libICE-devel
BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-libICE-devel
#BuildRequires: XScrnSaver-devel
%else
BuildRequires: pkgconfig(ice)
++++++ xplanet-giflib5.patch ++++++
--- /var/tmp/diff_new_pack.j01WHM/_old 2014-06-05 10:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.j01WHM/_new 2014-06-05 10:50:04.000000000 +0200
@@ -1,19 +1,28 @@
-diff --git a/src/libimage/gif.c b/src/libimage/gif.c
-index 835bb20..6cfb040 100644
---- a/src/libimage/gif.c
-+++ b/src/libimage/gif.c
-@@ -23,6 +23,29 @@
+---
+ src/libimage/gif.c | 85
+++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 85 insertions(+)
+
+Index: xplanet-1.3.0/src/libimage/gif.c
+===================================================================
+--- xplanet-1.3.0.orig/src/libimage/gif.c
++++ xplanet-1.3.0/src/libimage/gif.c
+@@ -23,6 +23,35 @@
#include <gif_lib.h>
-+#if GIFLIB_MAJOR >= 5
++#if defined(GIFLIB_MAJOR)
++# if GIFLIB_MAOJR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)
++# define DGifCloseFile(x) DGifCloseFile(x, NULL)
++# define EGifCloseFile(x) EGifCloseFile(x, NULL)
++# endif
++# if GIFLIB_MAJOR >= 5
+/* old giflib did define TRUE/FALSE */
-+#ifndef TRUE
-+#define TRUE 1
-+#endif /* TRUE */
-+#ifndef FALSE
-+#define FALSE 0
-+#endif /* FALSE */
++# ifndef TRUE
++# define TRUE 1
++# endif /* TRUE */
++# ifndef FALSE
++# define FALSE 0
++# endif /* FALSE */
+
+static void
+gif_error(int err)
@@ -25,14 +34,15 @@
+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", err);
+}
+
-+#define QuantizeBuffer GifQuantizeBuffer
-+#define MakeMapObject GifMakeMapObject
++# define QuantizeBuffer GifQuantizeBuffer
++# define MakeMapObject GifMakeMapObject
++# endif
+#endif
+
/*
A lot of this is based on the gif2rgb and rgb2gif codes in the libungif
distribution.
-@@ -42,11 +65,20 @@ read_gif(const char *filename, int *width, int *height,
unsigned char **rgb)
+@@ -42,11 +71,20 @@ read_gif(const char *filename, int *widt
int color_index;
unsigned char *ptr = NULL;
@@ -53,7 +63,7 @@
return(0);
}
-@@ -54,7 +86,11 @@ read_gif(const char *filename, int *width, int *height,
unsigned char **rgb)
+@@ -54,7 +92,11 @@ read_gif(const char *filename, int *widt
{
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
{
@@ -65,7 +75,7 @@
return(0);
}
-@@ -63,7 +99,11 @@ read_gif(const char *filename, int *width, int *height,
unsigned char **rgb)
+@@ -63,7 +105,11 @@ read_gif(const char *filename, int *widt
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(infile) == GIF_ERROR)
{
@@ -77,7 +87,7 @@
return(0);
}
-@@ -107,14 +147,22 @@ read_gif(const char *filename, int *width, int *height,
unsigned char **rgb)
+@@ -107,14 +153,22 @@ read_gif(const char *filename, int *widt
GifByteType *ext;
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
{
@@ -100,7 +110,7 @@
return(0);
}
}
-@@ -166,6 +214,9 @@ write_gif(const char *filename, int width, int height,
char *rgb)
+@@ -166,6 +220,9 @@ write_gif(const char *filename, int widt
GifByteType *red, *green, *blue, *buffer, *ptr;
GifFileType *outfile;
ColorMapObject *colormap;
@@ -110,7 +120,7 @@
red = malloc(width * height * sizeof(GifByteType));
green = malloc(width * height * sizeof(GifByteType));
-@@ -190,7 +241,11 @@ write_gif(const char *filename, int width, int height,
char *rgb)
+@@ -190,7 +247,11 @@ write_gif(const char *filename, int widt
if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
buffer, colormap->Colors) == GIF_ERROR)
{
@@ -122,7 +132,7 @@
return(0);
}
-@@ -198,24 +253,40 @@ write_gif(const char *filename, int width, int height,
char *rgb)
+@@ -198,24 +259,40 @@ write_gif(const char *filename, int widt
free(green);
free(blue);
@@ -163,7 +173,7 @@
return(0);
}
-@@ -224,7 +295,11 @@ write_gif(const char *filename, int width, int height,
char *rgb)
+@@ -224,7 +301,11 @@ write_gif(const char *filename, int widt
{
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
{
@@ -175,7 +185,7 @@
return(0);
}
ptr += width;
-@@ -233,7 +308,11 @@ write_gif(const char *filename, int width, int height,
char *rgb)
+@@ -233,7 +314,11 @@ write_gif(const char *filename, int widt
EGifSpew(outfile);
if (EGifCloseFile(outfile) == GIF_ERROR)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
