wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-27 07:52:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

berry: update to 0.1.1.

Browse source
This commit is contained in:
Andrew Benson 2019-08-28 16:48:07 -05:00 • committed by Johannes
parent 408ee6c4d5
commit aa0e9168be
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/berry/patches/fix-cross.patch
View file

@ -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.orig
+++ Makefile +++ Makefile
@@ -5,12 +5,12 @@ @@ -5,12 +5,12 @@
@ -18,10 +9,19 @@
CFLAGS?=-Os -pedantic -Wall $(NAME_DEFINES) CFLAGS?=-Os -pedantic -Wall $(NAME_DEFINES)
all: 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$(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 + $(CC) $(CFLAGS) -I$(XBPS_CROSS_BASE)/$(PREFIX)/include src/client.c -L$(XBPS_CROSS_BASE)/$(PREFIX)/lib -lX11 -o berryc
install: install:
mkdir -p "$(DESTDIR)$(PREFIX)/bin" 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

6
srcpkgs/berry/template
View file

@ -1,16 +1,16 @@
# Template file for 'berry' # Template file for 'berry'
pkgname=berry pkgname=berry
version=0.1.0 version=0.1.1
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
make_use_env=yes make_use_env=yes
makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel" makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
short_desc="Healthy, bite-sized window manager" short_desc="Healthy, bite-sized window manager"
maintainer="Andrew Benson <abenson@gmail.com>" maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT" license="MIT"
homepage="https://github.com/JLErvin/berry" homepage="https://github.com/JLErvin/berry"
distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz" distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
checksum=62a9e279c2029f52fb80acee3169c02de3cda8e53cf1243e6deeeca7437d1efb checksum=64dbe9164d78fbb71938cd11d44dcca0b40c2541d504ce951a6a23bc46b5d021
do_install() { do_install() {
vbin berry vbin berry