Gentoo Archives: gentoo-commits

From: "Sebastian Pipping (sping)" <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/svn2git/files: svn2git-1.0.10-version.patch
Date: Tue, 21 May 2013 21:39:12
Message-Id: 20130521213815.7EBD42171D@flycatcher.gentoo.org
1 sping 13/05/21 21:38:15
2
3 Added: svn2git-1.0.10-version.patch
4 Log:
5 dev-vcs/svn2git: 1.0.10
6
7 (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
8
9 Revision Changes Path
10 1.1 dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch?rev=1.1&content-type=text/plain
14
15 Index: svn2git-1.0.10-version.patch
16 ===================================================================
17 From d8b1c8c774a61666e7c62bf5beb8f0f1b4a3e01a Mon Sep 17 00:00:00 2001
18 From: Sebastian Pipping <sebastian@×××××××.org>
19 Date: Tue, 21 May 2013 23:11:25 +0200
20 Subject: [PATCH] Stop using Git SHA1 version string
21
22 diff --git a/src/src.pro b/src/src.pro
23 index da6d40d..2626a6f 100644
24 --- a/src/src.pro
25 +++ b/src/src.pro
26 @@ -6,10 +6,7 @@ SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
27 APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
28 exists(local-config.pri):include(local-config.pri)
29
30 -VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
31 - !isEmpty(VERSION){
32 - VERSION = $${VERSION}
33 - }
34 +VERSION = $$(SVN_ALL_FAST_EXPORT_VERSION)
35
36 VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
37 DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
38 --
39 1.8.2.1