From 84bd19f797df3ce2bbb8f544942d59677c0fa36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 29 Apr 2022 11:04:13 +0200 Subject: [PATCH] FreeBSD imlib: Update the patch to search XShm include to make it work even if AC_PATH_X does not return a valid path. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This resolves issue #110. Signed-off-by: Slávek Banko --- freebsd/dependencies/imlib/Makefile | 2 +- .../imlib/files/patch-search-system-include-for-xshm.diff | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/freebsd/dependencies/imlib/Makefile b/freebsd/dependencies/imlib/Makefile index da85f0488..33841a3a7 100644 --- a/freebsd/dependencies/imlib/Makefile +++ b/freebsd/dependencies/imlib/Makefile @@ -9,7 +9,7 @@ PORTNAME= imlib COMMENT= A graphic library for enlightenment package MASTER_SITE_SUBDIR= i/${PORTNAME} PORTVERSION= 1.9.15 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_TDE_DEPS} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff b/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff index 359d44a1f..47271a097 100644 --- a/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff +++ b/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff @@ -1,11 +1,13 @@ --- imlib-1.9.15.orig/configure.in +++ imlib-1.9.15/configure.in -@@ -197,7 +197,7 @@ +@@ -197,7 +197,9 @@ AC_MSG_RESULT(no) no_xshm=yes else - if test -f "$x_includes/X11/extensions/XShm.h"; then -+ if test -f "$x_includes/X11/extensions/XShm.h" || test -f "/usr/include/X11/extensions/XShm.h"; then ++ if test -f "$x_includes/X11/extensions/XShm.h" || \ ++ test -f "/usr/include/X11/extensions/XShm.h" || \ ++ test -f "/usr/local/include/X11/extensions/XShm.h"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_XSHM_H, 1, [ ]) else