diff --git a/user/dmenu-user/APKBUILD b/user/dmenu-user/APKBUILD index 00a31d7..d932e9f 100644 --- a/user/dmenu-user/APKBUILD +++ b/user/dmenu-user/APKBUILD @@ -15,19 +15,20 @@ _patchlist=" " pkgrel=5 pkgdesc="A patch-friendly dmenu distribution" -arch="!armv7 all" +arch="all" url="https://github.com/jaimecgomezz/dmenu" license="MIT" provides="qubes-dmenu=$pkgver-r$pkgrel" depends=" bash - freetype python3 " makedepends=" fontconfig + musl-dev libx11-dev libxft-dev + freetype-dev libxinerama-dev " subpackages="$pkgname-doc" @@ -36,6 +37,7 @@ source=" $pkgname-$_gittag.tar.gz::https://github.com/jaimecgomezz/dmenu/archive/$_gittag.tar.gz suckless-patchers-$_patchertag.tar.gz::https://github.com/jaimecgomezz/suckless-patchers/archive/$_patchertag.tar.gz qvm-passmenu.sh + make-use-env-variables.patch " builddir="$srcdir"/dmenu-$_gittag @@ -68,4 +70,5 @@ sha512sums=" 5d51ce72d83c5e4f4c010c9555f219742367b9828f75d103a074e105353602c511a5e80b0f297f7b5bf6c591883a2adae8b16153385f22932b1d493c6afacdf4 dmenu-user-a3de0c2ece478aaeaaff5aec60887e683f2a8ce0.tar.gz 4f8a0acb3655806981e3f302bc762292613b05141b568177e573b939bf6163ba950936a27febdaeb2939c660fbbbc943a24c6733cddeb0927fb24eef9fdf618d suckless-patchers-6417335f09f0d2fb2faec78c5702a1ef9a19ab02.tar.gz 6b0c299253f902b5997696ba8780f2ad41c086b063035190565fc0c2c99d7e5f7236685a035db89972bf51029be7acd45f89eb634e15f7a2fd6998d6190c204d qvm-passmenu.sh +61a0a14d29a52e39ccb80c201f4442b7ddffcc0d877633d10c0930bd423660635749918de59c6940d04edbd5046abcc1ac27ebb81534bf91a64bf247f2a8133b make-use-env-variables.patch " diff --git a/user/dmenu-user/make-use-env-variables.patch b/user/dmenu-user/make-use-env-variables.patch new file mode 100644 index 0000000..b99a2a0 --- /dev/null +++ b/user/dmenu-user/make-use-env-variables.patch @@ -0,0 +1,22 @@ +diff --git a/config.mk.orig b/config.mk +index d8d0129..1e99c67 100644 +--- a/config.mk.orig ++++ b/config.mk +@@ -31,13 +31,13 @@ LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) + # flags + # >>>>>>>>>>>>>>>>>>>> json + # ==================== json +-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) ++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) + # <<<<<<<<<<<<<<<<<<<< json +-LDFLAGS = $(LIBS) ++LDFLAGS += $(LIBS) + + # compiler and linker +-CC = cc ++CC ?= cc + + # >>>>>>>>>>>>>>>>>>>> json + # ==================== json