jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

berry: update to 0.1.4.

Browse source
This commit is contained in:
Andrew Benson 2020-03-11 07:43:11 -05:00 committed by Johannes
parent bd5608702c
commit 065cc38672
2 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,27 +1,41 @@
--- Makefile.orig
+++ Makefile
@@ -5,12 +5,12 @@
-D__THIS_VERSION__=\"$(__THIS_VERSION__)\" \
-D__CONFIG_NAME__=\"$(__CONFIG_NAME__)\" \
-PREFIX?=/usr/X11R6
+PREFIX?=/usr
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 -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 -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
@@ -4,11 +4,11 @@
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+PREFIX = /usr
MANPREFIX = ${PREFIX}/share/man
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+X11INC = $(XBPS_CROSS_BASE)/usr/include
+X11LIB = $(XBPS_CROSS_BASE)/usr/lib
# Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama
@@ -16,7 +16,7 @@
# freetype
FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2
# OpenBSD (uncomment)
#FREETYPEINC = ${X11INC}/freetype2
@@ -31,7 +31,7 @@
# flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
+CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
LDFLAGS = ${LIBS}
# Solaris
@@ -39,4 +39,4 @@
#LDFLAGS = ${LIBS}
# compiler and linker
-CC = cc
+#CC = cc

12
srcpkgs/berry/template
View file

@ -1,6 +1,6 @@
# Template file for 'berry'
pkgname=berry
version=0.1.3
version=0.1.4
revision=1
build_style=gnu-makefile
make_use_env=yes
@ -10,14 +10,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/JLErvin/berry"
distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
checksum=05a3b9b001ca515ded4310e358cfcd1d4b544954509f61fe40062951b57c0b87
checksum=0339a799230970e209bc37053f573057119a483781cda714e5435b5911013540
do_install() {
vbin berry
vbin berryc
vman man/berry.1
vman man/berryc.1
vsconf example/autostart
vsconf example/sxhkdrc
post_install() {
vlicense LICENSE
}