diff options
Diffstat (limited to 'sys-power')
-rw-r--r-- | sys-power/Manifest.gz | bin | 5594 -> 5595 bytes | |||
-rw-r--r-- | sys-power/powertop/Manifest | 3 | ||||
-rw-r--r-- | sys-power/powertop/files/powertop-2.15-gettext.patch | 49 | ||||
-rw-r--r-- | sys-power/powertop/powertop-2.15.ebuild | 1 |
4 files changed, 52 insertions, 1 deletions
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz Binary files differindex 8ffc0ee7cc4c..c6540f7bdbe6 100644 --- a/sys-power/Manifest.gz +++ b/sys-power/Manifest.gz diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest index 257ba9d28f9c..a0c927e4ea56 100644 --- a/sys-power/powertop/Manifest +++ b/sys-power/powertop/Manifest @@ -1,5 +1,6 @@ +AUX powertop-2.15-gettext.patch 1672 BLAKE2B 1fc1de94449b246204d8ab55ef0286e6f09d7f178e113af2000af3e66ab63d888e6a7898f4805149197fc8d9a905505c655fa99216f8c5318dadf9d3a4a17075 SHA512 4bda5c26692362d30cc7e20ff4c204c18604f9422cda0b3198730272bdc62eb4c6d1e9e15728b7def12df10ed4a1c06be59f07ac80e901e3556f4876dddaffc9 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522 DIST powertop-2.15.tar.gz 302891 BLAKE2B f554ee9499c78f1888ecd58a1a357bc6f29f53ae2d3bf6b2819d760afe901f5d5394665a2e6a3ecae9b48cbf9703532feb5c16da9bd3edd4f1d31fe12610a2da SHA512 de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41 -EBUILD powertop-2.15.ebuild 3483 BLAKE2B 0eec2393d616b3ea8e395ea0237947c3a6bd05b4e3856c05b071d4c3280e8a5e8a6fc1ab98b3ecbeccb4c13b3b0e916ad504f98e4f398bb1232a0711083110f8 SHA512 b7f0efdc99475e604d11c1d51947eca6a7777809fbc2f45bb8ab8b6e86ab3d4aebd01de87b84be3533c6bf616e40c5fd336e77fe06cb15f9c4eb92a98dfa0fb9 +EBUILD powertop-2.15.ebuild 3523 BLAKE2B e6c48bb7235a5db33a868cfdf7812ed24530b4d1ad9f61e882941f364b5e82697948ce31fd1f4a6a0750a350ad67ff126dcbb7811322452be13c04dea6a7ed1f SHA512 0ac038fe598487226e002b31ffd828515b8927451f1d06c3d958e4ee55c8e4f6420833dbc49dc2fe9a0622e2323c4cc889940426a3aea41344195398688677fe EBUILD powertop-9999.ebuild 3473 BLAKE2B 5b108a050ffb4053199dac8f73a2c5b6b524d2dd6ac18c9c490c207f97a7881e9ba848c8d15e889e65d077383f599a66da7e5df030b5bc9aadbe47d633effda6 SHA512 b0efc0ccb076d78cca7bb2058149b351de60f536ea7cd30214afc968a120aecabd00a4e80050e0e4dc73130d074642226f671ade99fca9ebfb80f1f9a4997a1e MISC metadata.xml 329 BLAKE2B 36e2978d4bf67578b4b7f91394698392a26706d5192ce83091c904255009dee966e58b7b10e92b23852a304f870b866f46904d0ea118efa1b192b467aff71511 SHA512 5621a5cdf201d058b65bcb4c4afea6b8bb3ef7d7fb67fc9c582f5d728b19693883493255e485e90aaa06a18ceb6bde55f6bd099f1be454be3bad762be7ff5843 diff --git a/sys-power/powertop/files/powertop-2.15-gettext.patch b/sys-power/powertop/files/powertop-2.15-gettext.patch new file mode 100644 index 000000000000..243cb11dd9ba --- /dev/null +++ b/sys-power/powertop/files/powertop-2.15-gettext.patch @@ -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 + diff --git a/sys-power/powertop/powertop-2.15.ebuild b/sys-power/powertop/powertop-2.15.ebuild index 91149b6a6d1b..e3c075a2ce6f 100644 --- a/sys-power/powertop/powertop-2.15.ebuild +++ b/sys-power/powertop/powertop-2.15.ebuild @@ -40,6 +40,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch + "${FILESDIR}"/${PN}-2.15-gettext.patch ) pkg_setup() { |