Hello community, here is the log from the commit of package ocaml-pcre for openSUSE:Factory checked in at 2020-08-24 15:08:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-pcre (Old) and /work/SRC/openSUSE:Factory/.ocaml-pcre.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-pcre" Mon Aug 24 15:08:37 2020 rev:4 rq:828701 version:7.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-pcre/ocaml-pcre.changes 2020-03-09 14:14:06.962535548 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-pcre.new.3399/ocaml-pcre.changes 2020-08-24 15:09:18.118575313 +0200 @@ -1,0 +2,6 @@ +Thu Aug 20 20:20:20 UTC 2020 - [email protected] + +- Update to version 7.4.6 + Remove build dependency on Base + +------------------------------------------------------------------- Old: ---- ocaml-pcre-7.4.3.tar.xz New: ---- ocaml-pcre-7.4.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-pcre.spec ++++++ --- /var/tmp/diff_new_pack.A0qFke/_old 2020-08-24 15:09:21.366576896 +0200 +++ /var/tmp/diff_new_pack.A0qFke/_new 2020-08-24 15:09:21.370576897 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-pcre # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail.com> # # All modifications and additions to the file contributed by third parties @@ -18,20 +18,19 @@ Name: ocaml-pcre -Version: 7.4.3 +Version: 7.4.6 Release: 0 %{?ocaml_preserve_bytecode} Summary: Perl compatibility regular expressions (PCRE) for OCaml -License: LGPL-2.0 +License: LGPL-2.0-only Group: Development/Languages/OCaml -Url: https://opam.ocaml.org/packages/pcre +URL: https://opam.ocaml.org/packages/pcre Source0: %{name}-%{version}.tar.xz -BuildRequires: ocaml(ocaml_base_version) >= 4.08 BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200220 -BuildRequires: ocamlfind(base) -BuildRequires: ocamlfind(dune.configurator) +BuildRequires: ocaml-rpm-macros >= 20200514 BuildRequires: pkg-config +BuildRequires: ocaml(ocaml_base_version) >= 4.08 +BuildRequires: ocamlfind(dune.configurator) BuildRequires: pkgconfig(libpcre) %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.A0qFke/_old 2020-08-24 15:09:21.402576913 +0200 +++ /var/tmp/diff_new_pack.A0qFke/_new 2020-08-24 15:09:21.402576913 +0200 @@ -1,10 +1,13 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">git://github.com/mmottl/pcre-ocaml.git</param> + <param name="filename">ocaml-pcre</param> + <param name="revision">60fce5301b4e645efb8f8e14994ee055e8f8f781</param> <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">git://github.com/mmottl/pcre-ocaml.git</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">45a2781669d4dc1616f9d07510b366cbe0ae99d4</param> - <param name="filename">ocaml-pcre</param> + <param name="versionrewrite-pattern">[v]?([^+]+)(.*)</param> + <param name="versionrewrite-replacement">\1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-pcre-7.4.3.tar.xz -> ocaml-pcre-7.4.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/CHANGES.md new/ocaml-pcre-7.4.6/CHANGES.md --- old/ocaml-pcre-7.4.3/CHANGES.md 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/CHANGES.md 2020-08-04 19:34:21.000000000 +0200 @@ -1,3 +1,21 @@ +### 7.4.6 (2020-08-04) + + * Removed mistakenly kept base library configuration dependency. + + +### 7.4.5 (2020-08-04) + + * Removed excessive build dependency on `base` package. + + +### 7.4.4 (2020-07-30) + + * Added missing dune-configurator dependency. + + * Added support for const char strings in stubs due to stricter handling + in newer OCaml runtimes. This eliminates C-compiler warnings. + + ### 7.4.3 (2019-10-27) * Switched from `caml_alloc_custom` to `caml_alloc_custom_mem`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/dune-project new/ocaml-pcre-7.4.6/dune-project --- old/ocaml-pcre-7.4.3/dune-project 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/dune-project 2020-08-04 19:34:21.000000000 +0200 @@ -20,8 +20,8 @@ (depends (ocaml (>= 4.08)) (dune (>= 1.10)) + dune-configurator (conf-libpcre :build) - (base :build) base-bytes ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/pcre.opam new/ocaml-pcre-7.4.6/pcre.opam --- old/ocaml-pcre-7.4.3/pcre.opam 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/pcre.opam 2020-08-04 19:34:21.000000000 +0200 @@ -20,7 +20,7 @@ depends: [ "ocaml" {>= "4.08"} "dune" {>= "1.10"} + "dune-configurator" "conf-libpcre" {build} - "base" {build} "base-bytes" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/src/config/discover.ml new/ocaml-pcre-7.4.6/src/config/discover.ml --- old/ocaml-pcre-7.4.3/src/config/discover.ml 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/src/config/discover.ml 2020-08-04 19:34:21.000000000 +0200 @@ -1,5 +1,3 @@ -open Base - let () = let module C = Configurator.V1 in C.main ~name:"pcre" (fun c -> @@ -7,9 +5,10 @@ libs = ["-lpcre"]; cflags = [] } in - let conf = - Option.value_map (C.Pkg_config.get c) ~default ~f:(fun pc -> - Option.value (C.Pkg_config.query pc ~package:"libpcre") ~default) + let conf = match C.Pkg_config.get c with + | None -> default + | Some pc -> + Option.value (C.Pkg_config.query pc ~package:"libpcre") ~default in C.Flags.write_sexp "c_flags.sexp" conf.cflags; C.Flags.write_sexp "c_library_flags.sexp" conf.libs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/src/config/dune new/ocaml-pcre-7.4.6/src/config/dune --- old/ocaml-pcre-7.4.3/src/config/dune 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/src/config/dune 2020-08-04 19:34:21.000000000 +0200 @@ -1,4 +1,4 @@ (executables (names discover) - (libraries base dune.configurator) + (libraries dune.configurator) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/src/dune new/ocaml-pcre-7.4.6/src/dune --- old/ocaml-pcre-7.4.3/src/dune 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/src/dune 2020-08-04 19:34:21.000000000 +0200 @@ -1,11 +1,7 @@ (library (public_name pcre) (c_names pcre_stubs) - (c_flags - (:standard) - (:include c_flags.sexp) -O2 -fPIC -DPIC - -Wno-keyword-macro - ) + (c_flags (:standard) (:include c_flags.sexp) -O2 -fPIC -DPIC) (c_library_flags (:include c_library_flags.sexp)) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-pcre-7.4.3/src/pcre_stubs.c new/ocaml-pcre-7.4.6/src/pcre_stubs.c --- old/ocaml-pcre-7.4.3/src/pcre_stubs.c 2019-10-27 22:30:56.000000000 +0100 +++ new/ocaml-pcre-7.4.6/src/pcre_stubs.c 2020-08-04 19:34:21.000000000 +0200 @@ -36,11 +36,9 @@ #endif #if __GNUC__ >= 3 -# define inline inline __attribute__ ((always_inline)) # define __unused __attribute__ ((unused)) #else # define __unused -# define inline #endif #include <ctype.h> @@ -513,16 +511,11 @@ if (ftable == NULL) return None; else { value v_res, v_res_str; - char *ptr; - int i; Begin_roots1(v_rex); - v_res_str = caml_alloc_string(32); + v_res_str = caml_alloc_initialized_string(32, (char *) ftable); End_roots(); - ptr = String_val(v_res_str); - for (i = 0; i <= 31; ++i) { *ptr = *ftable; ++ptr; ++ftable; } - Begin_roots1(v_res_str); /* Allocates [Some string] from firsttable */ v_res = caml_alloc_small(1, 0);
