From e6f8c403fe6c9909d2d3f5fd897c3057b7677192 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Sep 2021 08:55:30 +0200 Subject: [PATCH] package/x11r7/xlib_libXfont2: bump version to 2.0.5 Release notes: https://lists.x.org/archives/xorg-announce/2021-August/003103.html Removed patch which was applied upstream. Removed md5 and sha1 hashes, reformatted hashes, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ne-HAVE_LIBBSD-when-libbsd-was-found.patch | 30 ------------------- .../x11r7/xlib_libXfont2/xlib_libXfont2.hash | 11 +++---- .../x11r7/xlib_libXfont2/xlib_libXfont2.mk | 4 +-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch diff --git a/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch b/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch deleted file mode 100644 index 51e7225be6..0000000000 --- a/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5fceeeb0d1cdccdb2870f65444f2965344f3b8b9 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 19 Oct 2019 09:32:41 +0200 -Subject: [PATCH] configure: define HAVE_LIBBSD when libbsd was found - -Patch sent upstream: -https://gitlab.freedesktop.org/xorg/lib/libxfont/merge_requests/6 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f507c28..cc7ca91 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,6 +53,9 @@ AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) - # Checks for library functions. - AC_CHECK_FUNCS([poll readlink]) - AC_SEARCH_LIBS([strlcat], [bsd]) -+if test "$ac_cv_search_strlcat" = "-lbsd"; then -+ AC_DEFINE(HAVE_LIBBSD,1,[Has libbsd]) -+fi - AC_CONFIG_LIBOBJ_DIR([src/util]) - AC_REPLACE_FUNCS([reallocarray strlcat strlcpy]) - --- -2.20.1 - diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 634affdfdb..069f2fc616 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-September/003022.html -md5 00516bed7ec1453d56974560379fff2f libXfont2-2.0.4.tar.bz2 -sha1 9e00ae7589315656435efaf330128facad7c4a57 libXfont2-2.0.4.tar.bz2 -sha256 6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6 libXfont2-2.0.4.tar.bz2 -sha512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 libXfont2-2.0.4.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2021-August/003103.html +sha256 aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e libXfont2-2.0.5.tar.bz2 +sha512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa libXfont2-2.0.5.tar.bz2 # Locally calculated -sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING +sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index d2ff4ca7f3..6a71761f4e 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.4 +XLIB_LIBXFONT2_VERSION = 2.0.5 XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 -XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFONT2_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING XLIB_LIBXFONT2_CPE_ID_VENDOR = x -- 2.30.2