[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

2019-12-23 Thread David Seifert 
commit: ad89ce5110985e70d7eeed72a94f5de907bfb76f
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec 23 23:20:17 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 23 23:20:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad89ce51

media-libs/giflib: Remove old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 media-libs/giflib/Manifest |  4 --
 media-libs/giflib/files/giflib-4.1.6-gif2rle.patch | 18 -
 .../giflib-4.1.6-giffix-null-Extension-fix.patch   | 15 -
 media-libs/giflib/files/giflib-5.1.8-gentoo.patch  | 16 -
 media-libs/giflib/giflib-4.1.6-r3.ebuild   | 54 ---
 media-libs/giflib/giflib-5.0.6.ebuild  | 42 
 media-libs/giflib/giflib-5.1.8-r1.ebuild   | 77 --
 media-libs/giflib/giflib-5.1.9.ebuild  | 77 --
 media-libs/giflib/metadata.xml |  3 -
 9 files changed, 306 deletions(-)

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index d53ffb9540f..a6794c6fbe7 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,6 +1,2 @@
-DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 
154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150
 SHA512 
f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
-DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B 
ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9
 SHA512 
117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 
5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4
 SHA512 
32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 
4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2
 SHA512 
d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
-DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 
0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650
 SHA512 
b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 
8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0
 SHA512 
4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736

diff --git a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch 
b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
deleted file mode 100644
index 95334016648..000
--- a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail=1829712_id=102202=631304
-
 giflib/util/gif2rle.c
-+++ giflib/util/gif2rle.c
-@@ -222,11 +222,8 @@
- ColorMap = (GifFile->Image.ColorMap ?
- GifFile->Image.ColorMap->Colors :
- GifFile->SColorMap->Colors);
--if (ColorMap == NULL) {
--fprintf(stderr, "Gif Image does not have a colormap\n");
--exit(EXIT_FAILURE);
--}
--ColorMapSize = 1 << ColorMap->BitsPerPixel;
-+ColorMapSize = 1 << (GifFile->Image.ColorMap ? 
GifFile->Image.ColorMap->BitsPerPixel :
-+  
GifFile->SColorMap->BitsPerPixel);
- DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
- 
- if (DGifCloseFile(GifFile) == GIF_ERROR) {

diff --git 
a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch 
b/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
deleted file mode 100644
index 3e99e66c0d1..000
--- a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c
 giflib-4.1.6/util/giffix.c 2005-10-09 23:22:23.0 -0700
-+++ giflib-4.1.6.new/util/giffix.c 2008-09-04 14:00:41.0 -0700
-@@ -181,8 +181,8 @@
-   /* Skip any extension blocks in file: */
-   if (DGifGetExtension(GifFileIn, , ) == 
GIF_ERROR)
-   QuitGifError(GifFileIn, GifFileOut);
--  if (EGifPutExtension(GifFileOut, ExtCode, Extension[0],
--

[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

2019-03-29 Thread Lars Wendler 
commit: effc90251925dee8691c22390de18c1d4c5dc857
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 29 17:08:46 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 29 17:11:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=effc9025

media-libs/giflib: Bump to version 5.1.9

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/giflib/Manifest|  1 +
 media-libs/giflib/files/giflib-5.1.9-gentoo.patch | 10 +++
 media-libs/giflib/giflib-5.1.9.ebuild | 77 +++
 3 files changed, 88 insertions(+)

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 3b00a85137b..968bc5d2cd3 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -3,3 +3,4 @@ DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B 
ae162c281755cae4d00bcbd07273f7c7488ae67
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 
5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4
 SHA512 
32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 DIST giflib-5.1.7.tar.gz 391525 BLAKE2B 
d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546
 SHA512 
b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
 DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 
4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2
 SHA512 
d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
+DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 
0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650
 SHA512 
b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184

diff --git a/media-libs/giflib/files/giflib-5.1.9-gentoo.patch 
b/media-libs/giflib/files/giflib-5.1.9-gentoo.patch
new file mode 100644
index 000..0cb20183bd8
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.9-gentoo.patch
@@ -0,0 +1,10 @@
+--- giflib-5.1.9/Makefile
 giflib-5.1.9/Makefile
+@@ -63,7 +63,6 @@
+ LDLIBS=libgif.a -lm
+ 
+ all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
+-  $(MAKE) -C doc
+ 
+ $(UTILS):: libgif.a libutil.a
+ 

diff --git a/media-libs/giflib/giflib-5.1.9.ebuild 
b/media-libs/giflib/giflib-5.1.9.ebuild
new file mode 100644
index 000..87eaf2bc700
--- /dev/null
+++ b/media-libs/giflib/giflib-5.1.9.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="https://sourceforge.net/projects/giflib/;
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-text/xmlto )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.1.9-gentoo.patch
+)
+
+src_prepare() {
+   default
+   multilib_copy_sources
+}
+
+multilib_src_compile() {
+   # Use reallocarray() from libc if available.
+   if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o 
"${T}/reallocarray_test" -x c - <<< $'#include \nint main() {void *p 
= reallocarray(NULL, 0, 0);}' 2> /dev/null; then
+   local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE 
-DHAVE_REALLOCARRAY"
+   sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
+   rm openbsd-reallocarray.c || die
+   fi
+
+   emake \
+   CC="$(tc-getCC)" \
+   CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
+   LDFLAGS="${LDFLAGS}" \
+   OFLAGS="" \
+   all
+
+   if use doc && multilib_is_native_abi; then
+   emake -C doc
+   fi
+}
+
+multilib_src_install() {
+   emake \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   install
+
+   if ! use static-libs ; then
+   find "${ED}" -name "*.a" -delete || die
+   fi
+
+   if use doc && multilib_is_native_abi; then
+   docinto html
+   dodoc doc/*.html
+   fi
+}
+
+multilib_src_install_all() {
+   docinto
+   dodoc ChangeLog NEWS README TODO
+   if use doc ; then
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

2019-03-18 Thread Lars Wendler 
commit: 03700281db70e961bde015ce8727d578afc9705b
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 18 07:31:20 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 18 07:32:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03700281

media-libs/giflib: Revbump to fix LDFLAGS and man page installation

Closes: https://bugs.gentoo.org/680826
Thanks-to: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/giflib/files/giflib-5.1.8-gentoo.patch | 8 +++-
 media-libs/giflib/{giflib-5.1.8.ebuild => giflib-5.1.8-r1.ebuild} | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch 
b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
index 225f1df1be5..90a72685d34 100644
--- a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
+++ b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
@@ -1,6 +1,6 @@
 --- giflib-5.1.8/Makefile
 +++ giflib-5.1.8/Makefile
-@@ -61,7 +61,6 @@
+@@ -61,12 +61,11 @@
  LDLIBS=libgif.a -lm
  
  all: libgif.so libgif.a $(UTILS)
@@ -8,3 +8,9 @@
  
  $(UTILS):: libgif.a
  
+ libgif.so: $(OBJECTS) $(HEADERS)
+-  $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) 
-o libgif.so $(OBJECTS)
++  $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname 
-Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+ 
+ libgif.a: $(OBJECTS) $(HEADERS)
+   $(AR) rcs libgif.a $(OBJECTS)

diff --git a/media-libs/giflib/giflib-5.1.8.ebuild 
b/media-libs/giflib/giflib-5.1.8-r1.ebuild
similarity index 97%
rename from media-libs/giflib/giflib-5.1.8.ebuild
rename to media-libs/giflib/giflib-5.1.8-r1.ebuild
index f84e6fa760a..e16390f179c 100644
--- a/media-libs/giflib/giflib-5.1.8.ebuild
+++ b/media-libs/giflib/giflib-5.1.8-r1.ebuild
@@ -50,7 +50,6 @@ multilib_src_install() {
DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-   MANDIR="${EPREFIX}/usr/share/man/man1" \
install
 
if ! use static-libs ; then

[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

2019-03-17 Thread Lars Wendler 
commit: c1f44464466602f94079a5e7cc0fcb3a338820a9
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Mar 17 20:01:32 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Mar 17 20:07:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f44464

media-libs/giflib: Bump to version 5.1.8

Closes: https://bugs.gentoo.org/680188
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/giflib/Manifest|  1 +
 media-libs/giflib/files/giflib-5.1.8-gentoo.patch | 10 +++
 media-libs/giflib/giflib-5.1.8.ebuild | 78 +++
 3 files changed, 89 insertions(+)

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 16fa3b5e19c..88fedc73955 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -3,3 +3,4 @@ DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B 
ae162c281755cae4d00bcbd07273f7c7488ae67
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 
5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4
 SHA512 
32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 DIST giflib-5.1.6.tar.gz 391894 BLAKE2B 
e961236459d7312b41668f19cfb26006af0f0dc1a9741abee3f00d8eeba0dceebe5b03709dfc8170c1b73a6687dd926c5ef92ac2817fe78ab65160e8012d9044
 SHA512 
a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be
 DIST giflib-5.1.7.tar.gz 391525 BLAKE2B 
d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546
 SHA512 
b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
+DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 
4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2
 SHA512 
d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3

diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch 
b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
new file mode 100644
index 000..225f1df1be5
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
@@ -0,0 +1,10 @@
+--- giflib-5.1.8/Makefile
 giflib-5.1.8/Makefile
+@@ -61,7 +61,6 @@
+ LDLIBS=libgif.a -lm
+ 
+ all: libgif.so libgif.a $(UTILS)
+-  $(MAKE) -C doc
+ 
+ $(UTILS):: libgif.a
+ 

diff --git a/media-libs/giflib/giflib-5.1.8.ebuild 
b/media-libs/giflib/giflib-5.1.8.ebuild
new file mode 100644
index 000..f84e6fa760a
--- /dev/null
+++ b/media-libs/giflib/giflib-5.1.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="https://sourceforge.net/projects/giflib/;
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-text/xmlto )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.1.8-gentoo.patch
+)
+
+src_prepare() {
+   default
+   multilib_copy_sources
+}
+
+multilib_src_compile() {
+   # Use reallocarray() from libc if available.
+   if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o 
"${T}/reallocarray_test" -x c - <<< $'#include \nint main() {void *p 
= reallocarray(NULL, 0, 0);}' 2> /dev/null; then
+   local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE 
-DHAVE_REALLOCARRAY"
+   sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
+   rm openbsd-reallocarray.c || die
+   fi
+
+   emake \
+   CC="$(tc-getCC)" \
+   CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
+   LDFLAGS="${LDFLAGS}" \
+   OFLAGS="" \
+   all
+
+   if use doc && multilib_is_native_abi; then
+   emake -C doc
+   fi
+}
+
+multilib_src_install() {
+   emake \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   MANDIR="${EPREFIX}/usr/share/man/man1" \
+   install
+
+   if ! use static-libs ; then
+   find "${ED}" -name "*.a" -delete || die
+   fi
+
+   if use doc && multilib_is_native_abi; then
+   docinto html
+   dodoc doc/*.html
+   fi
+}
+
+multilib_src_install_all() {
+   docinto
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

2019-03-17 Thread Lars Wendler 
commit: 5a00fe4ded1f99ae974e75267a0fd9f61b869e02
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Mar 17 20:02:52 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Mar 17 20:07:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a00fe4d

media-libs/giflib: Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/giflib/Manifest |   1 -
 .../files/giflib-5.1.4-reallocarray-export.patch   | 128 -
 media-libs/giflib/giflib-5.1.4-r2.ebuild   |  69 ---
 media-libs/giflib/giflib-5.1.6-r1.ebuild   |  78 -
 4 files changed, 276 deletions(-)

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 88fedc73955..3b00a85137b 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,6 +1,5 @@
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 
154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150
 SHA512 
f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B 
ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9
 SHA512 
117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 
5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4
 SHA512 
32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.6.tar.gz 391894 BLAKE2B 
e961236459d7312b41668f19cfb26006af0f0dc1a9741abee3f00d8eeba0dceebe5b03709dfc8170c1b73a6687dd926c5ef92ac2817fe78ab65160e8012d9044
 SHA512 
a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be
 DIST giflib-5.1.7.tar.gz 391525 BLAKE2B 
d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546
 SHA512 
b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
 DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 
4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2
 SHA512 
d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3

diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch 
b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
deleted file mode 100644
index 1c2a433c29c..000
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping 
-Date: Wed, 14 Mar 2018 21:18:14 +0100
-Subject: [PATCH] Address clash of export reallocarray with glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-.. by renaming the exported symbol and the related
-function in code and where it's used.
-
-Bug: https://bugs.gentoo.org/637438
-
-Compile error was:
-
-/usr/include/gif_lib.h:248:51: error: declaration of ‘void* 
reallocarray(void*, size_t, size_t)’ has a different exception specifier
- reallocarray(void *optr, size_t nmemb, size_t size);
-   ^
-[..]
-/usr/include/stdlib.h:443:14: error: from previous declaration ‘void* 
reallocarray(void*, size_t, size_t) throw ()’
- extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)

- lib/dgif_lib.c |  4 ++--
- lib/gif_lib.h  |  2 +-
- lib/gifalloc.c | 10 +-
- lib/openbsd-reallocarray.c |  2 +-
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
-index 66a1d6a..f0e0385 100644
 a/lib/dgif_lib.c
-+++ b/lib/dgif_lib.c
-@@ -396,7 +396,7 @@ DGifGetImageDesc(GifFileType *GifFile)
- 
- if (GifFile->SavedImages) {
- SavedImage* new_saved_images =
--(SavedImage *)reallocarray(GifFile->SavedImages,
-+(SavedImage *)openbsd_reallocarray(GifFile->SavedImages,
- (GifFile->ImageCount + 1), sizeof(SavedImage));
- if (new_saved_images == NULL) {
- GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
-@@ -1108,7 +1108,7 @@ DGifSlurp(GifFileType *GifFile)
-   if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
-   return GIF_ERROR;
-   }
--  sp->RasterBits = (unsigned char

[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/files/, media-libs/giflib/

2018-03-23 Thread Sebastian Pipping 
commit: 010e1c17d6268e0747b362d3ba81f1e17d9b9f9d
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri Mar 23 22:49:06 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri Mar 23 23:26:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=010e1c17

media-libs/giflib: Fix reallocarray export collision

Closes: https://bugs.gentoo.org/637438
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/giflib-5.1.4-reallocarray-export.patch   | 129 +
 media-libs/giflib/giflib-5.1.4-r1.ebuild   |  75 
 2 files changed, 204 insertions(+)

diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch 
b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
new file mode 100644
index 000..08d4f3d3d4e
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
@@ -0,0 +1,129 @@
+From 9805c76d4f76c77aad9f285e81f4090cdf661fac Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Wed, 14 Mar 2018 21:18:14 +0100
+Subject: [PATCH] Address clash of export reallocarray with glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+.. by not exporting that internal symbol any more,
+and renaming the function in code and where it's used
+
+Bug: https://bugs.gentoo.org/637438
+
+Compile error was:
+
+/usr/include/gif_lib.h:248:51: error: declaration of ‘void* 
reallocarray(void*, size_t, size_t)’ has a different exception specifier
+ reallocarray(void *optr, size_t nmemb, size_t size);
+   ^
+[..]
+/usr/include/stdlib.h:443:14: error: from previous declaration ‘void* 
reallocarray(void*, size_t, size_t) throw ()’
+ extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
+---
+ lib/dgif_lib.c |  4 ++--
+ lib/gif_lib.h  |  3 ---
+ lib/gifalloc.c | 10 +-
+ lib/openbsd-reallocarray.c |  2 +-
+ 4 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
+index 66a1d6a..f0e0385 100644
+--- a/lib/dgif_lib.c
 b/lib/dgif_lib.c
+@@ -396,7 +396,7 @@ DGifGetImageDesc(GifFileType *GifFile)
+ 
+ if (GifFile->SavedImages) {
+ SavedImage* new_saved_images =
+-(SavedImage *)reallocarray(GifFile->SavedImages,
++(SavedImage *)openbsd_reallocarray(GifFile->SavedImages,
+ (GifFile->ImageCount + 1), sizeof(SavedImage));
+ if (new_saved_images == NULL) {
+ GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+@@ -1108,7 +1108,7 @@ DGifSlurp(GifFileType *GifFile)
+   if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
+   return GIF_ERROR;
+   }
+-  sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize,
++  sp->RasterBits = (unsigned char *)openbsd_reallocarray(NULL, 
ImageSize,
+   sizeof(GifPixelType));
+ 
+   if (sp->RasterBits == NULL) {
+diff --git a/lib/gif_lib.h b/lib/gif_lib.h
+index 078930c..7914a69 100644
+--- a/lib/gif_lib.h
 b/lib/gif_lib.h
+@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(const 
ColorMapObject *ColorIn1,
+  GifPixelType ColorTransIn2[]);
+ extern int GifBitSize(int n);
+ 
+-extern void *
+-reallocarray(void *optr, size_t nmemb, size_t size);
+-
+ 
/**
+  Support for the in-core structures allocation (slurp mode).  
+ 
**/
+diff --git a/lib/gifalloc.c b/lib/gifalloc.c
+index 3b51868..1394cfa 100644
+--- a/lib/gifalloc.c
 b/lib/gifalloc.c
+@@ -188,7 +188,7 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
+ 
+ /* perhaps we can shrink the map? */
+ if (RoundUpTo < ColorUnion->ColorCount) {
+-GifColorType *new_map = (GifColorType *)reallocarray(Map,
++GifColorType *new_map = (GifColorType *)openbsd_reallocarray(Map,
+  RoundUpTo, sizeof(GifColorType));
+ if( new_map == NULL ) {
+ GifFreeMapObject(ColorUnion);
+@@ -232,7 +232,7 @@ GifAddExtensionBlock(int *ExtensionBlockCount,
+ if (*ExtensionBlocks == NULL)
+ *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock));
+ else {
+-ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray
++ExtensionBlock* ep_new = (ExtensionBlock *)openbsd_reallocarray
+(*ExtensionBlocks, (*ExtensionBlockCount + 1),
+   sizeof(ExtensionBlock));
+ if( ep_new == NULL )
+@@ -325,7 +325,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage 
*CopyFrom)
+ if (GifFile->SavedImages == NULL)
+ GifFile->SavedImages =