diff options
author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2024-03-05 21:42:20 +0000 |
---|---|---|
committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2024-03-05 22:14:14 +0000 |
commit | e9dd733770697e3416c7d46999beb30d3126271a (patch) | |
tree | 6abfdd27c2ac73b80a2c3689324e24f048caf0d4 /sys-firmware | |
parent | sys-apps/mklibs: enable py3.12 and disable py3.10 (diff) | |
download | portage-e9dd733770697e3416c7d46999beb30d3126271a.tar.xz |
sys-firmware/gnuk: add 1.2.20, drop 1.2.19
Diffstat (limited to 'sys-firmware')
-rw-r--r-- | sys-firmware/gnuk/files/1.2.19-regnual-remove-duplicate-type-declaration.patch | 52 | ||||
-rw-r--r-- | sys-firmware/gnuk/files/1.2.20-MINOR-Always-get-version-from-the-VERSION-file.patch (renamed from sys-firmware/gnuk/files/1.2.19-MINOR-Always-get-version-from-the-VERSION-file.patch) | 0 | ||||
-rw-r--r-- | sys-firmware/gnuk/files/1.2.20-build-discard-compiler-default-specs.patch (renamed from sys-firmware/gnuk/files/1.2.19-build-discard-compiler-default-specs.patch) | 0 | ||||
-rw-r--r-- | sys-firmware/gnuk/files/1.2.20-build-do-not-produce-a-dynamically-linked-position-i.patch (renamed from sys-firmware/gnuk/files/1.2.19-build-do-not-produce-a-dynamically-linked-position-i.patch) | 0 | ||||
-rw-r--r-- | sys-firmware/gnuk/files/1.2.20-build-initilize-empty-MCFLAGS-and-LDFLAGS.patch (renamed from sys-firmware/gnuk/files/1.2.19-build-initilize-empty-MCFLAGS-and-LDFLAGS.patch) | 0 | ||||
-rw-r--r-- | sys-firmware/gnuk/files/1.2.20-build-move-nostartfiles-earlier.patch (renamed from sys-firmware/gnuk/files/1.2.19-build-move-nostartfiles-earlier.patch) | 0 | ||||
-rw-r--r-- | sys-firmware/gnuk/gnuk-1.2.20.ebuild (renamed from sys-firmware/gnuk/gnuk-1.2.19.ebuild) | 3 |
7 files changed, 1 insertions, 54 deletions
diff --git a/sys-firmware/gnuk/files/1.2.19-regnual-remove-duplicate-type-declaration.patch b/sys-firmware/gnuk/files/1.2.19-regnual-remove-duplicate-type-declaration.patch deleted file mode 100644 index 2a71c06f..00000000 --- a/sys-firmware/gnuk/files/1.2.19-regnual-remove-duplicate-type-declaration.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 23417e8a848344b2fc4865fa256db95684adbfe3 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sun, 20 Mar 2022 13:51:32 +0000 -Subject: [PATCH] regnual: remove duplicate type declaration -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - In file included from regnual.c:31: - types.h:1:23: error: conflicting types for ‘size_t’; have ‘long unsigned int’ - 1 | typedef unsigned long size_t; - | ^~~~~~ - In file included from /usr/arm-none-eabi/include/sys/reent.h:14, - from /usr/arm-none-eabi/include/string.h:11, - from regnual.c:29: - /usr/lib/gcc/arm-none-eabi/11.2.1/include/stddef.h:209:23: note: previous declaration of ‘size_t’ with type ‘size_t’ {aka ‘unsigned int’} - 209 | typedef __SIZE_TYPE__ size_t; - | ---- - regnual/regnual.c | 2 -- - regnual/types.h | 4 ---- - 2 files changed, 6 deletions(-) - -diff --git a/regnual/regnual.c b/regnual/regnual.c -index e296d51bc53e..fbc6064874ac 100644 ---- a/regnual/regnual.c -+++ b/regnual/regnual.c -@@ -32,8 +32,6 @@ - #include "usb_lld.h" - #include "sys.h" - --extern void *memset (void *s, int c, size_t n); -- - extern void set_led (int); - extern int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len); - extern int flash_protect (void); -diff --git a/regnual/types.h b/regnual/types.h -index 6527e0ba206c..0f70f97d0556 100644 ---- a/regnual/types.h -+++ b/regnual/types.h -@@ -1,5 +1,3 @@ --typedef unsigned long size_t; -- - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -@@ -7,5 +5,3 @@ typedef unsigned int uintptr_t; - - #define TRUE 1 - #define FALSE 0 -- --#define NULL 0 diff --git a/sys-firmware/gnuk/files/1.2.19-MINOR-Always-get-version-from-the-VERSION-file.patch b/sys-firmware/gnuk/files/1.2.20-MINOR-Always-get-version-from-the-VERSION-file.patch index 9db4e957..9db4e957 100644 --- a/sys-firmware/gnuk/files/1.2.19-MINOR-Always-get-version-from-the-VERSION-file.patch +++ b/sys-firmware/gnuk/files/1.2.20-MINOR-Always-get-version-from-the-VERSION-file.patch diff --git a/sys-firmware/gnuk/files/1.2.19-build-discard-compiler-default-specs.patch b/sys-firmware/gnuk/files/1.2.20-build-discard-compiler-default-specs.patch index 972a09b2..972a09b2 100644 --- a/sys-firmware/gnuk/files/1.2.19-build-discard-compiler-default-specs.patch +++ b/sys-firmware/gnuk/files/1.2.20-build-discard-compiler-default-specs.patch diff --git a/sys-firmware/gnuk/files/1.2.19-build-do-not-produce-a-dynamically-linked-position-i.patch b/sys-firmware/gnuk/files/1.2.20-build-do-not-produce-a-dynamically-linked-position-i.patch index 34b5d354..34b5d354 100644 --- a/sys-firmware/gnuk/files/1.2.19-build-do-not-produce-a-dynamically-linked-position-i.patch +++ b/sys-firmware/gnuk/files/1.2.20-build-do-not-produce-a-dynamically-linked-position-i.patch diff --git a/sys-firmware/gnuk/files/1.2.19-build-initilize-empty-MCFLAGS-and-LDFLAGS.patch b/sys-firmware/gnuk/files/1.2.20-build-initilize-empty-MCFLAGS-and-LDFLAGS.patch index 4669a194..4669a194 100644 --- a/sys-firmware/gnuk/files/1.2.19-build-initilize-empty-MCFLAGS-and-LDFLAGS.patch +++ b/sys-firmware/gnuk/files/1.2.20-build-initilize-empty-MCFLAGS-and-LDFLAGS.patch diff --git a/sys-firmware/gnuk/files/1.2.19-build-move-nostartfiles-earlier.patch b/sys-firmware/gnuk/files/1.2.20-build-move-nostartfiles-earlier.patch index fcee56ee..fcee56ee 100644 --- a/sys-firmware/gnuk/files/1.2.19-build-move-nostartfiles-earlier.patch +++ b/sys-firmware/gnuk/files/1.2.20-build-move-nostartfiles-earlier.patch diff --git a/sys-firmware/gnuk/gnuk-1.2.19.ebuild b/sys-firmware/gnuk/gnuk-1.2.20.ebuild index beaa9758..65cf5bd9 100644 --- a/sys-firmware/gnuk/gnuk-1.2.19.ebuild +++ b/sys-firmware/gnuk/gnuk-1.2.20.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit git-r3 python-r1 udev DESCRIPTION="An Implementation of USB Cryptographic Token for GnuPG" @@ -30,7 +30,6 @@ PATCHES=( "${FILESDIR}/${PV}-build-discard-compiler-default-specs.patch" "${FILESDIR}/${PV}-build-move-nostartfiles-earlier.patch" "${FILESDIR}/${PV}-build-do-not-produce-a-dynamically-linked-position-i.patch" - "${FILESDIR}/${PV}-regnual-remove-duplicate-type-declaration.patch" ) pkg_pretend() { |