From 6371033984d1c8d62e39258555f76f374bd596a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Sun, 25 Nov 2018 14:16:44 +0100
Subject: [PATCH] unclutter-xfixes: update to 1.4.

---
 srcpkgs/unclutter-xfixes/patches/make.patch | 29 ---------------------
 srcpkgs/unclutter-xfixes/template           | 11 ++++----
 2 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/unclutter-xfixes/patches/make.patch

diff --git a/srcpkgs/unclutter-xfixes/patches/make.patch b/srcpkgs/unclutter-xfixes/patches/make.patch
deleted file mode 100644
index dce41dd61fe..00000000000
--- a/srcpkgs/unclutter-xfixes/patches/make.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -12,14 +12,14 @@
- CC = gcc
- LD = $(CC)
- 
--CPPFLAGS += -D'__VERSION="$(shell git describe --all --long --always)"' "-I$(IDIR)"
-+CPPFLAGS += "-I$(IDIR)"
- 
- CFLAGS += -std=gnu99
- CFLAGS += -Wall -Wundef -Wshadow -Wformat-security
- 
--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 "$<"
diff --git a/srcpkgs/unclutter-xfixes/template b/srcpkgs/unclutter-xfixes/template
index 48e449cf0f9..1ba026f1ba5 100644
--- a/srcpkgs/unclutter-xfixes/template
+++ b/srcpkgs/unclutter-xfixes/template
@@ -1,8 +1,9 @@
 # Template file for 'unclutter-xfixes'
 pkgname=unclutter-xfixes
-version=1.3
+version=1.4
 revision=1
 build_style=gnu-makefile
+make_use_env=yes
 hostmakedepends="pkg-config asciidoc"
 makedepends="libXfixes-devel libXi-devel libev-devel"
 short_desc="Rewrite of the popular tool unclutter using the libXfixes"
@@ -10,13 +11,13 @@ maintainer="Duncaen <duncaen@voidlinux.eu>"
 license="MIT"
 homepage="https://github.com/Airblader/unclutter-xfixes"
 distfiles="https://github.com/Airblader/unclutter-xfixes/archive/v${version}.tar.gz"
-checksum=8726b2e447de9d43bbd979ad6581c6fd34ad76ef82a6e1c7e1ad2ca3247565b2
+checksum=f28cd690cfa184fddd3961dda49d14e114dccd5e70d9bac8ca5ebcd5124985b3
 conflicts="unclutter>=0"
 
-CPPFLAGS="-D__VERSION=\\\"$version\\\""
-
 pre_build() {
-	sed -i Makefile -e "s;CC = gcc;CC = $CC;"
+	sed -e '/^CC/d' \
+		-e '/^.PHONY: $(TARGET)/d' \
+		-i Makefile
 }
 
 post_install() {