[prev in list] [next in list] [prev in thread] [next in thread]
List: openbsd-ports
Subject: Re: UPDATE net/unison-2.51.3
From: Bjorn Ketelaars <bket () openbsd ! org>
Date: 2020-10-29 6:19:10
Message-ID: 20201029061910.GA13987 () zeus ! lan
[Download RAW message or body]
On Wed 21/10/2020 20:19, Bjorn Ketelaars wrote:
> Diff below updates the 2.5x branch of net/unison to 2.51.3, which
> interoperates with 2.51.x and contains lots of bug fixes and minor
> improvements.
>
> A couple of patches have been removed as these have been committed
> upstream.
>
> 'make test' runs successfully, and run tested on amd64. Changes made in
> Makefile.inc are compatible with the 2.4x branch (build- and
> run-tested).
>
> Comments/OK?
Ping...
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/net/unison/Makefile.inc,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.inc
--- Makefile.inc 12 Jul 2019 20:48:51 -0000 1.30
+++ Makefile.inc 21 Oct 2020 15:37:25 -0000
@@ -14,7 +14,7 @@ MAINTAINER= Bjorn Ketelaars <bket@openbs
# GPLv3
PERMIT_PACKAGE= Yes
-WANTLIB= c m pthread util
+WANTLIB= c m util
MODULES= lang/ocaml
TEST_DEPENDS+= emacs->=24:editors/emacs
@@ -36,9 +36,10 @@ BUILD_DEPENDS+= x11/lablgtk2
LIB_DEPENDS+= x11/gtk+2
MAKE_FLAGS+= UISTYLE=gtk2
WANTLIB+= X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB+= Xrandr Xrender atk-1.0 cairo fontconfig freetype fribidi
-WANTLIB+= gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB+= gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0 z
+WANTLIB+= Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
+WANTLIB+= gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
+WANTLIB+= harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB+= z
.endif
FLAVOR_COMMA= ${FLAVOR_EXT:S/-/,/g}
Index: 2.4x/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/unison/2.4x/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- 2.4x/pkg/PLIST 4 Sep 2018 12:46:19 -0000 1.2
+++ 2.4x/pkg/PLIST 21 Oct 2020 15:37:25 -0000
@@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:19 espie Exp $
+@option is-branch
+@conflict unison-*
@pkgpath net/unison/stable${FLAVOR_COMMA}
@pkgpath net/unison/snapshot${FLAVOR_COMMA}
@pkgpath net/unison${FLAVOR_COMMA}
-@option is-branch
-@conflict unison-*
@bin bin/unison
share/doc/pkg-readmes/${PKGSTEM}
share/doc/unison/
Index: 2.5x/Makefile
===================================================================
RCS file: /cvs/ports/net/unison/2.5x/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- 2.5x/Makefile 9 Jun 2020 17:34:14 -0000 1.8
+++ 2.5x/Makefile 21 Oct 2020 15:37:25 -0000
@@ -1,8 +1,5 @@
# $OpenBSD: Makefile,v 1.8 2020/06/09 17:34:14 chrisz Exp $
-
-GH_TAGNAME= v2.51.2
-REVISION= 5
-WRKDIST= ${WRKDIR}/${PKGNAME}/src
+GH_TAGNAME= v2.51.3
.include <bsd.port.mk>
Index: 2.5x/distinfo
===================================================================
RCS file: /cvs/ports/net/unison/2.5x/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- 2.5x/distinfo 26 Apr 2018 21:34:23 -0000 1.1
+++ 2.5x/distinfo 21 Oct 2020 15:37:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (unison-2.51.2.tar.gz) = ou/L6rZRvm32nMmyUwEaB5Vey5H7QHohlxlFEZeEnV4=
-SIZE (unison-2.51.2.tar.gz) = 1398790
+SHA256 (unison-2.51.3.tar.gz) = DCh9F/UnKUQLK9wo7fTRmy1epYaZg9eOeA1QHFhmkUs=
+SIZE (unison-2.51.3.tar.gz) = 1370060
Index: 2.5x/patches/patch-files_ml
===================================================================
RCS file: 2.5x/patches/patch-files_ml
diff -N 2.5x/patches/patch-files_ml
--- 2.5x/patches/patch-files_ml 18 Sep 2019 17:49:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-files_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
-
-Index: files.ml
---- files.ml.orig
-+++ files.ml
-@@ -734,7 +734,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
Index: 2.5x/patches/patch-recon_ml
===================================================================
RCS file: 2.5x/patches/patch-recon_ml
diff -N 2.5x/patches/patch-recon_ml
--- 2.5x/patches/patch-recon_ml 18 Sep 2019 17:49:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-recon_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
-
-Index: recon.ml
---- recon.ml.orig
-+++ recon.ml
-@@ -661,9 +661,7 @@ 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)
-- pathUpdatesList
-+ List.sort Path.compare pathUpdatesList
-
- let rec enterPath p1 p2 t =
- match Path.deconstruct p1, Path.deconstruct p2 with
Index: 2.5x/patches/patch-system_system_generic_ml
===================================================================
RCS file: 2.5x/patches/patch-system_system_generic_ml
diff -N 2.5x/patches/patch-system_system_generic_ml
--- 2.5x/patches/patch-system_system_generic_ml 18 Sep 2019 17:49:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-system_system_generic_ml,v 1.1 2019/09/18 17:49:36 chrisz Exp $
-
-Index: system/system_generic.ml
---- system/system_generic.ml.orig
-+++ 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 source dest = Unix.link source dest
- let openfile = Unix.openfile
- let opendir f =
- let h = Unix.opendir f in
Index: 2.5x/patches/patch-uicommon_ml
===================================================================
RCS file: /cvs/ports/net/unison/2.5x/patches/patch-uicommon_ml,v
retrieving revision 1.1
diff -u -p -r1.1 patch-uicommon_ml
--- 2.5x/patches/patch-uicommon_ml 26 Apr 2018 21:34:23 -0000 1.1
+++ 2.5x/patches/patch-uicommon_ml 21 Oct 2020 15:37:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-uicommon_ml,v 1.1 2018/0
Index: uicommon.ml
--- uicommon.ml.orig
+++ uicommon.ml
-@@ -494,7 +494,7 @@ let promptForRoots getFirstRoot getSecondRoot =
+@@ -506,7 +506,7 @@ let promptForRoots getFirstRoot getSecondRoot =
(* ---- *)
let makeTempDir pattern =
Index: 2.5x/patches/patch-uigtk2_ml
===================================================================
RCS file: 2.5x/patches/patch-uigtk2_ml
diff -N 2.5x/patches/patch-uigtk2_ml
--- 2.5x/patches/patch-uigtk2_ml 4 Mar 2019 12:51:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-uigtk2_ml,v 1.1 2019/03/04 12:51:16 chrisz Exp $
-
-Index: uigtk2.ml
---- uigtk2.ml.orig
-+++ uigtk2.ml
-@@ -94,7 +94,7 @@ let icon =
- 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 =
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic