Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-cairo for openSUSE:Leap:16.0
checked in at 2025-04-15 15:14:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:16.0/ocaml-cairo (Old)
and /work/SRC/openSUSE:Leap:16.0/.ocaml-cairo.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-cairo"
Tue Apr 15 15:14:49 2025 rev:2 rq:1254349 version:0.6.5
Changes:
--------
--- /work/SRC/openSUSE:Leap:16.0/ocaml-cairo/ocaml-cairo.changes
2025-03-19 11:52:31.892329247 +0100
+++ /work/SRC/openSUSE:Leap:16.0/.ocaml-cairo.new.1907/ocaml-cairo.changes
2025-04-15 15:14:51.389663629 +0200
@@ -1,0 +2,6 @@
+Mon Mar 3 03:03:03 UTC 2025 - oher...@suse.de
+
+- Update to version 0.6.5
+ See included CHANGES.md for details
+
+-------------------------------------------------------------------
Old:
----
ocaml-cairo-0.6.4.tar.xz
New:
----
ocaml-cairo-0.6.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-cairo.spec ++++++
--- /var/tmp/diff_new_pack.Uwh5PL/_old 2025-04-15 15:14:51.677675697 +0200
+++ /var/tmp/diff_new_pack.Uwh5PL/_new 2025-04-15 15:14:51.681675866 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-cairo
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 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.4
+Version: 0.6.5
Release: 0
Summary: Binding to Cairo, a 2D Vector Graphics Library.
License: LGPL-3.0-or-later
@@ -26,10 +26,9 @@
Source: %name-%version.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune >= 2.7
-BuildRequires: ocaml-rpm-macros >= 20230101
+BuildRequires: ocaml-rpm-macros >= 20240909
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(dune-configurator)
-BuildRequires: ocamlfind(str)
BuildRequires: pkg-config
BuildRequires: pkgconfig(cairo) >= 1.12
BuildRequires: pkgconfig(fontconfig)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Uwh5PL/_old 2025-04-15 15:14:51.717677374 +0200
+++ /var/tmp/diff_new_pack.Uwh5PL/_new 2025-04-15 15:14:51.717677374 +0200
@@ -1,7 +1,7 @@
<services>
- <service name="tar_scm" mode="disabled">
+ <service name="tar_scm" mode="manual">
<param name="filename">ocaml-cairo</param>
- <param name="revision">aa096da2aafe6a59ea48ed7b4907e451757b8b91</param>
+ <param name="revision">918ef6ee0b5ccef2947fafb11bd2f4ec7730a810</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/Chris00/ocaml-cairo.git</param>
@@ -9,10 +9,10 @@
<param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
<param name="versionrewrite-replacement">\1</param>
</service>
- <service name="recompress" mode="disabled">
+ <service name="recompress" mode="manual">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
- <service name="set_version" mode="disabled"/>
+ <service name="set_version" mode="manual"/>
</services>
++++++ ocaml-cairo-0.6.4.tar.xz -> ocaml-cairo-0.6.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.4/CHANGES.md
new/ocaml-cairo-0.6.5/CHANGES.md
--- old/ocaml-cairo-0.6.4/CHANGES.md 2022-09-28 00:36:23.000000000 +0200
+++ new/ocaml-cairo-0.6.5/CHANGES.md 2024-11-08 20:26:44.000000000 +0100
@@ -1,3 +1,8 @@
+0.6.5 2024-11-08
+----------------
+
+- Do not link `freetype` twice.
+
0.6.4 2022-09-28
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.4/cairo2-gtk.opam
new/ocaml-cairo-0.6.5/cairo2-gtk.opam
--- old/ocaml-cairo-0.6.4/cairo2-gtk.opam 2022-09-28 00:36:23.000000000
+0200
+++ new/ocaml-cairo-0.6.5/cairo2-gtk.opam 2024-11-08 20:26:44.000000000
+0100
@@ -2,7 +2,7 @@
maintainer: "Christophe Troestler <christophe.troest...@umons.ac.be>"
authors: [ "Christophe Troestler <christophe.troest...@umons.ac.be>"
"Pierre Hauweele <pie...@hauweele.net>" ]
-license: "LGPL-3.0"
+license: "LGPL-3.0-or-later"
homepage: "https://github.com/Chris00/ocaml-cairo";
dev-repo: "git+https://github.com/Chris00/ocaml-cairo.git";
bug-reports: "https://github.com/Chris00/ocaml-cairo/issues";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.4/cairo2-pango.opam
new/ocaml-cairo-0.6.5/cairo2-pango.opam
--- old/ocaml-cairo-0.6.4/cairo2-pango.opam 2022-09-28 00:36:23.000000000
+0200
+++ new/ocaml-cairo-0.6.5/cairo2-pango.opam 2024-11-08 20:26:44.000000000
+0100
@@ -2,7 +2,7 @@
maintainer: "Christophe Troestler <christophe.troest...@umons.ac.be>"
authors: [ "Christophe Troestler <christophe.troest...@umons.ac.be>"
"Pierre Hauweele <pie...@hauweele.net>" ]
-license: "LGPL-3.0"
+license: "LGPL-3.0-or-later"
homepage: "https://github.com/Chris00/ocaml-cairo";
dev-repo: "git+https://github.com/Chris00/ocaml-cairo.git";
bug-reports: "https://github.com/Chris00/ocaml-cairo/issues";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.4/cairo2.opam
new/ocaml-cairo-0.6.5/cairo2.opam
--- old/ocaml-cairo-0.6.4/cairo2.opam 2022-09-28 00:36:23.000000000 +0200
+++ new/ocaml-cairo-0.6.5/cairo2.opam 2024-11-08 20:26:44.000000000 +0100
@@ -2,7 +2,7 @@
maintainer: "Christophe Troestler <christophe.troest...@umons.ac.be>"
authors: [ "Christophe Troestler <christophe.troest...@umons.ac.be>"
"Pierre Hauweele <pie...@hauweele.net>" ]
-license: "LGPL-3.0"
+license: "LGPL-3.0-or-later"
homepage: "https://github.com/Chris00/ocaml-cairo";
dev-repo: "git+https://github.com/Chris00/ocaml-cairo.git";
bug-reports: "https://github.com/Chris00/ocaml-cairo/issues";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.4/config/discover.ml
new/ocaml-cairo-0.6.5/config/discover.ml
--- old/ocaml-cairo-0.6.4/config/discover.ml 2022-09-28 00:36:23.000000000
+0200
+++ new/ocaml-cairo-0.6.5/config/discover.ml 2024-11-08 20:26:44.000000000
+0100
@@ -10,7 +10,8 @@
(* In case pkg-config fails *)
let sys = C.ocaml_config_var_exn c "system" in
if sys = "msvc" || sys = "win64" then
- { P.cflags = ["-I"; "C:\\gtk\\include\\cairo"];
+ { P.cflags = ["-I"; "C:\\gtk\\include\\cairo";
+ "-I"; "C:\\gtk\\include\\freetype2"];
libs = ["/LC:\\gtk\\lib"; "cairo.lib"] }
else { P.cflags = ["-I/usr/include/cairo"]; libs = ["-lcairo"] }
@@ -72,22 +73,18 @@
if has_ft_font && has_fc_font then (
match P.get c with
| Some p ->
- (match P.query p ~package:"fontconfig" with
- | Some fc ->
- (match P.query p ~package:"freetype2" with
- | Some ft ->
- (* freetype/ftmodapi.h on Debian but no prefix
- directory on Ubuntu. *)
- let freetype l f =
- if String.length f > 2 && f.[0] = '-' && f.[1] = 'I' then
- f :: (f ^ "/freetype") :: l
- else f :: l in
- c_header_has_ft ();
- (List.fold_left freetype [] ft.cflags @ ft.cflags @ cflags,
- ft.libs @ fc.libs @ libs)
- | None -> cflags, libs)
- | None -> C.die "Cairo was compiled with FreeType but \
- fontconfig cannot be found.")
+ (match P.query p ~package:"fontconfig freetype2" with
+ | Some f ->
+ (* freetype/ftmodapi.h on Debian but no prefix
+ directory on Ubuntu. *)
+ let freetype l f =
+ if String.length f > 2 && f.[0] = '-' && f.[1] = 'I' then
+ f :: (f ^ "/freetype") :: l
+ else f :: l in
+ c_header_has_ft ();
+ (List.fold_left freetype [] f.cflags @ cflags,
+ f.libs @ libs)
+ | None -> cflags, libs)
| None -> cflags, libs
)
else cflags, libs in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-cairo-0.6.4/src/cairo_macros.h
new/ocaml-cairo-0.6.5/src/cairo_macros.h
--- old/ocaml-cairo-0.6.4/src/cairo_macros.h 2022-09-28 00:36:23.000000000
+0200
+++ new/ocaml-cairo-0.6.5/src/cairo_macros.h 2024-11-08 20:26:44.000000000
+0100
@@ -175,6 +175,17 @@
functions. */
const value * caml_cairo_Unavailable;
+#ifdef _MSC_VER
+#define RAISE_UNAVAILABLE(name, ...) \
+ CAMLexport value caml_##name(__VA_ARGS__) \
+ { \
+ if (caml_cairo_Unavailable == NULL) \
+ caml_cairo_Unavailable = caml_named_value("Cairo.Unavailable"); \
+ caml_raise_constant(* caml_cairo_Unavailable); \
+ } \
+
+#else
+
#define RAISE_UNAVAILABLE(name, args ...) \
CAMLexport value caml_##name(args) \
{ \
@@ -183,6 +194,8 @@
caml_raise_constant(* caml_cairo_Unavailable); \
} \
+#endif
+
#define UNAVAILABLE1(name) RAISE_UNAVAILABLE(name, value v1)
#define UNAVAILABLE2(name) RAISE_UNAVAILABLE(name, value v1, value v2)
#define UNAVAILABLE3(name) RAISE_UNAVAILABLE(name, value v1, value v2, value
v3)
