Hello community, here is the log from the commit of package unison for openSUSE:Factory checked in at 2019-11-27 13:52:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unison (Old) and /work/SRC/openSUSE:Factory/.unison.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unison" Wed Nov 27 13:52:50 2019 rev:38 rq:748254 version:2.48.15 Changes: -------- --- /work/SRC/openSUSE:Factory/unison/unison.changes 2019-11-03 12:19:06.697132519 +0100 +++ /work/SRC/openSUSE:Factory/.unison.new.26869/unison.changes 2019-11-27 13:52:59.848387261 +0100 @@ -1,0 +2,8 @@ +Wed Nov 13 12:34:56 UTC 2019 - [email protected] + +- Update to v2.48v4, via _service file +- Add Compatibility-with-OCaml-4.08.patch +- Add Fix-for-lablgtk-2.18.6.patch +- Require lablgtk2 > 2.18.5 + +------------------------------------------------------------------- Old: ---- unison-2.48.4.tar.gz New: ---- Compatibility-with-OCaml-4.08.patch Fix-for-lablgtk-2.18.6.patch _service unison-2.48.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unison.spec ++++++ --- /var/tmp/diff_new_pack.Dx2Je4/_old 2019-11-27 13:53:00.392386809 +0100 +++ /var/tmp/diff_new_pack.Dx2Je4/_new 2019-11-27 13:53:00.396386806 +0100 @@ -12,28 +12,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: unison -Version: 2.48.4 +Version: 2.48.15 Release: 0 %{?ocaml_preserve_bytecode} Summary: File synchronization tool License: GPL-3.0+ Group: Productivity/Networking/Other -Url: http://www.cis.upenn.edu/~bcpierce/unison -Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz -Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html +Url: https://github.com/bcpierce00/unison +Source0: %{name}-%{version}.tar.xz +#https://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html +Source1: unison-2.48.4-manual.html Source2: %{name}.desktop Source3: %{name}.png +Patch0: Compatibility-with-OCaml-4.08.patch +Patch1: Fix-for-lablgtk-2.18.6.patch BuildRequires: gtk2-devel BuildRequires: ncurses-devel -BuildRequires: ocaml-lablgtk2-devel < 2.18.8 +BuildRequires: ocaml-lablgtk2-devel > 2.18.5 BuildRequires: ocaml-rpm-macros >= 4.03.0 BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Unison is a file synchronization tool for Unix and Windows. It allows @@ -43,7 +45,7 @@ replica to the other. %prep -%setup -qn src +%autosetup -p1 %build # This package failed when testing with -Wl,-as-needed being default. @@ -66,7 +68,6 @@ %suse_update_desktop_file -i %name Utility SyncUtility %files -%defattr(-,root,root) %doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt unison-manual.html %{_datadir}/applications/* %{_datadir}/pixmaps/unison.png ++++++ Compatibility-with-OCaml-4.08.patch ++++++ >From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001 From: Jaap Boender <[email protected]> Date: Thu, 21 Mar 2019 12:26:51 +0000 Subject: Compatibility with OCaml 4.08 --- files.ml | 2 +- recon.ml | 4 ++-- system/system_generic.ml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files.ml b/files.ml index ba42ad5..5babf21 100644 --- a/files.ml +++ b/files.ml @@ -722,7 +722,7 @@ let get_files_in_directory dir = with End_of_file -> dirh.System.closedir () end; - Sort.list (<) !files + List.sort String.compare !files let ls dir pattern = Util.convertUnixErrorsToTransient diff --git a/recon.ml b/recon.ml index 5ed358d..0df2cfe 100644 --- a/recon.ml +++ b/recon.ml @@ -651,8 +651,8 @@ let rec reconcile (* Sorts the paths so that they will be displayed in order *) let sortPaths pathUpdatesList = - Sort.list - (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) + List.sort + Path.compare pathUpdatesList let rec enterPath p1 p2 t = diff --git a/system/system_generic.ml b/system/system_generic.ml index ed8e18f..0e28a78 100755 --- a/system/system_generic.ml +++ b/system/system_generic.ml @@ -47,7 +47,7 @@ let open_out_gen = open_out_gen let chmod = Unix.chmod let chown = Unix.chown let utimes = Unix.utimes -let link = Unix.link +let link s d = Unix.link s d let openfile = Unix.openfile let opendir f = let h = Unix.opendir f in ++++++ Fix-for-lablgtk-2.18.6.patch ++++++ >From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001 From: daviddavid <[email protected]> Date: Mon, 26 Feb 2018 13:36:36 +0100 Subject: Fix for lablgtk >= 2.18.6 --- uigtk2.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uigtk2.ml b/uigtk2.ml index 2ba6d79..04c4da4 100644 --- a/uigtk2.ml +++ b/uigtk2.ml @@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic") (* This does not work with the current version of Lablgtk, due to a bug let icon = GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true - (Gpointer.region_of_string Pixmaps.icon_data) + (Gpointer.region_of_bytes Pixmaps.icon_data) *) let icon = let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in Gpointer.blit - (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); p let leftPtrWatch = ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/bcpierce00/unison.git</param> <param name="scm">git</param> <param name="versionformat">2.48.15</param> <!-- v2.48.15v4 --> <param name="revision">add890624885445558d9bf079f36dffaaa36c7b4</param> <param name="filename">unison</param> <param name="submodules">disable</param> <param name="subdir">src</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
