gentoo auto-resync : 06:07:2024 - 08:06:15

3 files changed, 0 insertions, 154 deletions

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);