diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2016-06-14 23:09:39 -0400 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2016-06-14 23:11:49 -0400 |
| commit | e6f0576d0a5e1f59940c5e51b8480907d6667c0d (patch) | |
| tree | c3d0774aeb9ced30336fc9e8e48b3f69f169ef1f /games-emulation/sdlmame/files | |
| parent | games-emulation/sdlmame: version bump (diff) | |
| download | gentoo-e6f0576d0a5e1f59940c5e51b8480907d6667c0d.tar.gz gentoo-e6f0576d0a5e1f59940c5e51b8480907d6667c0d.tar.bz2 gentoo-e6f0576d0a5e1f59940c5e51b8480907d6667c0d.zip | |
games-emulation/sdlmame: clean old
Package-Manager: portage-2.2.28
Diffstat (limited to 'games-emulation/sdlmame/files')
| -rw-r--r-- | games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch | 28 | ||||
| -rw-r--r-- | games-emulation/sdlmame/files/sdlmame-0.173-qt.patch | 29 |
2 files changed, 0 insertions, 57 deletions
diff --git a/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch b/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch deleted file mode 100644 index bd88cb476e8a..000000000000 --- a/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch +++ /dev/null @@ -1,28 +0,0 @@ -# work around gcc-4.9.3's implementation of cxx14 -# bug 582576 with patch from Alexander Miller -# https://bugs.gentoo.org/show_bug.cgi?id=582576 - ---- a/src/lib/util/strformat.h -+++ b/src/lib/util/strformat.h -@@ -185,9 +185,8 @@ - #include <type_traits>
- #include <utility>
-
--#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
--namespace std
--{
-+namespace std {
-+namespace mame_cxx14_compat {
- template<class _Container>
- inline constexpr auto
- cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont))
-@@ -198,7 +197,8 @@ - cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont))
- { return std::end(__cont); }
- }
--#endif
-+using namespace mame_cxx14_compat;
-+}
-
- namespace util {
- namespace detail {
diff --git a/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch b/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch deleted file mode 100644 index f9c384d91cf8..000000000000 --- a/games-emulation/sdlmame/files/sdlmame-0.173-qt.patch +++ /dev/null @@ -1,29 +0,0 @@ -No point in adding qt-related things to the compile line unless the qt debugger is wanted - ---- scripts/src/osd/sdl_cfg.lua.orig -+++ scripts/src/osd/sdl_cfg.lua -@@ -115,14 +115,16 @@ - configuration { }
-
- elseif _OPTIONS["targetos"]=="linux" then
-- if _OPTIONS["QT_HOME"]~=nil then
-- buildoptions {
-- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
-- }
-- else
-- buildoptions {
-- backtick("pkg-config --cflags Qt5Widgets"),
-- }
-+ if _OPTIONS["USE_QTDEBUG"]=="1" then
-+ if _OPTIONS["QT_HOME"]~=nil then
-+ buildoptions {
-+ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
-+ }
-+ else
-+ buildoptions {
-+ backtick("pkg-config --cflags Qt5Widgets"),
-+ }
-+ end
- end
- elseif _OPTIONS["targetos"]=="macosx" then
- defines {
|