diff options
Diffstat (limited to 'app-admin/xstow/files')
| -rw-r--r-- | app-admin/xstow/files/xstow-1.0.1-ncurses.patch | 56 | ||||
| -rw-r--r-- | app-admin/xstow/files/xstow-1.1.0-clang.patch | 37 |
2 files changed, 37 insertions, 56 deletions
diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch deleted file mode 100644 index b7d29f287e7f..000000000000 --- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -91,11 +91,12 @@ - AC_MSG_RESULT(disabled) - support_curses=0 - else -+ AC_MSG_RESULT(enabled) - support_curses=1 - fi - ], -- [ -- AC_MSG_RESULT(enabled) -+ []) -+if test $support_curses -eq 1; then - AC_CHECK_HEADER([curses.h], - [ - # test which libraray to use -@@ -146,7 +147,7 @@ - fi - - if test $support_curses -eq 1; then -- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib") -+ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib") - AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used]) - fi - -@@ -154,8 +155,7 @@ - [ - support_curses=0 - ]) -- ]) -- -+fi - - NO_STL_SSTREAM=0 - NO_STL_STRSTREAM=0 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,7 +46,7 @@ - backtrace.h \ - backtrace.cpp - --xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) -+xstow_LDADD= $(LDFLAGS_DYNAMIC) - - if ENABLE_MERGE - -@@ -63,7 +63,7 @@ - backtrace.h \ - backtrace.cpp - --merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) -+merge_info_LDADD= $(LDFLAGS_DYNAMIC) - - endif - diff --git a/app-admin/xstow/files/xstow-1.1.0-clang.patch b/app-admin/xstow/files/xstow-1.1.0-clang.patch new file mode 100644 index 000000000000..0f880b00cb91 --- /dev/null +++ b/app-admin/xstow/files/xstow-1.1.0-clang.patch @@ -0,0 +1,37 @@ +https://github.com/majorkingleo/xstow/commit/bdcbdb6f6e0f35ed0a0df50f0a9d19441af9c866 + +From: Martin Oberzalek <kingleo@gmx.at> +Date: Wed, 27 Jul 2022 09:25:03 +0200 +Subject: [PATCH] Fixed compilation with clang + +--- a/src/cpputils/cpputilsshared/cpputilsformat/format2.h ++++ b/src/cpputils/cpputilsshared/cpputilsformat/format2.h +@@ -40,7 +40,7 @@ namespace Tools { + bool _is_string; + + public: +- BaseArg( bool is_int_, bool is_string_ ) ++ BaseArg( bool is_int_ = false, bool is_string_ = false ) + : _is_int( is_int_ ), + _is_string( is_string_ ) + {} +--- a/src/cpputils/cpputilsshared/leoini.h ++++ b/src/cpputils/cpputilsshared/leoini.h +@@ -278,12 +278,11 @@ namespace Leo + std::string::size_type end = s.find( ']', start ); + + if( start == std::string::npos || +- end == std::string::npos ) +- s = ""; +- else +- s = s.substr( start+1, start-end -1 ); +- +- return s2x<A>(s); ++ end == std::string::npos ) { ++ return s2x<A>(""); ++ } else { ++ return s2x<A>( s.substr( start+1, start-end -1 ) ); ++ } + } + } // namespace Leo + |