Merge pull request #8388 from lazka/giflib-abi-revert

giflib: revert an ABI break to make libgdiplus build again

mingw-w64-giflib/PKGBUILD

@@ -4,7 +4,7 @@ _realname=giflib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for reading and writing gif images (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -14,9 +14,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "xmlto")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('staticlibs' 'strip')
 source=("https://downloads.sourceforge.net/sourceforge/giflib/${_realname}-${pkgver}.tar.gz"
-        "001-mingw-build.patch")
+        "001-mingw-build.patch"
+        "giflib_quantize.patch")
 sha256sums=('31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd'
-            '2b2262ddea87fc07be82e10aeb39eb699239f883c899aa18a16e4d4e40af8ec8')
+            '2b2262ddea87fc07be82e10aeb39eb699239f883c899aa18a16e4d4e40af8ec8'
+            '29f0d5a98520cf908a11325987ca9ef2454ca8cb85ce9815b75a52956b9df28a')
 noextract=(${_realname}-${pkgver}.tar.gz)
 
 prepare() {
@@ -25,6 +27,8 @@ prepare() {
 
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/001-mingw-build.patch"
+  # https://src.fedoraproject.org/rpms/giflib/c/109bf038d703a471b857aba44af673be103d7079
+  patch -Np1 -i "${srcdir}/giflib_quantize.patch"
 }
 
 build() {

mingw-w64-giflib/giflib_quantize.patch

@@ -0,0 +1,17 @@
+diff -rupN giflib-5.2.1/Makefile giflib-5.2.1-new/Makefile
+--- giflib-5.2.1/Makefile	2019-06-24 18:08:57.000000000 +0200
++++ giflib-5.2.1-new/Makefile	2019-10-01 13:02:33.227952230 +0200
+@@ -29,11 +29,11 @@ LIBPOINT=0
+ LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
+ 
+ SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \
+-	gif_hash.c openbsd-reallocarray.c
++	gif_hash.c openbsd-reallocarray.c quantize.c
+ HEADERS = gif_hash.h  gif_lib.h  gif_lib_private.h
+ OBJECTS = $(SOURCES:.c=.o)
+ 
+-USOURCES = qprintf.c quantize.c getarg.c 
++USOURCES = qprintf.c getarg.c
+ UHEADERS = getarg.h
+ UOBJECTS = $(USOURCES:.c=.o)
+ 

mingw-w64-libgdiplus/PKGBUILD

@@ -4,7 +4,7 @@ _realname=libgdiplus
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=5.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source Implementation of the GDI+ API (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')