mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
main/powertop: fix build with gettext
This commit is contained in:
parent
ac63c9b15b
commit
d668634e90
2 changed files with 56 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: Steven Guikal <void@fluix.one>
|
||||
pkgname=powertop
|
||||
pkgver=2.15
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
pkgdesc="Power consumption monitor"
|
||||
url="https://github.com/fenrus75/powertop"
|
||||
arch="all"
|
||||
|
@ -23,11 +23,15 @@ subpackages="
|
|||
$pkgname-doc
|
||||
$pkgname-bash-completion
|
||||
"
|
||||
source="$pkgname-$pkgver-2.tar.gz::https://github.com/fenrus75/powertop/archive/refs/tags/v$pkgver.tar.gz"
|
||||
source="$pkgname-$pkgver-2.tar.gz::https://github.com/fenrus75/powertop/archive/refs/tags/v$pkgver.tar.gz
|
||||
powertop-2.15-gettext.patch
|
||||
"
|
||||
options="!check" # no tests
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
autoreconf -fi
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
|
@ -47,4 +51,5 @@ package() {
|
|||
|
||||
sha512sums="
|
||||
de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41 powertop-2.15-2.tar.gz
|
||||
4bda5c26692362d30cc7e20ff4c204c18604f9422cda0b3198730272bdc62eb4c6d1e9e15728b7def12df10ed4a1c06be59f07ac80e901e3556f4876dddaffc9 powertop-2.15-gettext.patch
|
||||
"
|
||||
|
|
49
main/powertop/powertop-2.15-gettext.patch
Normal file
49
main/powertop/powertop-2.15-gettext.patch
Normal file
|
@ -0,0 +1,49 @@
|
|||
https://bugs.gentoo.org/945828
|
||||
|
||||
From bd1c81e3e5e5f0af348fed5881c550432a275075 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Turner <mattst88@gmail.com>
|
||||
Date: Tue, 3 Dec 2024 19:42:33 -0500
|
||||
Subject: [PATCH] build: Use AM_GNU_GETTEXT_REQUIRE_VERSION and require 0.19.6
|
||||
|
||||
This bumps the version requirement from 0.19 (from 2014) to 0.19.6
|
||||
(2015).
|
||||
|
||||
Using only the old AM_GNU_GETTEXT_VERSION results in old gettext
|
||||
infrastructure being placed in the package. By using both macros we get
|
||||
the latest gettext files while the other programs in the Autotools
|
||||
family can still see the old macro.
|
||||
|
||||
Otherwise, with gettext-0.23 we get
|
||||
|
||||
```
|
||||
*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.22
|
||||
```
|
||||
|
||||
Equivalent to the commit to xz.git here:
|
||||
https://git.tukaani.org/?p=xz.git;a=commit;h=3d576cf92158d62790017ad7f2dd6dc1dd6b42bb
|
||||
---
|
||||
configure.ac | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git ./configure.ac ./configure.ac
|
||||
index c698818..2349c3c 100644
|
||||
--- ./configure.ac
|
||||
+++ ./configure.ac
|
||||
@@ -24,8 +24,13 @@ AC_CONFIG_HEADERS([config.h])
|
||||
GETTEXT_PACKAGE=powertop
|
||||
AC_SUBST([GETTEXT_PACKAGE])
|
||||
AM_SILENT_RULES([yes])
|
||||
+
|
||||
+dnl Support for _REQUIRE_VERSION was added in gettext 0.19.6. If both
|
||||
+dnl _REQUIRE_VERSION and _VERSION are present, the _VERSION is ignored.
|
||||
+dnl We use both for compatibility with other programs in the Autotools family.
|
||||
AM_GNU_GETTEXT([external])
|
||||
-AM_GNU_GETTEXT_VERSION([0.18.2])
|
||||
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
|
||||
+AM_GNU_GETTEXT_VERSION([0.19.6])
|
||||
|
||||
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE])
|
||||
--
|
||||
2.45.3
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue