[gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/files/

[Patrice Clement]

commit:     01433ed7cf343ade9b23bf1cce88c702d4d620cc
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 30 18:01:57 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 07:34:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01433ed7

app-admin/xstow: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/1807

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-admin/xstow/files/xstow-0.5.1-gcc43.patch | 67 ---------------------------
 1 file changed, 67 deletions(-)

diff --git a/app-admin/xstow/files/xstow-0.5.1-gcc43.patch b/app-admin/xstow/files/xstow-0.5.1-gcc43.patch
deleted file mode 100644
index ded9e32..0000000
--- a/app-admin/xstow/files/xstow-0.5.1-gcc43.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- xstow-0.5.1.orig/src/format.h
-+++ xstow-0.5.1/src/format.h
-@@ -648,17 +648,17 @@
- 		
- 		switch( num_of_args )
- 		{
--		    case 1: n = std::snprintf( buffer, buffer_size, format.c_str(),
-+		    case 1: n = snprintf( buffer, buffer_size, format.c_str(),
- 					       D( a ) ); break;
--		    case 2: n = std::snprintf( buffer, buffer_size, format.c_str(),
-+		    case 2: n = snprintf( buffer, buffer_size, format.c_str(),
- 					       D( a ), D( b ) ); break;
--		    case 3: n = std::snprintf( buffer, buffer_size, format.c_str(),
-+		    case 3: n = snprintf( buffer, buffer_size, format.c_str(),
- 					       D( a ), D( b ), D( c ) ); break;
--		    case 4: n = std::snprintf( buffer, buffer_size, format.c_str(),
-+		    case 4: n = snprintf( buffer, buffer_size, format.c_str(),
- 					       D( a ), D( b ), D( c ), D( d ) ); break;
--		    case 5: n = std::snprintf( buffer, buffer_size, format.c_str(),
-+		    case 5: n = snprintf( buffer, buffer_size, format.c_str(),
- 					       D( a ), D( b ), D( c ), D( d ), D( e ) ); break;
--		    case 6: n = std::snprintf( buffer, buffer_size, format.c_str(),
-+		    case 6: n = snprintf( buffer, buffer_size, format.c_str(),
- 					       D( a ), D( b ), D( c ), D( d ), D( e ), D( f ) ); break;
- 		}
- 		
---- xstow-0.5.1.orig/src/main.cpp
-+++ xstow-0.5.1/src/main.cpp
-@@ -1,3 +1,4 @@
-+#include <cstdlib>
- #include <iostream>
- 
- #include "local_config.h"
---- xstow-0.5.1.orig/src/cppdir.cpp
-+++ xstow-0.5.1/src/cppdir.cpp
-@@ -1,6 +1,8 @@
- #include "cppdir.h"
- #include "debug.h"
- 
-+#include <cstdlib>
-+
- #define OUT(level) DEBUG_OUT( level, MODULE_CPPDIR)
- 
- extern "C" {
---- xstow-0.5.1.orig/src/setup.cpp
-+++ xstow-0.5.1/src/setup.cpp
-@@ -5,6 +5,8 @@
- #include "debug.h"
- #include "nignore.h"
- 
-+#include <cstdlib>
-+
- #undef OUT
- 
- #define OUT( level ) DEBUG_OUT( level, MODULE_SETUP )
---- xstow-0.5.1.orig/src/tree.cpp
-+++ xstow-0.5.1/src/tree.cpp
-@@ -26,6 +26,7 @@
- 
- 
- #include <algorithm>
-+#include <cstring>
- 
- #define OUT(level) DEBUG_OUT(level, MODULE_TREE)
- 
-
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/files/

[Sam James]

commit:     826d550bd9519c565ea6ccfbcc485fbf713f5b4e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 08:16:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 08:18:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826d550b

app-admin/xstow: cleanup patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/xstow/files/xstow-1.1.0-clang.patch | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/app-admin/xstow/files/xstow-1.1.0-clang.patch b/app-admin/xstow/files/xstow-1.1.0-clang.patch
index dc85f734aff4..0f880b00cb91 100644
--- a/app-admin/xstow/files/xstow-1.1.0-clang.patch
+++ b/app-admin/xstow/files/xstow-1.1.0-clang.patch
@@ -1,15 +1,9 @@
-From bdcbdb6f6e0f35ed0a0df50f0a9d19441af9c866 Mon Sep 17 00:00:00 2001
+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
 
----
- src/cpputils/cpputilsshared/cpputilsformat/format2.h |  2 +-
- src/cpputils/cpputilsshared/leoini.h                 | 11 +++++------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpputils/cpputilsshared/cpputilsformat/format2.h b/src/cpputils/cpputilsshared/cpputilsformat/format2.h
-index eb084e2..b3d7624 100644
 --- a/src/cpputils/cpputilsshared/cpputilsformat/format2.h
 +++ b/src/cpputils/cpputilsshared/cpputilsformat/format2.h
 @@ -40,7 +40,7 @@ namespace Tools {
@@ -21,8 +15,6 @@ index eb084e2..b3d7624 100644
      : _is_int( is_int_ ),
        _is_string( is_string_ )
      {}
-diff --git a/src/cpputils/cpputilsshared/leoini.h b/src/cpputils/cpputilsshared/leoini.h
-index ee77511..0ad8493 100644
 --- a/src/cpputils/cpputilsshared/leoini.h
 +++ b/src/cpputils/cpputilsshared/leoini.h
 @@ -278,12 +278,11 @@ namespace Leo
@@ -43,6 +35,3 @@ index ee77511..0ad8493 100644
    }
  } // namespace Leo
  
--- 
-2.35.1
-