Bug 1885353 - [RNP] Update vendoring config for RNP v0.17.1. r=kaie
The two patches will not be needed with v0.17.1. Adding the rnp_symbols script to pick up any export changes. "libsexp" is renamed to "libsexpp", so the vendoring will need to account for that. Differential Revision: https://phabricator.services.mozilla.com/D204665 --HG-- extra : amend_source : fa66f10d8be42268acae9bcbb09da7b8885c67fa
This commit is contained in:
Родитель
f94434bd36
Коммит
ceaee73f9b
|
@ -0,0 +1,3 @@
|
|||
Patches applied to RNP by MZLA released versions will appear in this
|
||||
directory.
|
||||
Note that they are already applied to the in-tree source.
|
|
@ -1,27 +0,0 @@
|
|||
diff --git a/src/libsexp/include/sexp/sexp-error.h b/src/libsexp/include/sexp/sexp-error.h
|
||||
--- a/src/libsexp/include/sexp/sexp-error.h
|
||||
+++ b/src/libsexp/include/sexp/sexp-error.h
|
||||
@@ -24,16 +24,17 @@
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <exception>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
namespace sexp {
|
||||
|
||||
class sexp_exception_t : public std::exception {
|
||||
public:
|
||||
diff --git a/version.txt b/version.txt
|
||||
--- a/version.txt
|
||||
+++ b/version.txt
|
||||
@@ -1,1 +1,1 @@
|
||||
-0.17.0
|
||||
+0.17.0+PR2073
|
|
@ -1,27 +0,0 @@
|
|||
From d211911a54080b6dd551572c9a7cad5611bfa7bc Mon Sep 17 00:00:00 2001
|
||||
From: Rob Lemley <rob@thunderbird.net>
|
||||
Date: Wed, 8 Nov 2023 11:23:13 -0500
|
||||
Subject: [PATCH] Use typedef for Windows ssize_t. Fixes #2144.
|
||||
|
||||
---
|
||||
src/common/uniwin.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/common/uniwin.h b/src/common/uniwin.h
|
||||
index 095c325b..b7e2b52d 100644
|
||||
--- a/src/common/uniwin.h
|
||||
+++ b/src/common/uniwin.h
|
||||
@@ -35,9 +35,9 @@
|
||||
#include <direct.h> /* for _getcwd() and _chdir() */
|
||||
|
||||
#ifdef _WIN64
|
||||
-#define ssize_t __int64
|
||||
+typedef __int64 ssize_t;
|
||||
#else
|
||||
-#define ssize_t long
|
||||
+typedef long ssize_t;
|
||||
#endif
|
||||
|
||||
#define STDIN_FILENO 0
|
||||
--
|
||||
2.42.1
|
|
@ -38,9 +38,9 @@ vendoring:
|
|||
- "**"
|
||||
- ".*"
|
||||
- ".*/**"
|
||||
- "src/libsexp/**"
|
||||
- "src/libsexp/.**"
|
||||
- "src/libsexp/.github/**"
|
||||
- "src/libsexpp/**"
|
||||
- "src/libsexpp/.**"
|
||||
- "src/libsexpp/.github/**"
|
||||
|
||||
include:
|
||||
- doc/
|
||||
|
@ -52,11 +52,11 @@ vendoring:
|
|||
- src/lib/
|
||||
- src/librekey/
|
||||
- src/librepgp/
|
||||
- src/libsexp/include/
|
||||
- src/libsexp/src/
|
||||
- src/libsexp/LICENSE.md
|
||||
- src/libsexp/README.adoc
|
||||
- src/libsexp/version.txt
|
||||
- src/libsexpp/include/
|
||||
- src/libsexpp/src/
|
||||
- src/libsexpp/LICENSE.md
|
||||
- src/libsexpp/README.adoc
|
||||
- src/libsexpp/version.txt
|
||||
- src/rnp/
|
||||
- src/rnpkeys/
|
||||
- src/tests/
|
||||
|
@ -66,12 +66,15 @@ vendoring:
|
|||
- README.adoc
|
||||
- version.txt
|
||||
|
||||
patches:
|
||||
- ../patches/rnp/bug1843535_gcc13_missing_header.patch
|
||||
- ../patches/rnp/pr2145.patch
|
||||
# patches: []
|
||||
|
||||
update-actions:
|
||||
- action: replace-in-file-regex
|
||||
file: '{yaml_dir}/../README.rnp'
|
||||
pattern: '\[(tag v[0-9\.]+|commit [0-9a-f]+)\]'
|
||||
with: '[tag {revision}]'
|
||||
# Update rnp.symbols with exported functions
|
||||
- action: run-command
|
||||
cwd: "{yaml_dir}"
|
||||
command: python
|
||||
args: ["../../python/thirdroc/thirdroc/rnp_symbols.py", "include/rnp/rnp.h", "rnp.symbols"]
|
||||
|
|
Загрузка…
Ссылка в новой задаче