gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-misc/esekeyd: fix revision generation

Browse Source 
Fix revision generation based on upstream commits.

Closes: https://bugs.gentoo.org/905271
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Azamat H. Hackimov
2023-04-29 16:28:41 +03:00
committed by Conrad Kostecki
parent 429468a11e
commit 281f81b18d
2 changed files with 92 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app-misc/esekeyd/esekeyd-1.2.7-r2.ebuild Normal file
View File

@@ -0,0 +1,26 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
HOMEPAGE="https://github.com/burghardt/esekeyd"
SRC_URI="https://github.com/burghardt/esekeyd/archive/refs/tags/${P}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${PN}-${P}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
PATCHES=(
"${FILESDIR}/1.2.7-fix-revision.patch"
)
DOCS=( AUTHORS ChangeLog examples/example.conf NEWS README TODO )
src_prepare() {
default
eautoreconf
}

66
app-misc/esekeyd/files/1.2.7-fix-revision.patch Normal file
View File

@@ -0,0 +1,66 @@
From 28bd6caa3401b2e79fa4c922ecc2d5d1ada8460f Mon Sep 17 00:00:00 2001
From: Krzysztof Burghardt <krzysztof@burghardt.pl>
Date: Tue, 11 Aug 2015 07:03:34 +0200
Subject: [PATCH] Include git describe output in each binary.
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,5 +9,12 @@ version.h:
endif
echo \#define PACKAGE_VERSION_SVN_REV \"SVN-r`svnversion`\" > version.h
+if DOT_GIT
+version.h: .git/HEAD .git/index
+else
+version.h:
+endif
+ echo \#define PACKAGE_VERSION_SVN_REV \"GIT-`git describe --dirty --always --tags`\" > version.h
+
all: config.h version.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR(src/esekeyd.c)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE
AM_CONDITIONAL([DOT_SVN], [test -f .svn/entries])
+AM_CONDITIONAL([DOT_GIT], [test -f .git/index])
if test "$CFLAGS"; then
CFLAGS_CUSTOM=yes
From dbac719dfd8d0d4aa4fe4699c73772553d7566f7 Mon Sep 17 00:00:00 2001
From: Krzysztof Burghardt <krzysztof@burghardt.pl>
Date: Thu, 13 Aug 2015 22:30:17 +0200
Subject: [PATCH] Do not override all:, use BUILT_SOURCES for version.h
generation.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,20 @@
SUBDIRS = src doc examples
+BUILT_SOURCES = version.h
EXTRA_DIST = version.h
if DOT_SVN
version.h: .svn/entries
-else
-version.h:
-endif
echo \#define PACKAGE_VERSION_SVN_REV \"SVN-r`svnversion`\" > version.h
-
+else
if DOT_GIT
version.h: .git/HEAD .git/index
+ echo \#define PACKAGE_VERSION_SVN_REV \"GIT-`git describe --dirty --always --tags`\" > version.h
else
version.h:
+ echo \#define PACKAGE_VERSION_SVN_REV \"unknown\" > version.h
+endif
endif
- echo \#define PACKAGE_VERSION_SVN_REV \"GIT-`git describe --dirty --always --tags`\" > version.h
-all: config.h version.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+clean-local:
+ rm -f version.h