From 8496c03be2d0610cab749b6cdcaf00c7255fde9d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 6 Nov 2022 19:07:41 +1100
Subject: [PATCH] hiredis: update to 1.1.0.

---
 common/shlibs                               |  2 +-
 srcpkgs/hiredis/patches/fix-cflags.patch    |  6 +++---
 srcpkgs/hiredis/patches/fix-pkgconfig.patch | 16 ++++++++++------
 srcpkgs/hiredis/template                    |  6 +++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 806e66dedee..6c5548c50ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2375,7 +2375,7 @@ libtidy.so.58 libtidy5-5.8.0_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
 libinjeqt.so.1 injeqt-1.1.0_1
 libgadu.so.3 libgadu-1.12.1_1
-libhiredis.so.1.0.0 hiredis-1.0.0_1
+libhiredis.so.1.1.0 hiredis-1.1.0_1
 libIL.so.1 devil-1.7.8_1
 libILU.so.1 devil-1.7.8_1
 libILUT.so.1 devil-1.7.8_1
diff --git a/srcpkgs/hiredis/patches/fix-cflags.patch b/srcpkgs/hiredis/patches/fix-cflags.patch
index b7be37a6297..81680562dbc 100644
--- a/srcpkgs/hiredis/patches/fix-cflags.patch
+++ b/srcpkgs/hiredis/patches/fix-cflags.patch
@@ -2,7 +2,7 @@ Index: Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -44,9 +44,9 @@ export REDIS_TEST_CONFIG
+@@ -44,8 +44,8 @@ export REDIS_TEST_CONFIG
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -11,6 +11,6 @@ Index: Makefile
  WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
 -DEBUG_FLAGS?= -g -ggdb
 +DEBUG_FLAGS?=
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
  REAL_LDFLAGS=$(LDFLAGS)
- 
+
diff --git a/srcpkgs/hiredis/patches/fix-pkgconfig.patch b/srcpkgs/hiredis/patches/fix-pkgconfig.patch
index 94be0a7309e..9163b6be12d 100644
--- a/srcpkgs/hiredis/patches/fix-pkgconfig.patch
+++ b/srcpkgs/hiredis/patches/fix-pkgconfig.patch
@@ -2,25 +2,29 @@ Index: Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -234,8 +234,8 @@ $(PKGCONFNAME): hiredis.h
+@@ -234,9 +234,9 @@ $(PKGCONFNAME): hiredis.h
  	@echo "Generating $@ for pkgconfig..."
  	@echo prefix=$(PREFIX) > $@
  	@echo exec_prefix=\$${prefix} >> $@
 -	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
--	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+-	@echo includedir=$(PREFIX)/include >> $@
 +	@echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@
-+	@echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@
++	@echo includedir=\$${prefix}/include >> $@
+-	@echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
++	@echo pkgincludedir=\$${prefix}/$(INCLUDE_PATH) >> $@
  	@echo >> $@
  	@echo Name: hiredis >> $@
  	@echo Description: Minimalistic C client library for Redis. >> $@
-@@ -247,8 +247,8 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h
+@@ -247,9 +247,9 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h
  	@echo "Generating $@ for pkgconfig..."
  	@echo prefix=$(PREFIX) > $@
  	@echo exec_prefix=\$${prefix} >> $@
 -	@echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
--	@echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+-	@echo includedir=$(PREFIX)/include >> $@
 +	@echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@
-+	@echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@
++	@echo includedir=\$${prefix}/include >> $@
+-	@echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
++	@echo pkgincludedir=\$${prefix}/$(INCLUDE_PATH) >> $@
  	@echo >> $@
  	@echo Name: hiredis_ssl >> $@
  	@echo Description: SSL Support for hiredis. >> $@
diff --git a/srcpkgs/hiredis/template b/srcpkgs/hiredis/template
index db8f3a11ddb..6ecd80b53df 100644
--- a/srcpkgs/hiredis/template
+++ b/srcpkgs/hiredis/template
@@ -1,7 +1,7 @@
 # Template file for 'hiredis'
 pkgname=hiredis
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-makefile
 checkdepends="redis"
 short_desc="Minimalistic C client for Redis"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/redis/hiredis"
 distfiles="https://github.com/redis/hiredis/archive/v${version}.tar.gz"
-checksum=2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f
+checksum=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6
 
 post_install() {
 	vlicense COPYING