diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-25 23:06:25 +0000 |
commit | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch) | |
tree | 6a5171dd615dfeee62a45044144c66e864738fb0 /x11-themes/gtk-engines | |
parent | ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff) |
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'x11-themes/gtk-engines')
-rw-r--r-- | x11-themes/gtk-engines/Manifest | 2 | ||||
-rw-r--r-- | x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest index 45a118e5cbc4..9f6fefe4219d 100644 --- a/x11-themes/gtk-engines/Manifest +++ b/x11-themes/gtk-engines/Manifest @@ -5,6 +5,6 @@ AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9 -EBUILD gtk-engines-2.20.2-r100.ebuild 1707 BLAKE2B 28b7e80b99eac648a76bd06d5a66be8584a020d910839a9bab89da5420d927b54f326a55172d4fb6cf9309bd36cddcd9d25360f367b03a0abcd97e6b3d078af7 SHA512 ce67eb04c4381235d2cec6a59e8c9e3d7a1768806d8ee5c4880a5e4fb0b422117fe5329ad7c9271cdbf12ce0ce677cb3c58d0f34a8faf211cd6d503c7f5b69e8 +EBUILD gtk-engines-2.20.2-r100.ebuild 1749 BLAKE2B 87b4bd76524a2f2dd9d4125275d36a87fd8c784b5f08ecd4abaad7b06603567cd20571921966bc680e37848af1fec2151d0e09fd37c1f69219630f94578f9b91 SHA512 12576f9ac3bd36d4090786c37d4d9bbff956b010fa80ec100e59bdf637daf4f10b5aa3680606641d1467512e09354ae4c3596461cc0f4b63e6fcb705a12e9bbf EBUILD gtk-engines-2.20.2-r2.ebuild 1383 BLAKE2B ec1441c73870bf753c88cf555e238a1c00f56cc2ab071197eb13b8dbf8c048dc7434e9ffd8032c102695f55799d17b127c66b4c54c9f3fc522971234dd88b7d4 SHA512 4bb2d643f6be737ad0e91b5a1301aaa331e25acad5783d50d7abd7a063833cea074e23c9e6f5568eac0b1b26d0b78f294d4a1c8ed12f678a20b351ef8227b9b1 MISC metadata.xml 667 BLAKE2B 4f110a2598845c8930ca8567655e34e87c9517cd68b41957d1450367b7e0ed783848bd7ce1213b407229fd7eea3b4a36760ddc7b921424821ae55fcb664e2788 SHA512 62bb1508fe80e89238a57dffb44b7e8951f5d5b8c50ddd412fdf84778e77a2e13c16bb6ff1045802fbd71a1dea038695b76febd024cb50b96258bfd67b32ad47 diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild index 597dc742bc9a..39c7e74458e0 100644 --- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild +++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild @@ -42,25 +42,19 @@ PATCHES=( src_prepare() { gnome2_src_prepare + # pkgconfig wrapper set up by lua-single.eclass is not multilib-compatible + # at present so point Autoconf directly to the correct implementation. + # We patch configure rather than configure.ac because running 'eautoreconf' + # results for some reason in corrupted test Makefiles. + sed -i -e "s|\"lua\"|\"${ELUA}\"|g" configure || die } multilib_src_configure() { local confopts=( --enable-animation + $(use_enable lua) + $(use_with lua system-lua) ) - # TODO: fix system-lua detection so that it works for non-native ABIs, - # native builds rely on the pkgconfig wrapper set up by lua-single.eclass - # but that wrapper is not multilib-compatible. - if multilib_is_native_abi; then - confopts+=( - $(use_enable lua) - $(use_with lua system-lua) - ) - else - confopts+=( - --disable-lua - ) - fi ECONF_SOURCE=${S} gnome2_src_configure "${confopts[@]}" } |