From e5b8646c19937ce030598e0037df9da1c75be727 Mon Sep 17 00:00:00 2001 From: Yair Ben-Avraham Date: Tue, 25 Apr 2023 13:34:02 +0000 Subject: [PATCH] package/gloox: bump version to 1.0.27 Signed-off-by: Yair Ben-Avraham [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...src-connectiontcpserver-cpp-fix-musl.patch | 25 ------------------- package/gloox/gloox.hash | 2 +- package/gloox/gloox.mk | 2 +- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3ac032400b..05459362ee 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -584,7 +584,6 @@ package/gli/0001-Optional-building-tests.patch Upstream package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch Upstream package/glmark2/0002-libmatrix-Add-missing-utility-include.patch Upstream package/glog/0001-added-emscripten-support.patch Upstream -package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream package/gmp/0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch Upstream diff --git a/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch b/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch deleted file mode 100644 index 56a2d4982c..0000000000 --- a/package/gloox/0001-src-connectiontcpserver-cpp-fix-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -src/connectiontcpserver.cpp: fix musl build - -Build on musl fails on: - -connectiontcpserver.cpp:131:13: error: 'strerror' was not declared in this scope - + strerror( err ) + " (errno: " + util::int2string( err ) + ")"; - ^~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/a61a91bb6e1156eff5fb756f9dccfc2bb6c0f277 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.camaya.net/ticket/?id=291] - -diff -Nuar gloox-1.0.23-orig/src/connectiontcpserver.cpp gloox-1.0.23/src/connectiontcpserver.cpp ---- gloox-1.0.23-orig/src/connectiontcpserver.cpp 2020-06-05 23:22:59.624018949 +0200 -+++ gloox-1.0.23/src/connectiontcpserver.cpp 2020-06-05 23:26:20.708027221 +0200 -@@ -36,6 +36,7 @@ - # include - # include - # include -+# include - # include - # include - # include diff --git a/package/gloox/gloox.hash b/package/gloox/gloox.hash index 6419db90f8..66a3c2d1be 100644 --- a/package/gloox/gloox.hash +++ b/package/gloox/gloox.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae1462be2a2eb8fe5cd054825143617c53c2c9c7195606cb5a5ba68c0f68f9c9 gloox-1.0.24.tar.bz2 +sha256 0b8b7371439bc58d9e51384b616c964b18b7b41b87af1b7855104380eda86ffb gloox-1.0.27.tar.bz2 sha256 40a20c41c8dabb8ba61bea983fa8f2f6989e67fac56bb62c2249053807fd26af LICENSE diff --git a/package/gloox/gloox.mk b/package/gloox/gloox.mk index b741d5ebc1..3495db96f0 100644 --- a/package/gloox/gloox.mk +++ b/package/gloox/gloox.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLOOX_VERSION = 1.0.24 +GLOOX_VERSION = 1.0.27 GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2 GLOOX_SITE = https://camaya.net/download GLOOX_LICENSE = GPL-3.0 with OpenSSL exception