unclutter-xfixes: update to 1.3.

This commit is contained in:
Duncaen 2018-01-27 01:21:24 +01:00
parent 204165de0f
commit 14a64b61c4
2 changed files with 31 additions and 16 deletions

View File

@ -1,13 +1,29 @@
--- Makefile.orig --- Makefile.orig
+++ Makefile +++ Makefile
@@ -30 +29,0 @@ all: clean $(TARGET) mans @@ -12,14 +12,14 @@
-.PHONY: $(TARGET) CC = gcc
@@ -32 +31 @@ $(TARGET): $(OBJS) LD = $(CC)
- $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
+ $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) -CPPFLAGS += -D'__VERSION="$(shell git describe --all --long --always)"' "-I$(IDIR)"
@@ -35 +34 @@ $(ODIR)/%.o: $(SDIR)/%.c $(INCS) +CPPFLAGS += "-I$(IDIR)"
- $(CC) -D'__VERSION="$(shell git describe --all --long --always)"' $(CFLAGS) -o $@ -c $<
+ $(CC) $(CFLAGS) -Iinclude -o $@ -c $< CFLAGS += -std=gnu99
@@ -38 +37 @@ $(ODIR)/%.o: $(SDIR)/%.c $(INCS) CFLAGS += -Wall -Wundef -Wshadow -Wformat-security
-install: $(TARGET)
+install: -LDFLAGS += $(shell pkg-config --libs x11 xi xfixes)
+LIBS += $(shell pkg-config --libs x11 xi xfixes)
# libev has no pkg-config support
-LDFLAGS += -lev
+LIBS += -lev
INCS = $(wildcard $(IDIR)/*.h)
SRCS = $(wildcard $(SDIR)/*.c)
@@ -34,7 +34,7 @@
.PHONY: $(TARGET)
$(TARGET): $(OBJS)
- $(LD) $(OBJS) $(LDFLAGS) -o "$(TARGET)"
+ $(CC) $(LDFLAGS) -o "$(TARGET)" $(OBJS) $(LIBS)
$(ODIR)/%.o: $(SDIR)/%.c $(INCS)
$(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<"

View File

@ -1,9 +1,8 @@
# Template file for 'unclutter-xfixes' # Template file for 'unclutter-xfixes'
pkgname=unclutter-xfixes pkgname=unclutter-xfixes
version=1.2 version=1.3
revision=2 revision=1
build_style=gnu-makefile build_style=gnu-makefile
make_install_args="PREFIX=/usr/bin"
hostmakedepends="pkg-config asciidoc" hostmakedepends="pkg-config asciidoc"
makedepends="libXfixes-devel libXi-devel libev-devel" makedepends="libXfixes-devel libXi-devel libev-devel"
short_desc="Rewrite of the popular tool unclutter using the libXfixes" short_desc="Rewrite of the popular tool unclutter using the libXfixes"
@ -11,10 +10,10 @@ maintainer="Duncaen <duncaen@voidlinux.eu>"
license="MIT" license="MIT"
homepage="https://github.com/Airblader/unclutter-xfixes" homepage="https://github.com/Airblader/unclutter-xfixes"
distfiles="https://github.com/Airblader/unclutter-xfixes/archive/v${version}.tar.gz" distfiles="https://github.com/Airblader/unclutter-xfixes/archive/v${version}.tar.gz"
checksum=addaf8fa4e7381a95ea2279eb47be675b52eb43efb83f7a78ac9044e53121d4a checksum=8726b2e447de9d43bbd979ad6581c6fd34ad76ef82a6e1c7e1ad2ca3247565b2
conflicts="unclutter>=0" conflicts="unclutter>=0"
CFLAGS="-D__VERSION=\\\"$version\\\"" CPPFLAGS="-D__VERSION=\\\"$version\\\""
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE