imlib: Added detection of availability GNU variant of the basename. #18

Merged
SlavekB merged 1 commits from imlib/check-for-gnu-basename into master 2 months ago

@ -1,3 +1,9 @@
imlib (1.9.15-23debian13.0.0+9~a) trixie; urgency=low
* Added detection of availability GNU variant of the basename.
-- Slávek Banko <slavek.banko@axis.cz> Sun, 14 Apr 2024 17:10:27 +0200
imlib (1.9.15-23debian11.0.0+8~a) bullseye; urgency=low
* Change debhelper compatibility level to 9

@ -0,0 +1,46 @@
Index: imlib-1.9.15/Imlib/colors.c
===================================================================
--- imlib-1.9.15.orig/Imlib/colors.c
+++ imlib-1.9.15/Imlib/colors.c
@@ -3,8 +3,10 @@
#include "Imlib.h"
#include "Imlib_private.h"
-#ifndef HAVE_BASENAME
+#if defined(HAVE_GNU_BASENAME)
#include <string.h>
+#elif defined(HAVE_BASENAME)
+#include <libgen.h>
#endif
#ifdef __EMX__
Index: imlib-1.9.15/config.h.in
===================================================================
--- imlib-1.9.15.orig/config.h.in
+++ imlib-1.9.15/config.h.in
@@ -19,6 +19,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* Defined if we hare GNU version of basename */
+#undef HAVE_GNU_BASENAME
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
Index: imlib-1.9.15/configure.in
===================================================================
--- imlib-1.9.15.orig/configure.in
+++ imlib-1.9.15/configure.in
@@ -101,6 +101,11 @@ AC_TYPE_SIGNAL
AC_CHECK_FUNCS(vsnprintf)
AC_CHECK_FUNCS(snprintf)
AC_CHECK_FUNCS(basename)
+AC_CHECK_DECL([basename(char*)], AC_DEFINE(HAVE_GNU_BASENAME, 1, [Defined if we hare GNU version of basename]), [], [
+#define _GNU_SOURCE
+#include <string.h>
+])
+
AC_CHECK_FUNCS(blumfrub)
AC_CHECK_FUNCS(buckets_of_erogenous_nym)

@ -17,3 +17,4 @@ png1.5.diff
png1.6.diff
giflib5.1.diff
fix-potential-buffer-overflow.diff
check-gnu-basename.diff

Loading…
Cancel
Save