commit: 53e0401df65f5388d0306fa5067ee271a755dc5c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Jul 4 06:56:06 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Thu Jul 4 12:43:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e0401d
dev-ml/cairo2: remove unused patches Bug: https://github.com/gentoo/gentoo/pull/37421 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> ...6.1-Fix-multiple-definitions-of-variables.patch | 102 --------------------- .../files/cairo2-0.6.1-handle-safe-string.patch | 50 ---------- 2 files changed, 152 deletions(-) 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 <[email protected]> -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 <[email protected]> -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 <[email protected]> - -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);
