diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch index a19b36dbc0a..0841ad893af 100644 --- a/srcpkgs/berry/patches/fix-cross.patch +++ b/srcpkgs/berry/patches/fix-cross.patch @@ -1,12 +1,3 @@ ---- config.mk.orig -+++ config.mk -@@ -39,5 +39,5 @@ - - CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS) - CFLAGS += -Wall -O3 $(DEBUG_CFLAGS) --CFLAGS += -Icore -Iinclude -I/usr/include/freetype2 -+CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2 - LDFLAGS += -lX11 -lXrandr -lXft --- Makefile.orig +++ Makefile @@ -5,12 +5,12 @@ @@ -18,10 +9,19 @@ CFLAGS?=-Os -pedantic -Wall $(NAME_DEFINES) all: -- $(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry +- $(CC) $(CFLAGS) -I$(PREFIX)/include src/utils.c src/wm.c -L$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry - $(CC) $(CFLAGS) -I$(PREFIX)/include src/client.c -L$(PREFIX)/lib -lX11 -o berryc -+ $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -o berry ++ $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/utils.c src/wm.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -lm -lXinerama -lXft -lXext -o berry + $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/client.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -o berryc install: mkdir -p "$(DESTDIR)$(PREFIX)/bin" +--- config.mk.orig ++++ config.mk +@@ -39,5 +39,5 @@ + + CPPFLAGS += $(NAME_DEFINES) -DSRVR_$$HOSTNAME $(DEBUG_CPPFLAGS) + CFLAGS += -Wall -O3 $(DEBUG_CFLAGS) +-CFLAGS += -Icore -Iinclude -I/usr/include/freetype2 ++CFLAGS += -Icore -Iinclude -I$(XBPS_CROSS_BASE)/usr/include/freetype2 + LDFLAGS += -lX11 -lXrandr -lXft diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template index 49cdc814ef8..1c4b6379191 100644 --- a/srcpkgs/berry/template +++ b/srcpkgs/berry/template @@ -1,16 +1,16 @@ # Template file for 'berry' pkgname=berry -version=0.1.0 +version=0.1.1 revision=1 build_style=gnu-makefile make_use_env=yes makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel" short_desc="Healthy, bite-sized window manager" -maintainer="Andrew Benson " +maintainer="Andrew Benson " license="MIT" homepage="https://github.com/JLErvin/berry" distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz" -checksum=62a9e279c2029f52fb80acee3169c02de3cda8e53cf1243e6deeeca7437d1efb +checksum=64dbe9164d78fbb71938cd11d44dcca0b40c2541d504ce951a6a23bc46b5d021 do_install() { vbin berry