diff --git a/packages/xorg-util-macros/build.sh b/packages/xorg-util-macros/build.sh index 129073684..8af8f6a22 100644 --- a/packages/xorg-util-macros/build.sh +++ b/packages/xorg-util-macros/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X.Org Autotools macros" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Pliushch " -TERMUX_PKG_VERSION=1.19.2 -TERMUX_PKG_REVISION=8 +TERMUX_PKG_VERSION=1.19.3 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/util/util-macros-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712 +TERMUX_PKG_SHA256=0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_post_make_install() { diff --git a/packages/xorg-util-macros/util-macros-1.19.1_xorg-macros.m4.in.patch b/packages/xorg-util-macros/xorg-macros.m4.in.patch similarity index 57% rename from packages/xorg-util-macros/util-macros-1.19.1_xorg-macros.m4.in.patch rename to packages/xorg-util-macros/xorg-macros.m4.in.patch index 8ef80bb0b..72bccf911 100644 --- a/packages/xorg-util-macros/util-macros-1.19.1_xorg-macros.m4.in.patch +++ b/packages/xorg-util-macros/xorg-macros.m4.in.patch @@ -1,21 +1,21 @@ -diff -uNr util-macros-1.19.1/xorg-macros.m4.in util-macros-1.19.1.mod/xorg-macros.m4.in ---- util-macros-1.19.1/xorg-macros.m4.in 2017-01-29 21:22:45.000000000 +0200 -+++ util-macros-1.19.1.mod/xorg-macros.m4.in 2017-11-24 13:21:36.220629554 +0200 +diff -uNr util-macros-1.19.3/xorg-macros.m4.in util-macros-1.19.3.mod/xorg-macros.m4.in +--- util-macros-1.19.3/xorg-macros.m4.in 2021-01-24 16:41:26.000000000 +0200 ++++ util-macros-1.19.3.mod/xorg-macros.m4.in 2021-02-08 17:42:50.860717540 +0200 @@ -58,7 +58,7 @@ AC_DEFUN([XORG_PROG_RAWCPP],[ AC_REQUIRE([AC_PROG_CPP]) - AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], + AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], - [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) -+ [$PATH:@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/lib:/usr/bin:/usr/lib:/bin:/lib]) ++ [$PATH:@TERMUX_PREFIX@/bin:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) # Check for flag to avoid builtin definitions - assumes unix is predefined, # which is not the best choice for supporting other OS'es, but covers most -@@ -917,7 +917,7 @@ +@@ -924,7 +924,7 @@ [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \ ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], [AC_MSG_ERROR([could not find m4 that supports -I option])], - [$PATH:/usr/gnu/bin])]) -+ [$PATH:@TERMUX_PREFIX@/bin:/usr/bin:/bin])]) ++ [$PATH:@TERMUX_PREFIX@/bin:/usr/gnu/bin])]) AC_SUBST([M4], [$ac_cv_path_M4]) ]) # XORG_WITH_M4