diff options
Diffstat (limited to 'sys-power/suspend')
4 files changed, 51 insertions, 3 deletions
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest index d68829150f80..a75dce296e40 100644 --- a/sys-power/suspend/Manifest +++ b/sys-power/suspend/Manifest @@ -1,6 +1,8 @@ +AUX suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch 594 BLAKE2B 701b3f254a5405bf89fa7aa706aa51910a00c450a5079cef13095b0e02a85d7a15826ea8fc4071e3db5cad55135aa980d0bb1cf7795cd78d09cd593325045c14 SHA512 4a769559842ccfcdb155afe3fee061e9780195f5aac090cf8c7de032abab27082279462f37c56909c30f67f17f6543dbe153cb511ad02007769498bc9134f4bc +AUX suspend-1.0_p20200924-fix-loff_t-for-musl.patch 541 BLAKE2B bcdff0919162886afe89338bcf01831717930636b9a19950b920a4836e74aa3deb0c4660894f6d809b051dd9b870409f0af98fe217c6ce05a1d8c518400fdb38 SHA512 bf87a57cc7eb8334f0fd542b9bdae42708f2c050f8d930f1171d333a45b124a8725d681676f96834530de5503cdeb465d96a6a6e8d818f54f1fe69dd1c3ca844 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be DIST suspend-1.0_p20190605.patch.xz 6224 BLAKE2B 0eefbef5a8d777590f69c85b02edb5575a357b373b78d94846e2c2bd59430cbd55af59ee0e676faa7f60388cb3910adb2182dedadb1fdc1df38a409411ea2df1 SHA512 cf576a029b35306368cbdabb9863965e055198920b86eab7205083f3502ae69ec3e8a4267fb6ceaaf1560a8bdb0c59543453f1baad4758c8adc4ac4ae92736bc DIST suspend-1.0_p20200924.patch.xz 6664 BLAKE2B 8a0529859cfd1a19f52fb46f306111ec4e520c9678113fd7c5ad12ada85bed89fedeeafee5145f11f07ef8dac1c6c1ae0ff2d6c6d6f794c268759d70895b1af9 SHA512 27c7cfcf2b2a0f8ccafd4c0020c1dce3aa1df352adac81ba5f24b76381a833f10621f7ae58e55c7c3d41f41ba63a38aa818454edaa32ad1f0fdc6db45b5bfe73 EBUILD suspend-1.0_p20190605.ebuild 1236 BLAKE2B 58de9f7d775ea9a68f7195816286b699ec0a2030b1cd019436e28cce341a0bdbf65655746dfe6f6b8f230db0e6fa4188e4a5a94e786cf61229fd2dbc9bfddefe SHA512 75764d08c169246882f1e177a327fa12f842c931b215af2de76d80039e42c7054be9ced7aeab4d7ecee9c311d5d913e5306595229faec1ce149c7739b43b3673 -EBUILD suspend-1.0_p20200924.ebuild 1236 BLAKE2B b4d02f9cb717d3b63b10e39114b2ccfa10bcc472ab0f5f5b9a39cc317a260e6000d9475f943f0661f6d2816e75c79140ccd41ed8dc4e5deffaf17f71e44bc301 SHA512 7b0203e0ec556fd0c0d0a743c130d48e73ea4290cd5f0caf62b0435007c320d2e4f4f411b396f414766a7b0acbca46f596e93eef89df98d0850134dca3fd02de +EBUILD suspend-1.0_p20200924.ebuild 1366 BLAKE2B 4953ef695487a6e3051f5bb979070190f41c77915e1250a857da917a26df63715ef4486affa75c060c714a26a7a3a4ae22ea4b5c656b05ca02a567bde87e7019 SHA512 ea60cec2e7daa68b8af84cffe7836564d21846c4368ea633a6caa7d3e11c5443a839b5462bfa2c89d73a5b0fb737d937095862da187028b077dfbcba8573c3bf MISC metadata.xml 389 BLAKE2B 0bc94dc6aa54043a6ab91fa6c38efd86bcf30994d48cbcffe7abda631d34722e1290c5b5cf94e2b68bcd0e4049f51aab530a2ddc773fa509e61e40749f729660 SHA512 4391c9a84e51fba159ecd8594288f45c25e0bcdfb7b96dc4c9240c79d872a573aeca1c4d02c2bc6353e1f5a089bf1f062ae4f7218d8b188b13d5850888427d59 diff --git a/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch b/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch new file mode 100644 index 000000000000..ea77ab450e71 --- /dev/null +++ b/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index 5f3adb5..b7f21eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -211,7 +211,12 @@ fi + if test "${enable_encrypt}" = "yes"; then + CONFIG_FEATURES="${CONFIG_FEATURES} encrypt" + AC_DEFINE([CONFIG_ENCRYPT], [1], [Define if encryption enabled]) +- AM_PATH_LIBGCRYPT([1:1.6.3], [], [AC_MSG_ERROR([Cannot locate >=libgcrypt-1.6.3])]) ++ PKG_CONFIG="pkg-config --static" ++ PKG_CHECK_MODULES([LIBGCRYPT], ++ [libgcrypt >= 1.6.3], ++ , ++ [AC_MSG_ERROR("Cannot locate >=libgcrypt-1.6.3")] ++ ) + fi + + if test "${enable_splashy}" = "yes"; then diff --git a/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch b/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch new file mode 100644 index 000000000000..37a77118f0c7 --- /dev/null +++ b/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch @@ -0,0 +1,24 @@ +diff --git a/configure.ac b/configure.ac +index 5f3adb5..0c544c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -126,6 +126,7 @@ AC_CHECK_PROGS([M4], [m4]) + AC_CHECK_PROG(PERL, perl, perl) + + AC_SYS_LARGEFILE ++AC_USE_SYSTEM_EXTENSIONS + + if test "${enable_create_device}" = "yes"; then + AC_CHECK_PROGS([MKNOD], [mknod]) +diff --git a/swsusp.h b/swsusp.h +index 5f89902..6f4863e 100644 +--- a/swsusp.h ++++ b/swsusp.h +@@ -9,6 +9,7 @@ + * + */ + ++#include "config.h" + #include <stdint.h> + #include <linux/fs.h> + #include <linux/suspend_ioctls.h> diff --git a/sys-power/suspend/suspend-1.0_p20200924.ebuild b/sys-power/suspend/suspend-1.0_p20200924.ebuild index 56be503b7da8..b4d67354418a 100644 --- a/sys-power/suspend/suspend-1.0_p20200924.ebuild +++ b/sys-power/suspend/suspend-1.0_p20200924.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,7 +32,11 @@ BDEPEND=" S="${WORKDIR}/${PN}" -PATCHES=( "${WORKDIR}/${P}.patch" ) +PATCHES=( + "${WORKDIR}/${P}.patch" + "${FILESDIR}/${PN}-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch" + "${FILESDIR}/${PN}-1.0_p20200924-fix-loff_t-for-musl.patch" + ) src_prepare() { default |