diff options
Diffstat (limited to 'dev-libs/libuninum')
-rw-r--r-- | dev-libs/libuninum/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/libuninum/files/libuninum-2.7-64bit.patch | 37 | ||||
-rw-r--r-- | dev-libs/libuninum/files/libuninum-2.7-c99.patch | 30 | ||||
-rw-r--r-- | dev-libs/libuninum/libuninum-2.7-r3.ebuild (renamed from dev-libs/libuninum/libuninum-2.7-r2.ebuild) | 10 |
4 files changed, 79 insertions, 2 deletions
diff --git a/dev-libs/libuninum/Manifest b/dev-libs/libuninum/Manifest index 373cf7e3e353..61f08a2b664a 100644 --- a/dev-libs/libuninum/Manifest +++ b/dev-libs/libuninum/Manifest @@ -1,3 +1,5 @@ +AUX libuninum-2.7-64bit.patch 1358 BLAKE2B c018aa4de1859e18ed0d3f1c1ab557f2c7512ac394876d81f689308b43e40b48a9a12614da7c426c3f4a1fecf434fcc7e0880a608853cd669a79d8d337bd6dbf SHA512 28f5fdb882268e847b9244fb14e9d3cc12e7ecb7ff40ca837cc902c01cd426e0392931153f3b7abc9248318dc450d3e1eab8e7105b7817df4a5ab33a97ce960c +AUX libuninum-2.7-c99.patch 769 BLAKE2B 62466ee22c09d32b0bc75f971eb0efd87f9d49f3b3b44d7de4bb0a60b366d586cb7e95875c5b9ef31fb0e55c8e0b6145482732a8d85c6a8f5bdd3964591f061c SHA512 bdf5706c1a3831bc11d5609d7fb5d689cef5aef5d2f4d670a187721fb7eb30c8a0f45944e2c36062b4bc1562647c4dc8d9716c09a33b193d14d164b62d631f94 DIST libuninum-2.7.tar.bz2 276712 BLAKE2B 0894c632d7e9081f35d543895809bcc04fde6da674d4e6adc7cdc914f4bbb257a3e683b381e6496a08b65790731f73315d8263970265a351f40fe504f210c883 SHA512 4536a90b9f34fbabd3cc0560c1ff385063151bc381de51e6ca0253d2a42c2290b92329795b1a12ade305c3cb5757b02fe9d92817829977f50da2e34852936274 -EBUILD libuninum-2.7-r2.ebuild 694 BLAKE2B 8ecca2f7cf2cfb4c2e78ccbf27d0832b58480984f940cd63e753b6f73aa4e52e71b94fd0d4bacd81f273dc09e92992ef155901d4b481ef5af82550c0df54464b SHA512 52d3176ea6495ae9acff3318e64e57abd4d16cade82346a5c22c7a7a1065711c67301483845a07fc53d1afa94fcffc20199dee9757611b05512a9c5ecbbb2738 +EBUILD libuninum-2.7-r3.ebuild 825 BLAKE2B ffa53d69c3e17aa81d2d641771b36a063837a995c44c2d50dbb03cd5020aed08ad7345636ba1d43d26b50ab3f796dc791775b6c6d54649098e473e86bf90c377 SHA512 f6ac7091a626409502afb460e75427f59f24d49ce399cccf75a2f30839bade93ee5446dd8bfab1a9f18f061974e2f2088c7e1162de0d7ba806e57b2b6eb3c4eb MISC metadata.xml 688 BLAKE2B 186bacb0b23253d1dbbfcdf05e0611bf6c5c26cd68852b492dc65cd2f0f86ecb34f51965d32517b1354afacd04dec68899babd64424e27dceb34186d117cb27d SHA512 378145a6c5b69cae0a072cb28d1bbfa5a6fa3f708e450ae92bdd99e81ed862b9b8b290a13299ef928a1bcf06e1e6e61bf9dea51d5054007bd609932f394da5b4 diff --git a/dev-libs/libuninum/files/libuninum-2.7-64bit.patch b/dev-libs/libuninum/files/libuninum-2.7-64bit.patch new file mode 100644 index 000000000000..65a8b67389ba --- /dev/null +++ b/dev-libs/libuninum/files/libuninum-2.7-64bit.patch @@ -0,0 +1,37 @@ +--- libuninum-2.7.orig/uninum.c ++++ libuninum-2.7/uninum.c +@@ -35,11 +35,11 @@ + */ + + +-#define ucslen(x) wcslen((signed long *) x) +-#define ucscpy(x,y) (UTF32 *)wcscpy((signed long *)x,(signed long *)y) +-#define ucscat(x,y) (UTF32 *)wcscat((signed long *)x,(signed long *)y) +-#define ucschr(x,y) (UTF32 *)wcschr((signed long *)x,(signed long)y) +-#define ucsrchr(x,y) (UTF32 *)wcsrchr((signed long *)x,(signed long)y) ++#define ucslen(x) wcslen((wchar_t *) x) ++#define ucscpy(x,y) (UTF32 *)wcscpy((wchar_t *)x,(wchar_t *)y) ++#define ucscat(x,y) (UTF32 *)wcscat((wchar_t *)x,(wchar_t *)y) ++#define ucschr(x,y) (UTF32 *)wcschr((wchar_t *)x,(wchar_t)y) ++#define ucsrchr(x,y) (UTF32 *)wcsrchr((wchar_t *)x,(wchar_t)y) + + #define UNINUM + +--- libuninum-2.7.orig/unicode.h ++++ libuninum-2.7/unicode.h +@@ -1,8 +1,10 @@ +-typedef unsigned long UTF32; /* at least 32 bits */ +-typedef unsigned short UTF16; /* at least 16 bits */ +-typedef unsigned short UCS2; /* at least 16 bits */ +-typedef unsigned char UTF8; /* 8 bits */ +-typedef unsigned char Boolean; /* 0 or 1 */ ++#include <stdint.h> ++ ++typedef uint32_t UTF32; /* 32 bits */ ++typedef uint16_t UTF16; /* 16 bits */ ++typedef uint16_t UCS2; /* 16 bits */ ++typedef uint8_t UTF8; /* 8 bits */ ++typedef uint8_t Boolean; /* 0 or 1 */ + + #define UNI_MAX_ASCII (UTF32)0x0000007F + #define UNI_MAX_BMP (UTF32)0x0000FFFF diff --git a/dev-libs/libuninum/files/libuninum-2.7-c99.patch b/dev-libs/libuninum/files/libuninum-2.7-c99.patch new file mode 100644 index 000000000000..5e68d8bec148 --- /dev/null +++ b/dev-libs/libuninum/files/libuninum-2.7-c99.patch @@ -0,0 +1,30 @@ +Avoid an implicit declaration of exit in the configure script. This +ensures that the package continues to build with future compilers +which do not support such implicit declarations by default. + +diff --git a/configure b/configure +index 8fd0eed37cb997de..f5ebc89db38d88f4 100755 +--- a/configure ++++ b/configure +@@ -4323,8 +4323,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -18747,8 +18747,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext diff --git a/dev-libs/libuninum/libuninum-2.7-r2.ebuild b/dev-libs/libuninum/libuninum-2.7-r3.ebuild index e908d0c3b217..1721edb6fe32 100644 --- a/dev-libs/libuninum/libuninum-2.7-r2.ebuild +++ b/dev-libs/libuninum/libuninum-2.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,6 +13,14 @@ KEYWORDS="amd64 x86" LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2.1" SLOT="0" +RDEPEND="dev-libs/gmp:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.7-64bit.patch" + "${FILESDIR}/${PN}-2.7-c99.patch" +) + src_prepare() { default |