| 1 |
commit: 79a1d312a6929820fda1142c0cb4cdc3fbd4637d |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 28 15:36:53 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 29 17:50:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a1d312 |
| 7 |
|
| 8 |
sci-astronomy/esorex: remove unused patches |
| 9 |
|
| 10 |
.../esorex/files/esorex-3.10-cpl60_compat.patch | 13 ------------ |
| 11 |
.../esorex/files/esorex-3.10-fix-autotools.patch | 12 ----------- |
| 12 |
.../files/esorex-3.10-fix_format_strings.patch | 24 ---------------------- |
| 13 |
3 files changed, 49 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch b/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 1203f78..00000000 |
| 18 |
--- a/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,13 +0,0 @@ |
| 21 |
-Author: Ole Streicher <debian@×××××××××.cx> |
| 22 |
-Subject: Remove function that is only in cpl >= 6.3 to establish compability |
| 23 |
- with older (stable) versions and allow backporting. |
| 24 |
---- a/src/er_main.c |
| 25 |
-+++ b/src/er_main.c |
| 26 |
-@@ -641,7 +641,6 @@ |
| 27 |
- |
| 28 |
- cpl_msg_set_domain (PACKAGE); |
| 29 |
- cpl_msg_set_time_off (); |
| 30 |
--cpl_msg_set_threadid_off (); |
| 31 |
- cpl_msg_set_domain_on (); |
| 32 |
- cpl_msg_set_component_off (); |
| 33 |
- |
| 34 |
|
| 35 |
diff --git a/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch b/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch |
| 36 |
deleted file mode 100644 |
| 37 |
index 68fbcb9..00000000 |
| 38 |
--- a/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,12 +0,0 @@ |
| 41 |
-Author: Ole Streicher <debian@×××××××××.cx> |
| 42 |
-Subject: Fix autotools files to allow the current version. |
| 43 |
---- esorex-3.10/configure.ac.orig |
| 44 |
-+++ esorex-2.10/configure.ac |
| 45 |
-@@ -5,6 +5,7 @@ |
| 46 |
- |
| 47 |
- AC_CONFIG_SRCDIR([Makefile.am]) |
| 48 |
- AC_CONFIG_AUX_DIR([admin]) |
| 49 |
-+AC_CONFIG_MACRO_DIR([m4]) |
| 50 |
- AC_CONFIG_HEADERS([config.h]) |
| 51 |
- |
| 52 |
- AC_CANONICAL_HOST |
| 53 |
|
| 54 |
diff --git a/sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch b/sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch |
| 55 |
deleted file mode 100644 |
| 56 |
index fe4d37b..00000000 |
| 57 |
--- a/sci-astronomy/esorex/files/esorex-3.10-fix_format_strings.patch |
| 58 |
+++ /dev/null |
| 59 |
@@ -1,24 +0,0 @@ |
| 60 |
-Author: Ole Streicher <debian@×××××××××.cx> |
| 61 |
-Description: Fix -Werror=format-security errors |
| 62 |
---- a/src/er_paramutils.c |
| 63 |
-+++ b/src/er_paramutils.c |
| 64 |
-@@ -731,7 +731,7 @@ |
| 65 |
- (void) strcat (tmp, " to "); |
| 66 |
- (void) strcat (tmp, er_strutils_dblstr (cpl_parameter_get_range_max_double (p))); |
| 67 |
- (void) strcat (tmp, ".\n"); |
| 68 |
-- cpl_msg_error (er_func, tmp); |
| 69 |
-+ cpl_msg_error (er_func, "%s", tmp); |
| 70 |
- |
| 71 |
- cpl_free(tmp); |
| 72 |
- return -1; |
| 73 |
---- a/src/er_plugin.c |
| 74 |
-+++ b/src/er_plugin.c |
| 75 |
-@@ -367,7 +367,7 @@ |
| 76 |
- if (wer != 0) |
| 77 |
- { |
| 78 |
- (void) snprintf(estr,(size_t)238,"Expansion of %s failed...",xpath); |
| 79 |
-- cpl_msg_error (er_func, estr); |
| 80 |
-+ cpl_msg_error (er_func, "%s", estr); |
| 81 |
- goto dealloc; |
| 82 |
- } |
| 83 |
- } |
Archives