Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-curses for openSUSE:Factory checked in at 2022-04-06 21:51:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-curses (Old) and /work/SRC/openSUSE:Factory/.ocaml-curses.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-curses" Wed Apr 6 21:51:10 2022 rev:8 rq:967046 version:1.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-curses/ocaml-curses.changes 2021-10-21 23:55:39.320029468 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-curses.new.1900/ocaml-curses.changes 2022-04-06 21:51:26.679599177 +0200 @@ -1,0 +2,5 @@ +Fri Nov 26 12:34:56 UTC 2021 - oher...@suse.de + +- Update to version 1.0.10 + +------------------------------------------------------------------- Old: ---- ocaml-curses-1.0.9.tar.xz New: ---- ocaml-curses-1.0.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-curses.spec ++++++ --- /var/tmp/diff_new_pack.vGBlD9/_old 2022-04-06 21:51:27.151593791 +0200 +++ /var/tmp/diff_new_pack.vGBlD9/_new 2022-04-06 21:51:27.155593745 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-curses # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,18 @@ Name: ocaml-curses -Version: 1.0.9 +Version: 1.0.10 Release: 0 %{?ocaml_preserve_bytecode} Summary: OCaml bindings for ncurses License: LGPL-2.1+ Group: Development/Languages/OCaml Url: https://opam.ocaml.org/packages/curses -Source0: %{name}-%{version}.tar.xz +Source0: %name-%version.tar.xz BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: ocaml-dune >= 2.7 -BuildRequires: ocaml-rpm-macros >= 20210911 +BuildRequires: ocaml-rpm-macros >= 20220222 BuildRequires: ocamlfind(dune.configurator) BuildRequires: pkg-config @@ -36,14 +36,14 @@ OCaml bindings for ncurses. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Languages/OCaml -Requires: %{name} = %{version} +Requires: %name = %version Requires: ncurses-devel %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The %name-devel package contains libraries and signature files for +developing applications that use %name. %prep %autosetup -p1 @@ -61,8 +61,8 @@ dune_test_tolerate_fail='dune_test_tolerate_fail' %ocaml_dune_test -%files -f %{name}.files +%files -f %name.files -%files devel -f %{name}.files.devel +%files devel -f %name.files.devel %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.vGBlD9/_old 2022-04-06 21:51:27.211593106 +0200 +++ /var/tmp/diff_new_pack.vGBlD9/_new 2022-04-06 21:51:27.219593014 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-curses</param> - <param name="revision">bf8a3536d375ba29b4e85c8c4c6ce573260e65d9</param> + <param name="revision">a23a03d06206d85f53938c196b2a258ed1e4ef2e</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/mbacarella/curses.git</param> ++++++ ocaml-curses-1.0.9.tar.xz -> ocaml-curses-1.0.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-curses-1.0.9/.github/workflows/workflow.yml new/ocaml-curses-1.0.10/.github/workflows/workflow.yml --- old/ocaml-curses-1.0.9/.github/workflows/workflow.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-curses-1.0.10/.github/workflows/workflow.yml 2021-11-20 21:21:03.000000000 +0100 @@ -0,0 +1,37 @@ +name: Main workflow + +on: + pull_request: + push: + schedule: + # Prime the caches every Monday + - cron: 0 1 * * MON + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: + - macos-latest + - ubuntu-latest + - windows-latest + ocaml-compiler: + - 4.12.0 + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Use OCaml ${{ matrix.ocaml-version }} + uses: ocaml/setup-ocaml@v2 + with: + ocaml-version: ${{ matrix.ocaml-version }} + + - run: opam install . --deps-only --with-test + + - run: opam exec -- dune build + + - run: opam exec -- dune runtest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-curses-1.0.9/.ocamlformat new/ocaml-curses-1.0.10/.ocamlformat --- old/ocaml-curses-1.0.9/.ocamlformat 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-curses-1.0.10/.ocamlformat 2021-11-20 21:21:03.000000000 +0100 @@ -0,0 +1,65 @@ +profile=janestreet +quiet=false +max-iters=10 +comment-check=true +wrap-fun-args=false +wrap-comments=false +type-decl-indent=2 +type-decl=sparse +stritem-extension-indent=0 +space-around-variants=true +space-around-records=true +space-around-lists=true +space-around-arrays=true +single-case=sparse +sequence-style=terminator +sequence-blank-line=compact +parse-docstrings=false +parens-tuple-patterns=multi-line-only +parens-tuple=multi-line-only +parens-ite=true +ocp-indent-compat=true +nested-match=wrap +module-item-spacing=compact +max-indent=68 +match-indent-nested=never +match-indent=0 +margin=100 +let-module=sparse +let-binding-spacing=compact +let-binding-indent=2 +let-and=sparse +leading-nested-match-parens=true +infix-precedence=parens +indicate-nested-or-patterns=unsafe-no +indicate-multiline-delimiters=no +indent-after-in=0 +if-then-else=keyword-first +function-indent-nested=never +function-indent=2 +field-space=loose +extension-indent=2 +exp-grouping=parens +dock-collection-brackets=false +doc-comments-tag-only=fit +doc-comments-padding=1 +doc-comments=before +disambiguate-non-breaking-match=false +disable=false +cases-matching-exp-indent=normal +cases-exp-indent=2 +break-struct=force +break-string-literals=auto +break-sequences=true +break-separators=after +break-infix-before-func=true +break-infix=fit-or-vertical +break-fun-sig=fit-or-vertical +break-fun-decl=fit-or-vertical +break-collection-expressions=fit-or-vertical +break-cases=fit-or-vertical +break-before-in=fit-or-vertical +assignment-operator=begin-line +align-variants-decl=false +align-constructors-decl=false +align-cases=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-curses-1.0.9/discover.ml new/ocaml-curses-1.0.10/discover.ml --- old/ocaml-curses-1.0.9/discover.ml 2021-10-13 22:36:39.000000000 +0200 +++ new/ocaml-curses-1.0.10/discover.ml 2021-11-20 21:21:03.000000000 +0100 @@ -5,30 +5,31 @@ let ml_file = "config.ml" in let ml_code = [ "let wide_ncurses = true" ] in C.Flags.write_lines ml_file ml_code; - - let stale_ncursesw : C.Pkg_config.package_conf = - { libs = [ "-lncursesw" ]; cflags = [] } - in - + let stale_ncursesw : C.Pkg_config.package_conf = { libs = [ "-lncursesw" ]; cflags = [] } in let conf = match C.Pkg_config.get c with | None -> C.die "'pkg-config' missing" - | Some pc -> ( - match C.Pkg_config.query pc ~package:"ncursesw" with - | None -> stale_ncursesw - | Some deps -> deps) + | Some pc -> + (match C.Pkg_config.query pc ~package:"ncursesw" with + | None -> stale_ncursesw + | Some deps -> deps) in - let config_h = - [ - "#define CURSES_HEADER <ncursesw/curses.h>"; - "#define CURSES_TERM_H <ncursesw/term.h>"; - "#define HAVE_TERMIOS_H 1"; - "#define HAVE_SYS_IOCTL_H 1"; - ] + match Sys.os_type with + | "Unix" -> + [ "#define CURSES_HEADER <curses.h>"; + "#define CURSES_TERM_H <term.h>"; + "#define HAVE_TERMIOS_H 1"; + "#define HAVE_SYS_IOCTL_H 1" + ] + | "Win32" | "Cygwin" -> + [ "#define CURSES_HEADER <curses.h>"; + "#define CURSES_TERM_H <term.h>"; + "#define HAVE_WINDOWS_H 1" + ] + | os -> failwith (Printf.sprintf "Sys.os_type: %s: unknown os type" os) in C.Flags.write_lines "_config.h" config_h; - let extra_cflags = [ "-DHAVE_CONFIG_H" ] in C.Flags.write_sexp "c_flags.sexp" (List.append conf.cflags extra_cflags); C.Flags.write_sexp "c_library_flags.sexp" conf.libs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-curses-1.0.9/keys.ml new/ocaml-curses-1.0.10/keys.ml --- old/ocaml-curses-1.0.9/keys.ml 2021-10-13 22:36:39.000000000 +0200 +++ new/ocaml-curses-1.0.10/keys.ml 2021-11-20 21:21:03.000000000 +0100 @@ -1,94 +1,94 @@ -let code_yes = 0o400 -let min = 0o401 -let break = 0o401 -let down = 0o402 -let up = 0o403 -let left = 0o404 -let right = 0o405 -let home = 0o406 -let backspace = 0o407 -let f0 = 0o410 -let dl = 0o510 -let il = 0o511 -let dc = 0o512 -let ic = 0o513 -let eic = 0o514 -let clear = 0o515 -let eos = 0o516 -let eol = 0o517 -let sf = 0o520 -let sr = 0o521 -let npage = 0o522 -let ppage = 0o523 -let stab = 0o524 -let ctab = 0o525 -let catab = 0o526 -let enter = 0o527 -let sreset = 0o530 -let reset = 0o531 -let print = 0o532 -let ll = 0o533 -let a1 = 0o534 -let a3 = 0o535 -let b2 = 0o536 -let c1 = 0o537 -let c3 = 0o540 -let btab = 0o541 -let beg = 0o542 -let cancel = 0o543 -let close = 0o544 -let command = 0o545 -let copy = 0o546 -let create = 0o547 -let end_ = 0o550 -let exit = 0o551 -let find = 0o552 -let help = 0o553 -let mark = 0o554 -let message = 0o555 -let move = 0o556 -let next = 0o557 -let open_ = 0o560 -let options = 0o561 -let previous = 0o562 -let redo = 0o563 -let reference = 0o564 -let refresh = 0o565 -let replace = 0o566 -let restart = 0o567 -let resume = 0o570 -let save = 0o571 -let sbeg = 0o572 -let scancel = 0o573 -let scommand = 0o574 -let scopy = 0o575 -let screate = 0o576 -let sdc = 0o577 -let sdl = 0o600 -let select = 0o601 -let send = 0o602 -let seol = 0o603 -let sexit = 0o604 -let sfind = 0o605 -let shelp = 0o606 -let shome = 0o607 -let sic = 0o610 -let sleft = 0o611 -let smessage = 0o612 -let smove = 0o613 -let snext = 0o614 -let soptions = 0o615 -let sprevious = 0o616 -let sprint = 0o617 -let sredo = 0o620 -let sreplace = 0o621 -let sright = 0o622 -let srsume = 0o623 -let ssave = 0o624 -let ssuspend = 0o625 -let sundo = 0o626 -let suspend = 0o627 -let undo = 0o630 -let mouse = 0o631 -let resize = 0o632 -let max = 0o777 +let code_yes = 0o400 +let min = 0o401 +let break = 0o401 +let down = 0o402 +let up = 0o403 +let left = 0o404 +let right = 0o405 +let home = 0o406 +let backspace = 0o407 +let f0 = 0o410 +let dl = 0o510 +let il = 0o511 +let dc = 0o512 +let ic = 0o513 +let eic = 0o514 +let clear = 0o515 +let eos = 0o516 +let eol = 0o517 +let sf = 0o520 +let sr = 0o521 +let npage = 0o522 +let ppage = 0o523 +let stab = 0o524 +let ctab = 0o525 +let catab = 0o526 +let enter = 0o527 +let sreset = 0o530 +let reset = 0o531 +let print = 0o532 +let ll = 0o533 +let a1 = 0o534 +let a3 = 0o535 +let b2 = 0o536 +let c1 = 0o537 +let c3 = 0o540 +let btab = 0o541 +let beg = 0o542 +let cancel = 0o543 +let close = 0o544 +let command = 0o545 +let copy = 0o546 +let create = 0o547 +let end_ = 0o550 +let exit = 0o551 +let find = 0o552 +let help = 0o553 +let mark = 0o554 +let message = 0o555 +let move = 0o556 +let next = 0o557 +let open_ = 0o560 +let options = 0o561 +let previous = 0o562 +let redo = 0o563 +let reference = 0o564 +let refresh = 0o565 +let replace = 0o566 +let restart = 0o567 +let resume = 0o570 +let save = 0o571 +let sbeg = 0o572 +let scancel = 0o573 +let scommand = 0o574 +let scopy = 0o575 +let screate = 0o576 +let sdc = 0o577 +let sdl = 0o600 +let select = 0o601 +let send = 0o602 +let seol = 0o603 +let sexit = 0o604 +let sfind = 0o605 +let shelp = 0o606 +let shome = 0o607 +let sic = 0o610 +let sleft = 0o611 +let smessage = 0o612 +let smove = 0o613 +let snext = 0o614 +let soptions = 0o615 +let sprevious = 0o616 +let sprint = 0o617 +let sredo = 0o620 +let sreplace = 0o621 +let sright = 0o622 +let srsume = 0o623 +let ssave = 0o624 +let ssuspend = 0o625 +let sundo = 0o626 +let suspend = 0o627 +let undo = 0o630 +let mouse = 0o631 +let resize = 0o632 +let max = 0o777 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-curses-1.0.9/test.ml new/ocaml-curses-1.0.10/test.ml --- old/ocaml-curses-1.0.9/test.ml 2021-10-13 22:36:39.000000000 +0200 +++ new/ocaml-curses-1.0.10/test.ml 2021-11-20 21:21:03.000000000 +0100 @@ -2,7 +2,7 @@ let () = ripoffline true let w = initscr () -let (wd, ncol) = get_ripoff () +let wd, ncol = get_ripoff () (*let () = assert (start_color ()) let () = assert (init_pair 1 Color.red Color.white)*) @@ -12,67 +12,94 @@ let () = assert (intrflush w false) let () = assert (keypad w true) -let () = for i = 0 to 10 do - assert (mvaddch i (i * 2) (A.color_pair 1 + 111)) -done +let () = + for i = 0 to 10 do + assert (mvaddch i (i * 2) (A.color_pair 1 + 111)) + done let () = border 0 0 0 0 0 0 0 0 let () = wborder w 0 0 0 0 0 0 0 0 - let () = assert (refresh ()) - -let (c1, c2) = mousemask (-1) - +let c1, c2 = mousemask (-1) let () = assert (mvaddstr 3 1 "Bonjour") let () = assert (mvaddstr 4 2 (string_of_int c1)) let () = assert (mvaddstr 5 2 (string_of_int c2)) - let t = Array.init 50 (fun x -> 64 + x) let () = assert (addchnstr t 10 3) let () = assert (mvaddnstr 8 40 "Bonjour" 1 3) let () = assert (mvinsstr 8 40 "toto ") - -let t = [|0; 0; 0; 0 |] - +let t = [| 0; 0; 0; 0 |] let () = assert (inchnstr t 0 3) let[@warning "-52"] () = - try winch_handler_on () - with Invalid_argument "winch_handler_on" -> () + try winch_handler_on () with + | Invalid_argument "winch_handler_on" -> () let[@warning "-52"] () = try let kup = tigetstr "kcuu1" in assert (addstr kup) - with Failure "tigetstr" -> () + with + | Failure "tigetstr" -> () let acs = get_acs_codes () let () = assert (addch acs.Acs.ulcorner) - let i = getch () +let nc, np, can = colors (), color_pairs (), can_change_color () +let c1, c2 = pair_content 1 +let l = ref [] +let () = assert (tputs "totoping" 1 (fun c -> l := int_of_char c :: !l)) +let tr, tc = get_size () +let () = endwin () -let (nc, np, can) = (colors (), color_pairs (), can_change_color ()) +let () = + Array.iter + (fun x -> + print_int x; + print_newline ()) + t + +let () = + print_string "key="; + print_int i; + print_newline () + +let () = + print_int tr; + print_string " "; + print_int tc; + print_newline () -let (c1, c2) = pair_content 1 +let () = + print_int nc; + print_string " " + +let () = + print_int np; + print_string " " -let l = ref [] -let () = assert (tputs "totoping" 1 (fun c -> l := (int_of_char c) :: !l)) +let () = + print_string (if can then "oui" else "non"); + print_newline () -let (tr, tc) = get_size () +let () = + print_int c1; + print_string " " -let () = endwin () +let () = + print_int c2; + print_newline () -let () = Array.iter (fun x -> print_int x; print_newline ()) t +let () = + print_int ncol; + print_newline () -let () = print_string "key="; print_int i; print_newline () -let () = print_int tr; print_string " "; print_int tc; print_newline () -let () = print_int nc; print_string " " -let () = print_int np; print_string " " -let () = print_string (if can then "oui" else "non"); print_newline () -let () = print_int c1; print_string " " -let () = print_int c2; print_newline () -let () = print_int ncol; print_newline () -let () = List.iter (fun x -> print_int x; print_string " ") !l; +let () = + List.iter + (fun x -> + print_int x; + print_string " ") + !l; print_newline () (*let i = ref 0