diff mbox series

[meta-python,23/26] python3-scrypt: upgrade 0.8.20 -> 0.8.24

Message ID 1709714608-19296-23-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/26] abseil-cpp: upgrade 20230802.1 -> 20240116.1 | expand

Commit Message

Mingyu Wang (Fujitsu) March 6, 2024, 8:43 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-py-scrypt-remove-the-hard-coded-include-paths.patch
refreshed for 0.8.24

Changelog:
==========
-Remove travis and appveyor
-Support building on MSYS2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ypt-remove-the-hard-coded-include-paths.patch | 16 +++++++---------
 ...scrypt_0.8.20.bb => python3-scrypt_0.8.24.bb} |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-scrypt_0.8.20.bb => python3-scrypt_0.8.24.bb} (87%)
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
index d535e4326..3678d46cf 100644
--- a/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
+++ b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
@@ -1,4 +1,4 @@ 
-From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001
+From 47ede0950740e8919c28774840e77f223d5f3124 Mon Sep 17 00:00:00 2001
 From: Derek Straka <derek@asterius.io>
 Date: Sun, 11 Mar 2018 19:55:38 -0400
 Subject: [PATCH] py-scrypt: remove the hard coded include paths
@@ -11,16 +11,14 @@  Signed-off-by: Derek Straka <derek@asterius.io>
  1 file changed, 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index e36adc4..2ebfbf1 100644
+index 419a982..3f1fe52 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'):
-                      ('HAVE_SYS_SYSINFO_H', '1'),
-                      ('_FILE_OFFSET_BITS', '64')]
+@@ -26,7 +26,6 @@ if sys.platform.startswith('linux'):
+         ('_FILE_OFFSET_BITS', '64'),
+     ]
      libraries = ['crypto', 'rt']
 -    includes = ['/usr/local/include', '/usr/include']
      CFLAGS.append('-O2')
- elif sys.platform.startswith('win32'):
-     define_macros = [('inline', '__inline')]
--- 
-2.7.4
+ elif sys.platform.startswith('win32') and os.environ.get('MSYSTEM'):
+     msys2_env = os.getenv('MSYSTEM')
diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb
similarity index 87%
rename from meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb
rename to meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb
index ce0d4de9c..94c83e495 100644
--- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb
+++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb
@@ -5,7 +5,7 @@  HOMEPAGE="https://github.com/holgern/py-scrypt"
 
 SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch"
 
-SRC_URI[sha256sum] = "0d226c1c6744fb2e308b391410669b1df5cfe82637ffcb5ed489bf82b2d2eb78"
+SRC_URI[sha256sum] = "98ffde45e4a95461d73ded54ba7a26857679920d4f8ff320f6f7ade6e29531bd"
 
 inherit pypi ptest setuptools3 dos2unix