pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
i3-git: Update a patch, again
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Tue Sep 6 20:08:48 2016 +0200
Changeset: 657d25a85b1d2b1a9bd5376f3ec7cccd44514e4d
Modified Files:
i3-git/distinfo
i3-git/patches/patch-common.mk
Log Message:
i3-git: Update a patch, again
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=657d25a85b1d2b1a9bd5376f3ec7cccd44514e4d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
i3-git/distinfo | 2 +-
i3-git/patches/patch-common.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diffs:
diff --git a/i3-git/distinfo b/i3-git/distinfo
index 9c4f817..80659c1 100644
--- a/i3-git/distinfo
+++ b/i3-git/distinfo
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.9 2015/11/09 11:05:44 nros Exp $
-SHA1 (patch-common.mk) = ea0a488c62ed0fbbc4a59d820077351df747ecd9
+SHA1 (patch-common.mk) = 2591b31f59b018d0aa65a0ff969a8f47eaaf7664
SHA1 (patch-src_log.c) = bdcb87df351ad9f4c3346726da8de18732813b8f
diff --git a/i3-git/patches/patch-common.mk b/i3-git/patches/patch-common.mk
index 85068f6..6c29399 100644
--- a/i3-git/patches/patch-common.mk
+++ b/i3-git/patches/patch-common.mk
@@ -2,11 +2,11 @@ $NetBSD$
Allow setting VERSION and prevent overwriting it.
---- common.mk.orig 2016-08-26 00:48:27.000000000 +0000
+--- common.mk.orig 2016-09-06 02:03:21.000000000 +0000
+++ common.mk
@@ -24,7 +24,7 @@ ifeq ($(wildcard .git),)
VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION | cut -d '-' -f 1)
- I3_VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)
+ I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
else
- VERSION := $(shell git describe --tags --abbrev=0)
+ VERSION ?= $(shell git describe --tags --abbrev=0)
Home |
Main Index |
Thread Index |
Old Index