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: Tue Jan 17 20:16:16 2017 +0100
Changeset: 5db7b33eda7457276b0dae91cd4d2c0a25f94d4a
Modified Files:
i3-git/distinfo
i3-git/patches/patch-configure.ac
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=5db7b33eda7457276b0dae91cd4d2c0a25f94d4a
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-configure.ac | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diffs:
diff --git a/i3-git/distinfo b/i3-git/distinfo
index 195a5e6..93d8dda 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-configure.ac) = b8b2aa6ce49880d30acaf219050f4e6763b42b96
+SHA1 (patch-configure.ac) = 23b0445856d40c581dbbbc520c8e84ccf74e4187
SHA1 (patch-src_log.c) = bdcb87df351ad9f4c3346726da8de18732813b8f
diff --git a/i3-git/patches/patch-configure.ac b/i3-git/patches/patch-configure.ac
index 59a981e..b1e3890 100644
--- a/i3-git/patches/patch-configure.ac
+++ b/i3-git/patches/patch-configure.ac
@@ -2,16 +2,16 @@ $NetBSD$
Get the version from autoconf configuration instead of from git
---- configure.ac.orig 2016-11-07 19:55:04.000000000 +0000
+--- configure.ac.orig 2017-01-17 03:35:02.000000000 +0000
+++ configure.ac
-@@ -25,8 +25,8 @@ AX_EXTEND_SRCDIR
+@@ -31,8 +31,8 @@ AX_EXTEND_SRCDIR
AS_IF([test -d ${srcdir}/.git],
[
-- VERSION="$(git describe --tags --abbrev=0)"
-- I3_VERSION="$(git describe --tags --always) ($(git log --pretty=format:%cd --date=short -n1), branch \\\"$(git describe --tags --always --all | sed s:heads/::)\\\")"
+- VERSION="$(git -C ${srcdir} describe --tags --abbrev=0)"
+- I3_VERSION="$(git -C ${srcdir} describe --tags --always) ($(git -C ${srcdir} log --pretty=format:%cd --date=short -n1), branch \\\"$(git -C ${srcdir} describe --tags --always --all | sed s:heads/::)\\\")"
+ VERSION=${PACKAGE_VERSION}
-+ I3_VERSION="${PACKAGE_VERSION}-$(git describe --tags --always) ($(git log --pretty=format:%cd --date=short -n1), branch \\\"$(git describe --tags --always --all | sed s:heads/::)\\\")"
++ I3_VERSION="${PACKAGE_VERSION}-$(git -C ${srcdir} describe --tags --always) ($(git -C ${srcdir} log --pretty=format:%cd --date=short -n1), branch \\\"$(git -C ${srcdir} describe --tags --always --all | sed s:heads/::)\\\")"
# Mirrors what libi3/is_debug_build.c does:
is_release=$(test $(echo "${I3_VERSION}" | cut -d '(' -f 1 | wc -m) -lt 10 && echo yes || echo no)
],
Home |
Main Index |
Thread Index |
Old Index