Accepting request 826687 from graphics
OBS-URL: https://build.opensuse.org/request/show/826687 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gifsicle?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
221d242083
@ -1,40 +0,0 @@
|
||||
From e2d5c01a9c7022003135888c85b3255226e4cf98 Mon Sep 17 00:00:00 2001
|
||||
From: Eddie Kohler <ekohler@gmail.com>
|
||||
Date: Sun, 8 Apr 2018 15:15:56 -0400
|
||||
Subject: [PATCH] Fix #130 (gifdiff null pointer deref).
|
||||
|
||||
---
|
||||
src/gifdiff.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gifdiff.c b/src/gifdiff.c
|
||||
index ade1e1e..abc0142 100644
|
||||
--- a/src/gifdiff.c
|
||||
+++ b/src/gifdiff.c
|
||||
@@ -61,9 +61,8 @@ static Clp_Parser* clp;
|
||||
static void
|
||||
combine_colormaps(Gif_Colormap *gfcm, Gif_Colormap *newcm)
|
||||
{
|
||||
- int i;
|
||||
- if (!gfcm) return;
|
||||
- for (i = 0; i < gfcm->ncol; i++) {
|
||||
+ int i, gfcm_ncol = gfcm ? gfcm->ncol : 0;
|
||||
+ for (i = 0; i < gfcm_ncol; i++) {
|
||||
Gif_Color *c = &gfcm->col[i];
|
||||
c->pixel = Gif_AddColor(newcm, c, 1);
|
||||
}
|
||||
@@ -116,11 +115,12 @@ apply_image(int is_second, Gif_Stream *gfs, int imageno, uint16_t background)
|
||||
uint16_t *data = gdata[is_second];
|
||||
uint16_t *last = glast[is_second];
|
||||
Gif_Colormap *gfcm = gfi->local ? gfi->local : gfs->global;
|
||||
+ int gfcm_ncol = gfcm ? gfcm->ncol : 0;
|
||||
|
||||
/* set up colormap */
|
||||
- for (i = 0; i < gfcm->ncol; ++i)
|
||||
+ for (i = 0; i < gfcm_ncol; ++i)
|
||||
map[i] = gfcm->col[i].pixel;
|
||||
- for (i = gfcm->ncol; i < 256; ++i)
|
||||
+ for (i = gfcm_ncol; i < 256; ++i)
|
||||
map[i] = 1;
|
||||
if (gfi->transparent >= 0 && gfi->transparent < 256)
|
||||
map[gfi->transparent] = TRANSP;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0a4ee602aa244cdcdd86a250a6b39c94d8343cf526b8fae862d8a0efc337a800
|
||||
size 571588
|
||||
3
gifsicle-1.92.tar.gz
Normal file
3
gifsicle-1.92.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5ab556c01d65fddf980749e3ccf50b7fd40de738b6df679999294cc5fabfce65
|
||||
size 575199
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 14 13:49:25 UTC 2020 - Manfred Schwarb <manfred99@gmx.ch>
|
||||
|
||||
- unbreak fedora builds
|
||||
- unbreak SLE_12_SP3_Backports which is still a target for graphics project
|
||||
- add package group indication, without it we get noisy errors on non-factory targets
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 9 21:15:27 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
|
||||
|
||||
- Update to version 1.92
|
||||
* Add `--lossy` option from Kornel Lipiński.
|
||||
* Remove an assertion failure possible with
|
||||
`--conserve-memory` + `--colors` + `--careful`.
|
||||
- Drop fix_gifdiff_null_pointer_deref.patch fixed upstream
|
||||
- Run spec-cleaner
|
||||
* Remove package groups
|
||||
* Use make macros
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 16 22:40:09 UTC 2018 - manfred99@gmx.ch
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gifsicle
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,26 +12,25 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: gifsicle
|
||||
Version: 1.91
|
||||
Version: 1.92
|
||||
Release: 0
|
||||
Summary: Creating and editing GIF images and animations
|
||||
License: GPL-2.0-only
|
||||
Group: Productivity/Graphics/Other
|
||||
URL: https://www.lcdf.org/gifsicle/
|
||||
Source: https://www.lcdf.org/gifsicle/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM fix_gifdiff_null_pointer_deref.patch
|
||||
Patch0: fix_gifdiff_null_pointer_deref.patch
|
||||
Obsoletes: ungifsicle < %{version}
|
||||
Provides: ungifsicle = %{version}
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(x11)
|
||||
Obsoletes: ungifsicle < %{version}
|
||||
Provides: ungifsicle = %{version}
|
||||
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
|
||||
BuildRequires: perl-Time-HiRes
|
||||
%define ext_man .gz
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -52,8 +51,7 @@ gifdiff compares two GIFs for identical visual
|
||||
appearance.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -71,8 +69,8 @@ make %{?_smp_mflags} check
|
||||
%{_bindir}/gifdiff
|
||||
%{_bindir}/gifsicle
|
||||
%{_bindir}/gifview
|
||||
%{_mandir}/man1/gifdiff.1*
|
||||
%{_mandir}/man1/gifsicle.1*
|
||||
%{_mandir}/man1/gifview.1*
|
||||
%{_mandir}/man1/gifdiff.1%{?ext_man}
|
||||
%{_mandir}/man1/gifsicle.1%{?ext_man}
|
||||
%{_mandir}/man1/gifview.1%{?ext_man}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user