diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /x11-wm/fluxbox | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'x11-wm/fluxbox')
| -rw-r--r-- | x11-wm/fluxbox/Manifest | 3 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch | 28 | ||||
| -rw-r--r-- | x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild | 4 |
3 files changed, 34 insertions, 1 deletions
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index 20872c09e4d7..084921447f44 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -1,4 +1,5 @@ AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9cd74e8dba2890bd20d91714c03834286a8f6fe962e793ba5815a7ef1215c09c276cc6eb219851655f19f8402a5 SHA512 69705c1c24bb7696c59a82dc20ef5319562cfd67b4e9b6903cd5de02744c48bfce132949ed7eae4879bf89a08bebeb592d35d0ce77b24c17ad172740a15215b1 +AUX fluxbox-1.3.7-c++17.patch 899 BLAKE2B a1821355da598474bc7745dc4d96811c77580f35b95debcf37a07a4c1622e86b3bfc7105e7e50dfe22c26f6c5873531f6de2cc04f6c94f87cbf4a08da14b4e85 SHA512 6944ccd734de426c90f4374f8bb5ce64b0c8fe46076577cee80195949f364e3f59a3c72bcb4844f8766794e42c47345587da06cda68deb4e22a8715efa2364af AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0 AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72 AUX gentoo_style_location-1.1.x.patch 735 BLAKE2B bd441ccd5c2819770543effd6fcbc1b33adf52352cfd0a4802140b32083302e665cfa9fed9c1417698f706fa36d8ae0d9b7e2fa19a983aa8f61292dbca27b9d0 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220 @@ -7,5 +8,5 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 -EBUILD fluxbox-1.3.7-r4.ebuild 3027 BLAKE2B ddc8b03283a87a3eb6fdda43f1bbf2ac78d3d484cb99787a38fe495a404011ba42d6665edee5bc3a1bcc2bdea4407f02649bb0838146a381312ef1d409a800fc SHA512 f815a98348ce4e5e6fc52b612448d23ad1d1953c92d853d241aef4ea3d2ebcc78a9bd0e21f76859f7393dafad403466e6e70068724ab575b30c1e31488b67681 +EBUILD fluxbox-1.3.7-r4.ebuild 3072 BLAKE2B ce100de155dd674c1fa6a4fd601c70255f1312571f441c24541793acc6074e4b5c8e3c8a10596db0876e8783eb9655387655413b8cceed79ecb53931d2682f67 SHA512 98ed088be26539220579a8f13405df71937a1d8b5a7e5fe330334bc08c02028fbff7ada4855bd3cc72bc208d6a65bb2babe645981609caaa7e45e9f31a968add MISC metadata.xml 892 BLAKE2B 83aa00ca67e0a6239d9086b9550969068155e9dee4a6dcca0340e553bd43097e9700bd68637bb0a94d0051b8b19a2a5abc2147ac16e0ae7b28836d7a9b79ae4d SHA512 fd8410c6214cf63d781b148ee2add0c46cfbd050cc22412afef43f3b2cfb6eca9a97f66518f138db0d5f695dcca522fccf44c422e481589718ab14394b8d741a diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch new file mode 100644 index 000000000000..37e450b08f16 --- /dev/null +++ b/x11-wm/fluxbox/files/fluxbox-1.3.7-c++17.patch @@ -0,0 +1,28 @@ +http://git.fluxbox.org/fluxbox.git/patch/?id=22866c4d30f5b289c429c5ca88d800200db4fc4f +https://bugs.gentoo.org/732782 + +From 22866c4d30f5b289c429c5ca88d800200db4fc4f Mon Sep 17 00:00:00 2001 +From: John Sennesael <john@aminking.com> +Date: Mon, 2 Nov 2015 15:14:32 -0600 +Subject: fixes bug #1138 + +--- + util/fluxbox-remote.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc +index 59852e6..504015b 100644 +--- a/util/fluxbox-remote.cc ++++ b/util/fluxbox-remote.cc +@@ -73,7 +73,7 @@ int main(int argc, char **argv) { + if (strcmp(cmd, "result") == 0) { + XTextProperty text_prop; + if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0 +- && text_prop.value > 0 ++ && text_prop.value != 0 + && text_prop.nitems > 0) { + + printf("%s", text_prop.value); +-- +cgit v0.11.2 + diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild index 762963c89327..1acca6751070 100644 --- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild @@ -34,6 +34,10 @@ BDEPEND="bidi? ( virtual/pkgconfig ) DEPEND="${RDEPEND} x11-base/xorg-proto" +PATCHES=( + "${FILESDIR}"/${P}-c++17.patch +) + src_prepare() { default # We need to be able to include directories rather than just plain |