diff --git a/x11-packages/dmenu/build.sh b/x11-packages/dmenu/build.sh index 40051e81d..5181dc2bb 100644 --- a/x11-packages/dmenu/build.sh +++ b/x11-packages/dmenu/build.sh @@ -3,8 +3,9 @@ TERMUX_PKG_DESCRIPTION="Generic menu for X" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=4.9 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://dl.suckless.org/tools/dmenu-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945 TERMUX_PKG_DEPENDS="dash, freetype, libxinerama, libx11, libxft" +TERMUX_PKG_BUILD_DEPENDS="xorgproto" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/dmenu/config.mk.patch b/x11-packages/dmenu/config.mk.patch index 02d2301f4..980a648ae 100644 --- a/x11-packages/dmenu/config.mk.patch +++ b/x11-packages/dmenu/config.mk.patch @@ -1,6 +1,6 @@ diff -uNr dmenu-4.9/config.mk dmenu-4.9.mod/config.mk --- dmenu-4.9/config.mk 2019-02-02 14:55:02.000000000 +0200 -+++ dmenu-4.9.mod/config.mk 2019-05-26 22:34:03.870913860 +0300 ++++ dmenu-4.9.mod/config.mk 2020-01-04 23:50:39.788733241 +0200 @@ -2,11 +2,11 @@ VERSION = 4.9 @@ -25,8 +25,12 @@ diff -uNr dmenu-4.9/config.mk dmenu-4.9.mod/config.mk # OpenBSD (uncomment) #FREETYPEINC = $(X11INC)/freetype2 -@@ -28,4 +28,4 @@ - LDFLAGS = $(LIBS) +@@ -25,7 +25,7 @@ + # flags + CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) + CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) +-LDFLAGS = $(LIBS) ++LDFLAGS = -Wl,-rpath=@TERMUX_PREFIX@/lib,--enable-new-dtags $(LIBS) # compiler and linker -CC = cc