Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-cairo for openSUSE:Factory
checked in at 2023-01-05 15:00:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-cairo (Old)
and /work/SRC/openSUSE:Factory/.ocaml-cairo.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-cairo"
Thu Jan 5 15:00:49 2023 rev:5 rq:1056068 version:0.6.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-cairo/ocaml-cairo.changes 2022-06-21
16:33:05.351870759 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-cairo.new.1563/ocaml-cairo.changes
2023-01-05 15:01:08.245110271 +0100
@@ -1,0 +2,7 @@
+Sun Jan 1 01:01:01 UTC 2023 - oher...@suse.de
+
+- Update to version 0.6.4
+ See included CHANGES.md for details
+- Move cairo2-pango+cairo2-gtk to separate pkg to remove dependency to lablgtk2
+
+-------------------------------------------------------------------
Old:
----
ocaml-cairo-0.6.3.tar.xz
New:
----
ocaml-cairo-0.6.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-cairo.spec ++++++
--- /var/tmp/diff_new_pack.wvb4rZ/_old 2023-01-05 15:01:08.737112865 +0100
+++ /var/tmp/diff_new_pack.wvb4rZ/_new 2023-01-05 15:01:08.741112886 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-cairo
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ocaml-cairo
-Version: 0.6.3
+Version: 0.6.4
Release: 0
Summary: Binding to Cairo, a 2D Vector Graphics Library.
License: LGPL-3.0-or-later
@@ -26,17 +26,14 @@
Source: %name-%version.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune >= 2.7
-BuildRequires: ocaml-rpm-macros >= 20220409
-BuildRequires: pkg-config
+BuildRequires: ocaml-rpm-macros >= 20230101
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(dune-configurator)
-BuildRequires: ocamlfind(lablgtk2)
BuildRequires: ocamlfind(str)
-BuildRequires: ocamlfind(threads)
+BuildRequires: pkg-config
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
-BuildRequires: pkgconfig(gtk+-2.0)
%description
This is an OCaml binding for the Cairo library, a 2D graphics library with
support for multiple output devices.
@@ -45,6 +42,7 @@
Summary: Development files for %name
Group: Development/Languages/OCaml
Requires: %name = %version
+Requires: pkgconfig(cairo)
%description devel
The %name-devel package contains libraries and signature files for
@@ -54,7 +52,7 @@
%autosetup -p1
%build
-dune_release_pkgs='cairo2,cairo2-pango,cairo2-gtk'
+dune_release_pkgs='cairo2'
%ocaml_dune_setup
%ocaml_dune_build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.wvb4rZ/_old 2023-01-05 15:01:08.777113076 +0100
+++ /var/tmp/diff_new_pack.wvb4rZ/_new 2023-01-05 15:01:08.781113097 +0100
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-cairo</param>
- <param name="revision">cd80c793e3c6406fdc50376201fc1b0a3b4cc5c5</param>
+ <param name="revision">aa096da2aafe6a59ea48ed7b4907e451757b8b91</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/Chris00/ocaml-cairo.git</param>
++++++ ocaml-cairo-0.6.3.tar.xz -> ocaml-cairo-0.6.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/.github/workflows/main.yml
new/ocaml-cairo-0.6.4/.github/workflows/main.yml
--- old/ocaml-cairo-0.6.3/.github/workflows/main.yml 2022-05-22
09:20:40.000000000 +0200
+++ new/ocaml-cairo-0.6.4/.github/workflows/main.yml 2022-09-28
00:36:23.000000000 +0200
@@ -18,7 +18,7 @@
ocaml-version:
- 4.12.0
include:
- - ocaml-version: 4.02.x
+ - ocaml-version: 4.03.x
os: ubuntu-latest
skip_test: true
- ocaml-version: 4.08.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/CHANGES.md
new/ocaml-cairo-0.6.4/CHANGES.md
--- old/ocaml-cairo-0.6.3/CHANGES.md 2022-05-22 09:20:40.000000000 +0200
+++ new/ocaml-cairo-0.6.4/CHANGES.md 2022-09-28 00:36:23.000000000 +0200
@@ -1,3 +1,8 @@
+0.6.4 2022-09-28
+----------------
+
+- Be compatible with OCaml 5.0 (@kit-ty-kate).
+
0.6.3 2022-05-20
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/cairo2-gtk.opam
new/ocaml-cairo-0.6.4/cairo2-gtk.opam
--- old/ocaml-cairo-0.6.3/cairo2-gtk.opam 2022-05-22 09:20:40.000000000
+0200
+++ new/ocaml-cairo-0.6.4/cairo2-gtk.opam 2022-09-28 00:36:23.000000000
+0200
@@ -9,9 +9,10 @@
doc: "https://Chris00.github.io/ocaml-cairo/doc";
tags: ["Cairo" "stroke" "drawing" "tutorial"]
build: [
- ["dune" "subst"] {pinned}
+ ["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
- ["dune" "build" "@doc"] {with-doc}
+ ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+ ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
]
depends: [
"ocaml" {>= "4.02"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/cairo2-pango.opam
new/ocaml-cairo-0.6.4/cairo2-pango.opam
--- old/ocaml-cairo-0.6.3/cairo2-pango.opam 2022-05-22 09:20:40.000000000
+0200
+++ new/ocaml-cairo-0.6.4/cairo2-pango.opam 2022-09-28 00:36:23.000000000
+0200
@@ -9,9 +9,10 @@
doc: "https://Chris00.github.io/ocaml-cairo/doc";
tags: ["Cairo" "stroke" "drawing" "tutorial"]
build: [
- ["dune" "subst"] {pinned}
+ ["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
- ["dune" "build" "@doc"] {with-doc}
+ ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+ ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
]
depends: [
"ocaml" {>= "4.02"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/cairo2.opam
new/ocaml-cairo-0.6.4/cairo2.opam
--- old/ocaml-cairo-0.6.3/cairo2.opam 2022-05-22 09:20:40.000000000 +0200
+++ new/ocaml-cairo-0.6.4/cairo2.opam 2022-09-28 00:36:23.000000000 +0200
@@ -9,13 +9,13 @@
doc: "https://Chris00.github.io/ocaml-cairo/doc";
tags: ["Cairo" "stroke" "drawing" "tutorial"]
build: [
- ["dune" "subst"] {pinned}
+ ["dune" "subst"] {dev}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
- ["dune" "build" "@doc"] {with-doc}
+ ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
]
depends: [
- "ocaml" {>= "4.02"}
+ "ocaml" {>= "4.03"}
"base-bigarray"
"dune" {>= "2.7.0"}
"dune-configurator" {>= "2.7.0"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/gtk/cairo_gtk_stubs.c
new/ocaml-cairo-0.6.4/gtk/cairo_gtk_stubs.c
--- old/ocaml-cairo-0.6.3/gtk/cairo_gtk_stubs.c 2022-05-22 09:20:40.000000000
+0200
+++ new/ocaml-cairo-0.6.4/gtk/cairo_gtk_stubs.c 2022-09-28 00:36:23.000000000
+0200
@@ -66,7 +66,7 @@
CAMLlocal1(vcontext);
cairo_t *cr = gdk_cairo_create(GdkDrawable_val(vdrawable));
caml_cairo_raise_Error(cairo_status(cr)); /* caml_check_status not exported
*/
- vcontext = alloc_custom(&caml_cairo_ops, sizeof(void*), 1, 50);
+ vcontext = caml_alloc_custom(&caml_cairo_ops, sizeof(void*), 1, 50);
CAIRO_VAL(vcontext) = cr;
CAMLreturn(vcontext);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/pango/cairo_pango_stubs.c
new/ocaml-cairo-0.6.4/pango/cairo_pango_stubs.c
--- old/ocaml-cairo-0.6.3/pango/cairo_pango_stubs.c 2022-05-22
09:20:40.000000000 +0200
+++ new/ocaml-cairo-0.6.4/pango/cairo_pango_stubs.c 2022-09-28
00:36:23.000000000 +0200
@@ -32,7 +32,7 @@
/* https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html */
-#define ALLOC(name) alloc_custom(&caml_##name##_ops, sizeof(void*), 1, 50)
+#define ALLOC(name) caml_alloc_custom(&caml_##name##_ops, sizeof(void*), 1, 50)
#define DO2_NOALLOC(fn, of_val1, of_val2) \
CAMLexport value caml_##fn (value v1, value v2) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/src/cairo_ocaml.h.p
new/ocaml-cairo-0.6.4/src/cairo_ocaml.h.p
--- old/ocaml-cairo-0.6.3/src/cairo_ocaml.h.p 2022-05-22 09:20:40.000000000
+0200
+++ new/ocaml-cairo-0.6.4/src/cairo_ocaml.h.p 2022-09-28 00:36:23.000000000
+0200
@@ -148,6 +148,7 @@
/* #define OCAML_CAIRO_HAS_FT 1 */
#ifdef OCAML_CAIRO_HAS_FT
+#undef alloc
#include <cairo-ft.h>
#define FT_LIBRARY_VAL(v) (* (FT_Library*) Data_custom_val(v))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/src/cairo_ocaml_types.h
new/ocaml-cairo-0.6.4/src/cairo_ocaml_types.h
--- old/ocaml-cairo-0.6.3/src/cairo_ocaml_types.h 2022-05-22
09:20:40.000000000 +0200
+++ new/ocaml-cairo-0.6.4/src/cairo_ocaml_types.h 2022-09-28
00:36:23.000000000 +0200
@@ -33,7 +33,7 @@
} \
CUSTOM_OPERATIONS(name)
-#define ALLOC(name) alloc_custom(&caml_##name##_ops, sizeof(void*), 1, 50)
+#define ALLOC(name) caml_alloc_custom(&caml_##name##_ops, sizeof(void*), 1, 50)
/* Type cairo_t
***********************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.3/src/cairo_stubs.c
new/ocaml-cairo-0.6.4/src/cairo_stubs.c
--- old/ocaml-cairo-0.6.3/src/cairo_stubs.c 2022-05-22 09:20:40.000000000
+0200
+++ new/ocaml-cairo-0.6.4/src/cairo_stubs.c 2022-09-28 00:36:23.000000000
+0200
@@ -1006,7 +1006,7 @@
status = cairo_scaled_font_text_to_glyphs
(SCALED_FONT_VAL(vsf), Double_val(vx), Double_val(vy),
- String_val(vutf8), string_length(vutf8),
+ String_val(vutf8), caml_string_length(vutf8),
&glyphs, &num_glyphs, &clusters, &num_clusters, &cluster_flags);
caml_cairo_raise_Error(status);
@@ -1269,7 +1269,7 @@
ARRAY_GLYPH_VAL(glyphs, p, vglyphs, num_glyphs);
ARRAY_CLUSTER_VAL(clusters, q, vglyphs, num_glyphs);
- cairo_show_text_glyphs(cr, String_val(vutf8), string_length(vutf8),
+ cairo_show_text_glyphs(cr, String_val(vutf8), caml_string_length(vutf8),
glyphs, num_glyphs, clusters, num_clusters,
/* FIXME: is it a binary | ? */
CLUSTER_FLAGS_VAL(vcluster_flags));
@@ -1624,7 +1624,7 @@
cairo_surface_get_user_data(SURFACE_VAL(vsurf), &image_bigarray_key); \
\
if (data == NULL) \
- invalid_argument("Cairo.Image.get_data: not an image surface."); \
+ caml_invalid_argument("Cairo.Image.get_data: not an image surface."); \
if (proxy == NULL) { \
/* We assume the payload is externally managed */ \
vb = caml_ba_alloc(CAML_BA_##type | CAML_BA_C_LAYOUT \
