From 14a64b61c4fb8ea2170e7f2b66e4b30235fcf57a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 27 Jan 2018 01:21:24 +0100 Subject: [PATCH] unclutter-xfixes: update to 1.3. --- srcpkgs/unclutter-xfixes/patches/make.patch | 38 +++++++++++++++------ srcpkgs/unclutter-xfixes/template | 9 +++-- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/srcpkgs/unclutter-xfixes/patches/make.patch b/srcpkgs/unclutter-xfixes/patches/make.patch index 0e4c1566311..dce41dd61fe 100644 --- a/srcpkgs/unclutter-xfixes/patches/make.patch +++ b/srcpkgs/unclutter-xfixes/patches/make.patch @@ -1,13 +1,29 @@ --- Makefile.orig +++ Makefile -@@ -30 +29,0 @@ all: clean $(TARGET) mans --.PHONY: $(TARGET) -@@ -32 +31 @@ $(TARGET): $(OBJS) -- $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) -@@ -35 +34 @@ $(ODIR)/%.o: $(SDIR)/%.c $(INCS) -- $(CC) -D'__VERSION="$(shell git describe --all --long --always)"' $(CFLAGS) -o $@ -c $< -+ $(CC) $(CFLAGS) -Iinclude -o $@ -c $< -@@ -38 +37 @@ $(ODIR)/%.o: $(SDIR)/%.c $(INCS) --install: $(TARGET) -+install: +@@ -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 13c59eaaa17..d8e921ad36a 100644 --- a/srcpkgs/unclutter-xfixes/template +++ b/srcpkgs/unclutter-xfixes/template @@ -1,9 +1,8 @@ # Template file for 'unclutter-xfixes' pkgname=unclutter-xfixes -version=1.2 -revision=2 +version=1.3 +revision=1 build_style=gnu-makefile -make_install_args="PREFIX=/usr/bin" hostmakedepends="pkg-config asciidoc" makedepends="libXfixes-devel libXi-devel libev-devel" short_desc="Rewrite of the popular tool unclutter using the libXfixes" @@ -11,10 +10,10 @@ maintainer="Duncaen " license="MIT" homepage="https://github.com/Airblader/unclutter-xfixes" distfiles="https://github.com/Airblader/unclutter-xfixes/archive/v${version}.tar.gz" -checksum=addaf8fa4e7381a95ea2279eb47be675b52eb43efb83f7a78ac9044e53121d4a +checksum=8726b2e447de9d43bbd979ad6581c6fd34ad76ef82a6e1c7e1ad2ca3247565b2 conflicts="unclutter>=0" -CFLAGS="-D__VERSION=\\\"$version\\\"" +CPPFLAGS="-D__VERSION=\\\"$version\\\"" post_install() { vlicense LICENSE