pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
i3-git: Update a patch
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Fri Sep 2 21:17:41 2016 +0200
Changeset: d71c985d58dd5ec724f57fd408dbd17eb067b3e7
Modified Files:
i3-git/distinfo
i3-git/patches/patch-common.mk
Log Message:
i3-git: Update a patch
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d71c985d58dd5ec724f57fd408dbd17eb067b3e7
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 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diffs:
diff --git a/i3-git/distinfo b/i3-git/distinfo
index 5f52f50..9c4f817 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) = 219f43cf29b19d43885c17e7b6e203ce05afc2e0
+SHA1 (patch-common.mk) = ea0a488c62ed0fbbc4a59d820077351df747ecd9
SHA1 (patch-src_log.c) = bdcb87df351ad9f4c3346726da8de18732813b8f
diff --git a/i3-git/patches/patch-common.mk b/i3-git/patches/patch-common.mk
index 31dd80c..85068f6 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-04-10 15:36:19.000000000 +0000
+--- common.mk.orig 2016-08-26 00:48:27.000000000 +0000
+++ common.mk
@@ -24,7 +24,7 @@ ifeq ($(wildcard .git),)
- VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
- I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
+ 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)
else
- VERSION := $(shell git describe --tags --abbrev=0)
+ VERSION ?= $(shell git describe --tags --abbrev=0)
Home |
Main Index |
Thread Index |
Old Index