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 /dev-games/mygui | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-games/mygui')
| -rw-r--r-- | dev-games/mygui/Manifest | 3 | ||||
| -rw-r--r-- | dev-games/mygui/files/mygui-3.2.2-c++17.patch | 27 | ||||
| -rw-r--r-- | dev-games/mygui/mygui-3.2.2.ebuild | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest index ee69eae76801..23758d0c6e3b 100644 --- a/dev-games/mygui/Manifest +++ b/dev-games/mygui/Manifest @@ -1,10 +1,11 @@ AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d95837795820baf5e0e6a11a03448f57cf761f240d3fa62e2f1ef121ac2e9b48b802edf74905fdf68f6744773f612cbe9 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d +AUX mygui-3.2.2-c++17.patch 824 BLAKE2B d70fb25cffd51ac28aa0d443d0162ed76f11624e311fdbf71f1fd0321670203b9925fb9494586e9f289f9781faee3822073b06ac0ebd61a739350b7fdf38c401 SHA512 cf532e56e9324ac956745639a1a625cd54a494dafe1aa0bb086ce851428d758c71f13c77e415f2e0611b6772335902b225e128f15883c7adfd4d7c11a625c6ed AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9 AUX mygui-3.4.0-build.patch 2492 BLAKE2B 2819c235df3d479d42831fcf2a80a9a2e165b98acc87c7cd3105b5285b0bfa0d0e84ae2c8642d91260096cf2404e9a690812008e92cd5a5167e1dffc89f49809 SHA512 9dc685f71d14e369a8a3fff5e10572817a4d1a943471decb94e3d25133d53c5cc7401f8c360f0bcb1cc1188beb6e1a76521d51cdb88cb1f32eda1715c765da2e AUX mygui-3.4.0-underlinking.patch 491 BLAKE2B bc7d2facd04637f4d6b4ca2c2a353a66c16ce781050ecf6f59a461acedaa0dcb6293742bd83214c4e32bdbcda18ae461b9f60e90fd6f450832ba5ef002fb468f SHA512 0cdcd0906b52abc7843ae588d7afd8f1450bcf7162d41efb2af6a3744a64bb6e02ffdcdc6cd3346f72be7f5361a25bf35d937fac983814077deb339ed7b7dbfa DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4 DIST mygui-3.4.0.tar.gz 22391483 BLAKE2B 5628cca98625285368b9363acd95e541e1ba7d86fd1d471f687c553d0f0abd9ccb2f47981cf0bb91f44a68489bb7ec3fbcb451734758e2435ab9ef320214465a SHA512 3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487 -EBUILD mygui-3.2.2.ebuild 3733 BLAKE2B 0b356da39fa55bd4b53befe2ee1fda7505e6daa61a49b9af0aa7b85e168dd247f8a731b81c65be6046de0d315fcb9fc0237f8818dba3be0a56c0f89fb62c3a12 SHA512 32609bf5200de72f267d493d99bf23c0baf97005e2d8c126ba3638bd5d08f2a26c2430d4801fca91f529946f5aff98687b58eaf17e173627a5bdad29c20c3da8 +EBUILD mygui-3.2.2.ebuild 3765 BLAKE2B 97e1bbfbb6287fd0963677ed84297bace17efffa5779b0972981d2fe1576d9a43379870275537a097903c4bfe92baa3f32a467b514166992fb5b4feba50bf1bb SHA512 2ea444ba8dd5830b0c423f4c65201557739e8c3759e95924b153518dd634c51c0cd10a6443f31a467b211b24f18b68f304ef7f1af798651b981a08ea1111bea0 EBUILD mygui-3.4.0.ebuild 3758 BLAKE2B 1d456f5e82b7357ae624b19ef43103d55a30df7ba2c9df856cbe22f5a118842cf183eb5a0ff2eaf4d40f6eef95faa5c4b021905845a158ef30e1f93ce2373144 SHA512 eecc3f87a738021a43fc3d48e34fdc1492fd3de557a0f520fda9437669436813635136e1ba4535a406e636b0f64d6abd3274fc8d70100017649eecdc5daf47f7 MISC metadata.xml 2012 BLAKE2B 6f3b20aa2f4f557b3499d98b758d4e402903a6f56580062ae9442b38508abe3841584e550bb20cbce31b93a052ef78231c8ba9568dba1d8bb9459a11f32d625a SHA512 05633f451013eff1de94fc2707bf9df21a2b8e6a8466a988f743ec12e04c12e6e81a0fbc4c74c081905ff81ba45f571459d3584a264ae5347e13cc2b4139ff79 diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch new file mode 100644 index 000000000000..1cdf7babeb12 --- /dev/null +++ b/dev-games/mygui/files/mygui-3.2.2-c++17.patch @@ -0,0 +1,27 @@ +https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch +https://bugs.gentoo.org/732778 + +Part of: + +From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001 +From: George Evmenov <george.evmenov@geocv.com> +Date: Fri, 26 Jun 2015 12:25:26 +0300 +Subject: [PATCH] do not use nullptr define + +--- a/MyGUIEngine/include/MyGUI_Prerequest.h ++++ b/MyGUIEngine/include/MyGUI_Prerequest.h +@@ -19,13 +19,7 @@ + #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch) + + #ifndef MYGUI_DONT_REPLACE_NULLPTR +-# if MYGUI_COMPILER == MYGUI_COMPILER_MSVC +-# ifndef _MANAGED +-# ifndef _NATIVE_NULLPTR_SUPPORTED +-# define nullptr 0 +-# endif +-# endif +-# else ++# if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED) + # define nullptr 0 + # endif + #endif diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild index ac582627a70d..dc3766716faf 100644 --- a/dev-games/mygui/mygui-3.2.2.ebuild +++ b/dev-games/mygui/mygui-3.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}"/${P}-underlinking.patch "${FILESDIR}"/${P}-build.patch "${FILESDIR}"/${P}-FHS.patch + "${FILESDIR}"/${P}-c++17.patch ) pkg_setup() { |