diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
commit | 4187bba080530c5ca1c7dae9c233e88f3fc8f535 (patch) | |
tree | b6f535e053876097ced1b6bda14a4da890c730d4 /dev-ml | |
parent | 2a8d2f71d1d9963368e0ef3d641d75979a689d12 (diff) |
gentoo auto-resync : 06:07:2024 - 08:06:15
Diffstat (limited to 'dev-ml')
-rw-r--r-- | dev-ml/Manifest.gz | bin | 39783 -> 39783 bytes | |||
-rw-r--r-- | dev-ml/cairo2/Manifest | 2 | ||||
-rw-r--r-- | dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch | 102 | ||||
-rw-r--r-- | dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch | 50 | ||||
-rw-r--r-- | dev-ml/camldbm/Manifest | 2 | ||||
-rw-r--r-- | dev-ml/camldbm/files/hasgotfix.patch | 15 | ||||
-rw-r--r-- | dev-ml/camldbm/files/include_fix.patch | 15 | ||||
-rw-r--r-- | dev-ml/camlp5/Manifest | 1 | ||||
-rw-r--r-- | dev-ml/camlp5/files/camlp5-7.12-destdir.patch | 13 |
9 files changed, 0 insertions, 200 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz Binary files differindex 5521ffc352a8..1b5eda6be2f0 100644 --- a/dev-ml/Manifest.gz +++ b/dev-ml/Manifest.gz diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest index b6f5f51fe0be..79135d0fc601 100644 --- a/dev-ml/cairo2/Manifest +++ b/dev-ml/cairo2/Manifest @@ -1,5 +1,3 @@ -AUX cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch 3920 BLAKE2B bb15a067dda446dffa1d43c7728216a4e2085d5f91553f133a096f497fec8c4474b2e26e06cd45a0217c7113caec4f82d2a55900d8e5f5889610e2b78a3294d3 SHA512 8f6695853529bbc8b442c6a825d9b7c2476b219ac4e5ac1c9af250ba385102c6258eff12475116d12be6de60ae6916b0e8044180ded28c9a3462be0fceee7148 -AUX cairo2-0.6.1-handle-safe-string.patch 1743 BLAKE2B 75c805c3db2b0ea7eb9a5fe8b6cb2732b89b800f17a84818d576a4f0c9dad32502f76b24ef51d7cf5fdfbc0b02bc4673fbae4e652c6e93e6c10aa5e831b6347f SHA512 75554a9405d9f9c66b9091e3f7f351af63f059eb7db37526d54c348116c5093fd391cda7e8320e314f8035645ccbd1b4160c5e74c847192bb393942cb02dcf70 AUX cairo2-0.6.1-ignore-gtk-and-pango.patch 2168 BLAKE2B f444c6056af8708bd4dd838fab54390b12ae6f00002ea885111eca37d3f0469acb8fac38bffe235436f2b20020178a6310cf5baa9bc27cbca6d4f29e1ac463d9 SHA512 6443a64189113add46c5a1ec9eebd13c513d314b512db31ee4d025e3653711e4295a0819d31d5ed7f793921f8a6d53a3576982bb422e331745877265dce828bb DIST cairo2-0.6.4.tbz 90735 BLAKE2B d0e6617a1de99050553ebbb0ea9fa1567051923378b164f8ff073700cbda7275a7c5dc97ed74d9f891b18fe4a051b8da81450da4946364ea7c6e53ec10cc8ba0 SHA512 2fd755b32253a4c441146fb41d13bf7ad4ce3828bc479ece296fb58350e20c7349c22457ad99fa080407b5150ce337a753221043f18b7b641f4c5bc98e37e799 EBUILD cairo2-0.6.4.ebuild 1000 BLAKE2B 04be06961d3222db84b4e092e047d656be3e0dacceb3de595aca71ca580bfe692e77854caf2889c19302e01e2c1a4e25d1607039c5289f9c23172b7b457b1bb0 SHA512 ca67fb3b18c6ea2c05db71a4674883ab57bf87fef1bb94397d9ff9fba8486d9057e14cfb2f73c476a40847104fa4406147617489993883872bb4f48cf42a845a diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch b/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch deleted file mode 100644 index 4f0eed297363..000000000000 --- a/dev-ml/cairo2/files/cairo2-0.6.1-Fix-multiple-definitions-of-variables.patch +++ /dev/null @@ -1,102 +0,0 @@ -From: Stephane Glondu <steph@glondu.net> -Date: Sat, 15 Aug 2020 09:08:30 +0200 -Subject: Fix multiple definitions of variables - -Bug-Debian: https://bugs.debian.org/968427 -Bug: https://github.com/Chris00/ocaml-cairo/issues/23 -Forwarded: https://github.com/Chris00/ocaml-cairo/issues/23 ---- - src/cairo_ocaml.h.p | 18 +++++++++--------- - src/cairo_ocaml_types.h | 4 +++- - 2 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/cairo_ocaml.h.p b/src/cairo_ocaml.h.p -index 4192aed..1f05664 100644 ---- a/src/cairo_ocaml.h.p -+++ b/src/cairo_ocaml.h.p -@@ -25,7 +25,7 @@ - /* cairo_t - ***********************************************************************/ - #define CAIRO_VAL(v) (* (cairo_t **) Data_custom_val(v)) --struct custom_operations caml_cairo_ops; -+extern struct custom_operations caml_cairo_ops; - - void caml_cairo_raise_Error(cairo_status_t status); - /* raise [Cairo.Error] if the status indicates a failure. */ -@@ -33,7 +33,7 @@ void caml_cairo_raise_Error(cairo_status_t status); - /* cairo_pattern_t - ***********************************************************************/ - #define PATTERN_VAL(v) (* (cairo_pattern_t **) Data_custom_val(v)) --struct custom_operations caml_pattern_ops; -+extern struct custom_operations caml_pattern_ops; - - #define EXTEND_VAL(v) ((cairo_extend_t) Int_val(v)) - #define VAL_EXTEND(v) Val_int(v) -@@ -45,12 +45,12 @@ struct custom_operations caml_pattern_ops; - ***********************************************************************/ - - #define FONT_OPTIONS_VAL(v) (* (cairo_font_options_t**) Data_custom_val(v)) --struct custom_operations caml_font_options_ops; -+extern struct custom_operations caml_font_options_ops; - - /* cairo_font_type_t - ***********************************************************************/ - --value caml_cairo_font_type[5]; -+extern value caml_cairo_font_type[5]; - - cairo_font_type_t caml_cairo_font_type_val(value vft); - -@@ -61,13 +61,13 @@ cairo_font_type_t caml_cairo_font_type_val(value vft); - ***********************************************************************/ - - #define SCALED_FONT_VAL(v) (* (cairo_scaled_font_t**) Data_custom_val(v)) --struct custom_operations caml_scaled_font_ops; -+extern struct custom_operations caml_scaled_font_ops; - - /* cairo_surface_t - ***********************************************************************/ - - #define SURFACE_VAL(v) (* (cairo_surface_t **) Data_custom_val(v)) --struct custom_operations caml_surface_ops; -+extern struct custom_operations caml_surface_ops; - - /* Type cairo_content_t */ - -@@ -93,7 +93,7 @@ struct custom_operations caml_surface_ops; - ***********************************************************************/ - - #define PATH_VAL(v) (* (cairo_path_t **) Data_custom_val(v)) --struct custom_operations caml_path_ops; -+extern struct custom_operations caml_path_ops; - - #define PATH_DATA_ASSIGN(vdata, data) \ - switch (data->header.type) { \ -@@ -151,10 +151,10 @@ struct custom_operations caml_path_ops; - #include <cairo-ft.h> - - #define FT_LIBRARY_VAL(v) (* (FT_Library*) Data_custom_val(v)) --struct custom_operations caml_cairo_ft_library_ops; -+extern struct custom_operations caml_cairo_ft_library_ops; - - #define FT_FACE_VAL(v) (* (FT_Face*) Data_custom_val(v)) --struct custom_operations caml_cairo_ft_face_ops; -+extern struct custom_operations caml_cairo_ft_face_ops; - - #endif /* OCAML_CAIRO_HAS_FT */ - -diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h -index b850ae2..84dde3d 100644 ---- a/src/cairo_ocaml_types.h -+++ b/src/cairo_ocaml_types.h -@@ -276,7 +276,9 @@ struct custom_operations caml_font_options_ops = { - custom_deserialize_default }; - - --/* caml_cairo_font_type is defined in "cairo_ocaml.h". */ -+/* caml_cairo_font_type is exported in "cairo_ocaml.h". */ -+value caml_cairo_font_type[5]; -+ - CAMLexport value caml_cairo_font_type_init(value unit) - { - /* noalloc */ diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch deleted file mode 100644 index 8571da4ea9fe..000000000000 --- a/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 9881f6c861ccf1150fffd6ccdb8b93181ad14263 (HEAD -> const, origin/const) -Author: Olaf Hering <olaf@aepfle.de> -Date: Fri Jul 17 15:47:59 2020 +0200 - - handle safe-string - - String_val() returns 'const char *'. - caml_named_value returns 'const value *'. - - Signed-off-by: Olaf Hering <olaf@aepfle.de> - -diff --git a/src/cairo_macros.h b/src/cairo_macros.h -index d952c10..1348b27 100644 ---- a/src/cairo_macros.h -+++ b/src/cairo_macros.h -@@ -173,7 +173,7 @@ - - /* holds the pointer to the Unavailable exception; shared several - functions. */ --value * caml_cairo_Unavailable = NULL; -+const value * caml_cairo_Unavailable = NULL; - - #define RAISE_UNAVAILABLE(name, args ...) \ - CAMLexport value caml_##name(args) \ -diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h -index b850ae2..267f657 100644 ---- a/src/cairo_ocaml_types.h -+++ b/src/cairo_ocaml_types.h -@@ -45,7 +45,7 @@ DEFINE_CUSTOM_OPERATIONS(cairo, cairo_destroy, CAIRO_VAL) - /* raise [Error] if the status indicates a failure. */ - void caml_cairo_raise_Error(cairo_status_t status) - { -- static value * exn = NULL; -+ static const value * exn = NULL; - - if (status != CAIRO_STATUS_SUCCESS) { - if (exn == NULL) { -diff --git a/src/cairo_stubs.c b/src/cairo_stubs.c -index de35aca..597c0bf 100644 ---- a/src/cairo_stubs.c -+++ b/src/cairo_stubs.c -@@ -1681,7 +1681,7 @@ static cairo_status_t caml_cairo_output_string - CAMLlocal2(s, r); - - s = caml_alloc_string(length); -- memmove(String_val(s), data, length); -+ memmove(&Byte(String_val(s), 0), data, length); - r = caml_callback_exn(* ((value *) fn), s); - if (Is_exception_result(r)) - CAMLreturn(CAIRO_STATUS_WRITE_ERROR); diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest index a85be71537d8..6c71bb9ade99 100644 --- a/dev-ml/camldbm/Manifest +++ b/dev-ml/camldbm/Manifest @@ -1,5 +1,3 @@ -AUX hasgotfix.patch 418 BLAKE2B f8f5a728cb1fa772db368faf3bfb6047fa570d0845155caff5d22e40b3a82d33b33844cf405ceb2021bfb5c3ec641cf59a0afe2546657cedc0f33c120b525c10 SHA512 3b936694976c962540734bcca51a762cd3a02f6d1d4678eeeb2c4ee283bd0defa0dcea90dc062475dbd542efe871041b7a76782b0437d34b682914b8f39a042d -AUX include_fix.patch 512 BLAKE2B e99ff15b037c2db639f14ff234c51c2a34c7dc2a5c3395d58675c89c240e2f9928913f38956a70d87f7d6f522937f1f51a9f77d245f095df8ddb0c0a988c285f SHA512 46a05033c469ec8b668e044a799d230b82539e2bb43067383f89f46f9ac128a2b43e8a5439dda16e368f283c608d6561109389d2aab3c8cdde7fbdb957433cad DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0 EBUILD camldbm-1.2.ebuild 838 BLAKE2B 99e572a2ac1f99619091a3e9df95ae0ec1b6a123555c56ac84bdb4ae70f9510ac180511f946200049f6a364906a642e82ced5520547cb7208b0d8209c0ebb6fd SHA512 0593ebf07c5bf68b725639f1954322f65ce7f312d1412a6e9210b12ed3241998b5d95303c0bb2536d5b73a94d1414c67672610b92a4f5882ed046904fabfe9ad MISC metadata.xml 307 BLAKE2B 8c1950a08842fa7930a11e6d2efcb424c220a2fcc8e1d5f4e909f2b77e7573ee506f1dcf89a65148165a79ae3f62ac6c5301d6e9a9c20358e9bc9c1c11ab371c SHA512 8f42ea1ae2a4b8ed8ce97bd5333b1b91c3c44a0d3a8de3411afe7abb96734a86162c31ee4922dd86d6d8d5d2d5131c33f240c6d151717c7ff07f4befe0eb1030 diff --git a/dev-ml/camldbm/files/hasgotfix.patch b/dev-ml/camldbm/files/hasgotfix.patch deleted file mode 100644 index 840ffcbe7f0f..000000000000 --- a/dev-ml/camldbm/files/hasgotfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1202&group_id=278&atid=1189 - -Index: camldbm-1.0/configure -=================================================================== ---- camldbm-1.0.orig/configure -+++ camldbm-1.0/configure -@@ -35,7 +35,7 @@ hasgot() { - ${CC:-cc} -I$1 -o hasgot.exe hasgot.c $3 $4 - res=$? - rm -f hasgot.c hasgot.exe -- return $? -+ return $res - } - - dbm_include="not found" diff --git a/dev-ml/camldbm/files/include_fix.patch b/dev-ml/camldbm/files/include_fix.patch deleted file mode 100644 index 16fb6bd1e96e..000000000000 --- a/dev-ml/camldbm/files/include_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1201&group_id=278&atid=1189 - -Index: camldbm-1.0/Makefile -=================================================================== ---- camldbm-1.0.orig/Makefile -+++ camldbm-1.0/Makefile -@@ -51,7 +51,7 @@ libcamldbm.$(A): cldbm.$(O) - $(OCAMLOPT) -c $(COMPFLAGS) $< - - .c.$(O): -- $(OCAMLC) -c -ccopt "$(DBM_INCLUDE)" -ccopt "$(DBM_DEFINES)" $< -+ $(OCAMLC) -c -ccopt "$(DBM_INCLUDES)" -ccopt "$(DBM_DEFINES)" $< - - depend: - $(OCAMLDEP) *.ml *.mli > .depend diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest index 04fdade6f444..decae6c68df0 100644 --- a/dev-ml/camlp5/Manifest +++ b/dev-ml/camlp5/Manifest @@ -1,4 +1,3 @@ -AUX camlp5-7.12-destdir.patch 443 BLAKE2B 6a1dc0403c2ca37ce1197936e36abedc3979fda209130c92c31c4080d3026cf85d1989b2a0cd7c23fc989d45cad5464a79f12ccc9236463b615115f538887050 SHA512 f4071f731e32a071fa4850c5ac54691603b2b3a414c4618978bd2822652b8d9f60d86d8495a0f5001e53cfe27d8dfabe83d3717d5ad2d9050e6eb1b68dc35078 DIST camlp5-8.00.04.tar.gz 1232659 BLAKE2B 47dd18e9c518b0dccda62d054d7950dffa025a129c81eb673e6caf11f37c2af1644de861288af2ecb8e95ee4d21bf0a1d69da4fe9ed5b3d1cf3bf1012ea06d4c SHA512 0951a9528c8c9b4becf54b352a6f897cb1af26de437a137757d597a3a2ad8aef1160a3c326c9503f783bccd154d8c14a354d3a35baae2bb551611697ce4f5327 DIST camlp5-8.00.05.tar.gz 1237587 BLAKE2B 1028b1e77a048a6b2e8df4ab58171d4e182a21aa1ca01113fc0cb8b7e6f61b5db58e8c3a2f149d05c056fbd48c0c0d97e597121e4b2b55d62f1f62d80e92312b SHA512 f4cee1fba85dc3a7479929facd79d0b88f23de575107886a8d4c41cd4a0bee21ccc72f2791712635e401ca10c3ec24cfea32558eca09ba6616e01e8433c57bbe DIST camlp5-8.02.00.tar.gz 1260249 BLAKE2B d205cf29207c925bc52098c9e1e74c76b851c71514bc7ae6f6c1ff3c7bf971f7cf6974625c484d2ddf252d0befc557e3b2dd7134e8f5bed270d59d40f15be9a8 SHA512 6e3caccc780f8de1d5804ae8f5700d29255f968f7f8ee3f9ef6f3456883d63aeb0abe797233823fd368b40b74feb1f537c3a61ce35d0c9c2737ab06743a09ddd diff --git a/dev-ml/camlp5/files/camlp5-7.12-destdir.patch b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch deleted file mode 100644 index d43a29c97d3f..000000000000 --- a/dev-ml/camlp5/files/camlp5-7.12-destdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: camlp5-rel712/Makefile -=================================================================== ---- camlp5-rel712.orig/Makefile -+++ camlp5-rel712/Makefile -@@ -57,7 +57,7 @@ install: - for i in $(DIRS) compile; do \ - (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR); cd ..); \ - done -- cp etc/topfind.camlp5 `ocamlc -where`/. || true -+ cp etc/topfind.camlp5 "$(DESTDIR)`ocamlc -where`/." || true - - uninstall: - @if test -z "$(LIBDIR)"; then \ |