diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch | 10 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | 8 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch | 10 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.23.2.bb (renamed from meta/recipes-support/gpgme/gpgme_1.23.1.bb) | 2 |
8 files changed, 31 insertions, 41 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch index 81af86e7b2..6d67e6d6c9 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 46f346dff73122caffe62eda84596a3a3bec859e Mon Sep 17 00:00:00 2001 | 1 | From acc4750ffa79a5c2ef3c95cf31ef51352a68837b Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Tue, 28 Feb 2023 13:43:51 +0800 | 3 | Date: Tue, 28 Feb 2023 13:43:51 +0800 |
4 | Subject: [PATCH] autogen.sh: remove '-unknown' in version | 4 | Subject: [PATCH] autogen.sh: remove '-unknown' in version |
@@ -12,15 +12,16 @@ Remove the '-unknown' suffix to fix this issue. | |||
12 | Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html] | 12 | Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html] |
13 | 13 | ||
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | autogen.sh | 2 +- | 17 | autogen.sh | 2 +- |
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 19 | ||
19 | diff --git a/autogen.sh b/autogen.sh | 20 | diff --git a/autogen.sh b/autogen.sh |
20 | index 9b36158..d5cccd2 100755 | 21 | index 4e1665b..a55326d 100755 |
21 | --- a/autogen.sh | 22 | --- a/autogen.sh |
22 | +++ b/autogen.sh | 23 | +++ b/autogen.sh |
23 | @@ -266,7 +266,7 @@ if [ "$myhost" = "find-version" ]; then | 24 | @@ -269,7 +269,7 @@ if [ "$myhost" = "find-version" ]; then |
24 | else | 25 | else |
25 | ingit=no | 26 | ingit=no |
26 | beta=yes | 27 | beta=yes |
@@ -29,6 +30,3 @@ index 9b36158..d5cccd2 100755 | |||
29 | rev="0000000" | 30 | rev="0000000" |
30 | rvd="0" | 31 | rvd="0" |
31 | fi | 32 | fi |
32 | -- | ||
33 | 2.17.1 | ||
34 | |||
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 738b23cd58..831771ca2d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f8221238d51066b7a1a5f2917cce2791876ea8b0 Mon Sep 17 00:00:00 2001 | 1 | From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Fri, 10 May 2019 14:23:55 +0800 | 3 | Date: Fri, 10 May 2019 14:23:55 +0800 |
4 | Subject: [PATCH] pkgconfig | 4 | Subject: [PATCH] pkgconfig |
@@ -26,10 +26,10 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | |||
26 | create mode 100644 src/gpgme-pthread.pc.in | 26 | create mode 100644 src/gpgme-pthread.pc.in |
27 | 27 | ||
28 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
29 | index d1b9aca..9c4f97c 100644 | 29 | index ae4c7da..df892c9 100644 |
30 | --- a/configure.ac | 30 | --- a/configure.ac |
31 | +++ b/configure.ac | 31 | +++ b/configure.ac |
32 | @@ -1043,6 +1043,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 32 | @@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
33 | src/gpgme-glib.pc | 33 | src/gpgme-glib.pc |
34 | src/gpgme.h) | 34 | src/gpgme.h) |
35 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 35 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
@@ -38,7 +38,7 @@ index d1b9aca..9c4f97c 100644 | |||
38 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) | 38 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) |
39 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) | 39 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) |
40 | diff --git a/src/Makefile.am b/src/Makefile.am | 40 | diff --git a/src/Makefile.am b/src/Makefile.am |
41 | index 67805a8..d38ba02 100644 | 41 | index ca70950..bda5498 100644 |
42 | --- a/src/Makefile.am | 42 | --- a/src/Makefile.am |
43 | +++ b/src/Makefile.am | 43 | +++ b/src/Makefile.am |
44 | @@ -20,11 +20,11 @@ | 44 | @@ -20,11 +20,11 @@ |
diff --git a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch index f3de55f7b3..3d05808d63 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001 | 1 | From e1fc4b06dcb62e1c2d85ae99f39ef1a8860570e1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 15 Jul 2021 12:33:13 -0700 | 3 | Date: Thu, 15 Jul 2021 12:33:13 -0700 |
4 | Subject: [PATCH] use closefrom() on linux and glibc 2.34+ | 4 | Subject: [PATCH] use closefrom() on linux and glibc 2.34+ |
@@ -8,15 +8,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
8 | 8 | ||
9 | Rebase to 1.17.0 | 9 | Rebase to 1.17.0 |
10 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | 10 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
11 | |||
11 | --- | 12 | --- |
12 | src/posix-io.c | 2 +- | 13 | src/posix-io.c | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/src/posix-io.c b/src/posix-io.c | 16 | diff --git a/src/posix-io.c b/src/posix-io.c |
16 | index 5c6cf1d..52e513a 100644 | 17 | index a422d8f..0d0a98b 100644 |
17 | --- a/src/posix-io.c | 18 | --- a/src/posix-io.c |
18 | +++ b/src/posix-io.c | 19 | +++ b/src/posix-io.c |
19 | @@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, | 20 | @@ -577,7 +577,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, |
20 | if (fd_list[i].fd > fd) | 21 | if (fd_list[i].fd > fd) |
21 | fd = fd_list[i].fd; | 22 | fd = fd_list[i].fd; |
22 | fd++; | 23 | fd++; |
@@ -25,6 +26,3 @@ index 5c6cf1d..52e513a 100644 | |||
25 | closefrom (fd); | 26 | closefrom (fd); |
26 | max_fds = fd; | 27 | max_fds = fd; |
27 | #else /*!__sun */ | 28 | #else /*!__sun */ |
28 | -- | ||
29 | 2.25.1 | ||
30 | |||
diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index de1689ec05..204fe5934d 100644 --- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f632148fcc8757bb9a9601a6dab275e88cd309d2 Mon Sep 17 00:00:00 2001 | 1 | From 8c850aa109c42d0c193bccc7af45dbc2689b23f6 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 30 Jan 2018 15:28:49 +0800 | 3 | Date: Tue, 30 Jan 2018 15:28:49 +0800 |
4 | Subject: [PATCH 3/7] Correctly install python modules | 4 | Subject: [PATCH] Correctly install python modules |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
@@ -12,15 +12,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
12 | 12 | ||
13 | Rebase to 1.10.0 | 13 | Rebase to 1.10.0 |
14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | lang/python/Makefile.am | 1 + | 17 | lang/python/Makefile.am | 1 + |
17 | 1 file changed, 1 insertion(+) | 18 | 1 file changed, 1 insertion(+) |
18 | 19 | ||
19 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am | 20 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am |
20 | index 6988faf..36c6f7b 100644 | 21 | index 68b98e8..bbb9111 100644 |
21 | --- a/lang/python/Makefile.am | 22 | --- a/lang/python/Makefile.am |
22 | +++ b/lang/python/Makefile.am | 23 | +++ b/lang/python/Makefile.am |
23 | @@ -93,6 +93,7 @@ install-exec-local: | 24 | @@ -97,6 +97,7 @@ install-exec-local: |
24 | --build-base="$$(basename "$${PYTHON}")-gpg" \ | 25 | --build-base="$$(basename "$${PYTHON}")-gpg" \ |
25 | install \ | 26 | install \ |
26 | --prefix "$(DESTDIR)$(prefix)" \ | 27 | --prefix "$(DESTDIR)$(prefix)" \ |
@@ -28,6 +29,3 @@ index 6988faf..36c6f7b 100644 | |||
28 | --verbose ; \ | 29 | --verbose ; \ |
29 | done | 30 | done |
30 | 31 | ||
31 | -- | ||
32 | 2.7.4 | ||
33 | |||
diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 50bf21463f..7fe0c9538a 100644 --- a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8d9613c34ae495bbcbd725a2e7ac48138ba53c30 Mon Sep 17 00:00:00 2001 | 1 | From 57475742b0288b4ee53c01c59c3ab03c1ef7932e Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 13 Apr 2017 16:40:27 +0300 | 3 | Date: Thu, 13 Apr 2017 16:40:27 +0300 |
4 | Subject: [PATCH 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in | 4 | Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in |
5 | output | 5 | output |
6 | 6 | ||
7 | The logic was not working in multilib setups which use other | 7 | The logic was not working in multilib setups which use other |
@@ -9,15 +9,16 @@ directory names than plain /lib or /usr/lib. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | src/gpgme-config.in | 2 +- | 14 | src/gpgme-config.in | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/src/gpgme-config.in b/src/gpgme-config.in | 17 | diff --git a/src/gpgme-config.in b/src/gpgme-config.in |
17 | index a4d152e..8342865 100644 | 18 | index 56b98f8..e96f3c3 100644 |
18 | --- a/src/gpgme-config.in | 19 | --- a/src/gpgme-config.in |
19 | +++ b/src/gpgme-config.in | 20 | +++ b/src/gpgme-config.in |
20 | @@ -154,7 +154,7 @@ while test $# -gt 0; do | 21 | @@ -157,7 +157,7 @@ while test $# -gt 0; do |
21 | for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do | 22 | for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do |
22 | skip=no | 23 | skip=no |
23 | case $i in | 24 | case $i in |
@@ -26,6 +27,3 @@ index a4d152e..8342865 100644 | |||
26 | skip=yes | 27 | skip=yes |
27 | ;; | 28 | ;; |
28 | -L*|-l*) | 29 | -L*|-l*) |
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 1471184d67..8d48db2feb 100644 --- a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ef920688bfe1c7328c9e97229d62ccd35304ad84 Mon Sep 17 00:00:00 2001 | 1 | From 7938a5a760827aec737ea49d2f8719051abda188 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Wed, 31 Jan 2018 11:01:09 +0800 | 3 | Date: Wed, 31 Jan 2018 11:01:09 +0800 |
4 | Subject: [PATCH 6/7] fix build path issue | 4 | Subject: [PATCH] fix build path issue |
5 | 5 | ||
6 | Get the "--root" directory supplied to the "install" command, | 6 | Get the "--root" directory supplied to the "install" command, |
7 | and use it as a prefix to strip off the purported filename | 7 | and use it as a prefix to strip off the purported filename |
@@ -12,15 +12,16 @@ to use relative path. | |||
12 | 12 | ||
13 | Upstream-Status: Submitted [gnupg-devel@gnupg.org] | 13 | Upstream-Status: Submitted [gnupg-devel@gnupg.org] |
14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | lang/python/Makefile.am | 5 +++-- | 17 | lang/python/Makefile.am | 5 +++-- |
17 | 1 file changed, 3 insertions(+), 2 deletions(-) | 18 | 1 file changed, 3 insertions(+), 2 deletions(-) |
18 | 19 | ||
19 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am | 20 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am |
20 | index 36c6f7b..ce9a108 100644 | 21 | index bbb9111..cee499e 100644 |
21 | --- a/lang/python/Makefile.am | 22 | --- a/lang/python/Makefile.am |
22 | +++ b/lang/python/Makefile.am | 23 | +++ b/lang/python/Makefile.am |
23 | @@ -92,8 +92,9 @@ install-exec-local: | 24 | @@ -96,8 +96,9 @@ install-exec-local: |
24 | build \ | 25 | build \ |
25 | --build-base="$$(basename "$${PYTHON}")-gpg" \ | 26 | --build-base="$$(basename "$${PYTHON}")-gpg" \ |
26 | install \ | 27 | install \ |
@@ -32,6 +33,3 @@ index 36c6f7b..ce9a108 100644 | |||
32 | --verbose ; \ | 33 | --verbose ; \ |
33 | done | 34 | done |
34 | 35 | ||
35 | -- | ||
36 | 2.7.4 | ||
37 | |||
diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch index 214cf348e4..a11621ed64 100644 --- a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch +++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 94cf9f8fc79c0d1d4529cebdd74328927fda36a2 Mon Sep 17 00:00:00 2001 | 1 | From 84c389705e7742d2b68e144a5733e618441d293e Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 10 May 2019 16:19:54 +0800 | 3 | Date: Fri, 10 May 2019 16:19:54 +0800 |
4 | Subject: [PATCH] do not auto check var-PYTHON | 4 | Subject: [PATCH] do not auto check var-PYTHON |
@@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
18 | 1 file changed, 2 insertions(+), 3 deletions(-) | 18 | 1 file changed, 2 insertions(+), 3 deletions(-) |
19 | 19 | ||
20 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
21 | index df218ec..6a619ef 100644 | 21 | index df892c9..8c6194e 100644 |
22 | --- a/configure.ac | 22 | --- a/configure.ac |
23 | +++ b/configure.ac | 23 | +++ b/configure.ac |
24 | @@ -521,9 +521,8 @@ if test "$found_py" = "1"; then | 24 | @@ -590,9 +590,8 @@ if test "$found_py" = "1"; then |
25 | if test "$found_py" = "1" -o "$found_py3" = "1"; then | 25 | if test "$found_py" = "1" -o "$found_py3" = "1"; then |
26 | # Reset everything, so that we can look for another Python. | 26 | # Reset everything, so that we can look for another Python. |
27 | m4_foreach([mym4pythonver], | 27 | m4_foreach([mym4pythonver], |
diff --git a/meta/recipes-support/gpgme/gpgme_1.23.1.bb b/meta/recipes-support/gpgme/gpgme_1.23.2.bb index 023cf894df..b29c182f36 100644 --- a/meta/recipes-support/gpgme/gpgme_1.23.1.bb +++ b/meta/recipes-support/gpgme/gpgme_1.23.2.bb | |||
@@ -24,7 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ | |||
24 | file://0001-autogen.sh-remove-unknown-in-version.patch \ | 24 | file://0001-autogen.sh-remove-unknown-in-version.patch \ |
25 | " | 25 | " |
26 | 26 | ||
27 | SRC_URI[sha256sum] = "a0c316f7ab7d3bfb01a8753c3370dc906e5b61436021f3b54ff1483b513769bd" | 27 | SRC_URI[sha256sum] = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224" |
28 | 28 | ||
29 | PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" | 29 | PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" |
30 | 30 | ||