From f1b0e83776689e7df1daad67a871770ac1d7fad2 Mon Sep 17 00:00:00 2001 From: "Johannes M. Griebler" Date: Thu, 13 Oct 2016 17:30:08 +0200 Subject: [PATCH 1/2] Take lightweight tags into account in VERSION --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index 5171442..32d1d5d 100644 --- a/config.mk +++ b/config.mk @@ -5,7 +5,7 @@ MANPREFIX = ${PREFIX}/share/man # In dist tarballs, the version is stored in the VERSION files. VERSION := '$(shell [ -f VERSION ] && cat VERSION)' ifeq ('',$(VERSION)) -VERSION := $(shell git describe) +VERSION := $(shell git describe --tags) endif # Xinerama, comment if you don't want it From 1c1d173379bcd55a4f04fa11244e940b8769ef4d Mon Sep 17 00:00:00 2001 From: "Johannes M. Griebler" Date: Thu, 13 Oct 2016 19:59:08 +0200 Subject: [PATCH 2/2] Fix segfault while displaying startup notification --- dunst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dunst.c b/dunst.c index d8bf621..84cfcb0 100644 --- a/dunst.c +++ b/dunst.c @@ -331,6 +331,7 @@ int main(int argc, char *argv[]) n->plain_text = true; n->urgency = LOW; n->icon = NULL; + n->raw_icon = NULL; n->category = NULL; n->msg = NULL; n->dbus_client = NULL;